Commit d736336d9ac07ad8d7ff924608d06e60fdd8ead3

Authored by 朱显松
1 parent cdd60f11

更新 Simple 工程包名:cn.vlion.simple

.idea/misc.xml
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <ConfirmationsSetting value="0" id="Add" /> 37 <ConfirmationsSetting value="0" id="Add" />
38 <ConfirmationsSetting value="0" id="Remove" /> 38 <ConfirmationsSetting value="0" id="Remove" />
39 </component> 39 </component>
40 - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> 40 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
41 <output url="file://$PROJECT_DIR$/build/classes" /> 41 <output url="file://$PROJECT_DIR$/build/classes" />
42 </component> 42 </component>
43 <component name="ProjectType"> 43 <component name="ProjectType">
app/build.gradle
@@ -4,7 +4,7 @@ android { @@ -4,7 +4,7 @@ android {
4 compileSdkVersion 26 4 compileSdkVersion 26
5 buildToolsVersion "26.0.1" 5 buildToolsVersion "26.0.1"
6 defaultConfig { 6 defaultConfig {
7 - applicationId "com.vlion.simple" 7 + applicationId "cn.vlion.simple"
8 minSdkVersion 16 8 minSdkVersion 16
9 targetSdkVersion 26 9 targetSdkVersion 26
10 versionCode 1 10 versionCode 1
@@ -21,11 +21,7 @@ android { @@ -21,11 +21,7 @@ android {
21 21
22 dependencies { 22 dependencies {
23 compile fileTree(dir: 'libs', include: ['*.jar']) 23 compile fileTree(dir: 'libs', include: ['*.jar'])
24 - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {  
25 - exclude group: 'com.android.support', module: 'support-annotations'  
26 - })  
27 compile 'com.android.support:appcompat-v7:26.+' 24 compile 'com.android.support:appcompat-v7:26.+'
28 compile 'com.google.code.gson:gson:2.8.2' 25 compile 'com.google.code.gson:gson:2.8.2'
29 compile 'com.android.support.constraint:constraint-layout:1.0.2' 26 compile 'com.android.support.constraint:constraint-layout:1.0.2'
30 - testCompile 'junit:junit:4.12'  
31 } 27 }
app/libs/vlionSdk1.0.jar
No preview for this file type
app/src/androidTest/java/com/vlion/simple/ExampleInstrumentedTest.java deleted 100644 → 0
1 -package com.vlion.simple;  
2 -  
3 -import android.content.Context;  
4 -import android.support.test.InstrumentationRegistry;  
5 -import android.support.test.runner.AndroidJUnit4;  
6 -  
7 -import org.junit.Test;  
8 -import org.junit.runner.RunWith;  
9 -  
10 -import static org.junit.Assert.*;  
11 -  
12 -/**  
13 - * Instrumentation test, which will execute on an Android device.  
14 - *  
15 - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>  
16 - */  
17 -@RunWith(AndroidJUnit4.class)  
18 -public class ExampleInstrumentedTest {  
19 - @Test  
20 - public void useAppContext() throws Exception {  
21 - // Context of the app under test.  
22 - Context appContext = InstrumentationRegistry.getTargetContext();  
23 -  
24 - assertEquals("com.vlion.simple", appContext.getPackageName());  
25 - }  
26 -}  
app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> 10 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
11 11
12 <application 12 <application
13 - android:name=".application.VLionApplication" 13 + android:name="cn.vlion.simple.application.VLionApplication"
14 android:allowBackup="true" 14 android:allowBackup="true"
15 android:configChanges="keyboardHidden|screenSize|orientation" 15 android:configChanges="keyboardHidden|screenSize|orientation"
16 android:icon="@mipmap/ic_launcher" 16 android:icon="@mipmap/ic_launcher"
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 android:screenOrientation="portrait" 19 android:screenOrientation="portrait"
20 android:supportsRtl="true" 20 android:supportsRtl="true"
21 android:theme="@style/AppTheme"> 21 android:theme="@style/AppTheme">
22 - <activity android:name=".SplashActivity"> 22 + <activity android:name="cn.vlion.simple.SplashActivity">
23 <intent-filter> 23 <intent-filter>
24 <action android:name="android.intent.action.MAIN" /> 24 <action android:name="android.intent.action.MAIN" />
25 25
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 </intent-filter> 27 </intent-filter>
28 </activity> 28 </activity>
29 29
30 - <receiver android:name="com.vlion.ad.utils.apkdownload.DownloadCompleteReceiver"> 30 + <receiver android:name="cn.vlion.ad.utils.apkdownload.DownloadCompleteReceiver">
31 <intent-filter> 31 <intent-filter>
32 <action android:name="android.intent.action.DOWNLOAD_COMPLETE" /> 32 <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
33 </intent-filter> 33 </intent-filter>
@@ -38,25 +38,25 @@ @@ -38,25 +38,25 @@
38 </receiver> 38 </receiver>
39 39
40 <activity 40 <activity
41 - android:name=".BannerActivity" 41 + android:name="cn.vlion.simple.BannerActivity"
42 android:configChanges="keyboardHidden|screenSize|orientation" 42 android:configChanges="keyboardHidden|screenSize|orientation"
43 android:screenOrientation="portrait" /> 43 android:screenOrientation="portrait" />
44 <activity 44 <activity
45 - android:name=".SpotActivity" 45 + android:name="cn.vlion.simple.SpotActivity"
46 android:configChanges="keyboardHidden|screenSize|orientation" 46 android:configChanges="keyboardHidden|screenSize|orientation"
47 android:screenOrientation="portrait" /> 47 android:screenOrientation="portrait" />
48 48
49 <activity 49 <activity
50 - android:name=".MainActivity" 50 + android:name="cn.vlion.simple.MainActivity"
51 android:configChanges="keyboardHidden|screenSize|orientation" 51 android:configChanges="keyboardHidden|screenSize|orientation"
52 android:screenOrientation="portrait" /> 52 android:screenOrientation="portrait" />
53 53
54 <activity 54 <activity
55 - android:name=".NativeActivity" 55 + android:name="cn.vlion.simple.NativeActivity"
56 android:configChanges="keyboardHidden|screenSize|orientation" 56 android:configChanges="keyboardHidden|screenSize|orientation"
57 android:screenOrientation="portrait" /> 57 android:screenOrientation="portrait" />
58 58
59 - <activity android:name="com.vlion.ad.view.webview.VLionWebViewActivity" /> 59 + <activity android:name="cn.vlion.ad.view.webview.VLionWebViewActivity" />
60 </application> 60 </application>
61 61
62 </manifest> 62 </manifest>
63 \ No newline at end of file 63 \ No newline at end of file
app/src/main/java/com/vlion/simple/BannerActivity.java renamed to app/src/main/java/cn/vlion/simple/BannerActivity.java
1 -package com.vlion.simple; 1 +package cn.vlion.simple;
2 2
3 import android.os.Bundle; 3 import android.os.Bundle;
4 import android.support.v7.app.AppCompatActivity; 4 import android.support.v7.app.AppCompatActivity;
5 -import android.util.Log;  
6 -import android.view.ViewGroup;  
7 import android.widget.RelativeLayout; 5 import android.widget.RelativeLayout;
8 6
9 -import com.vlion.ad.core.Config;  
10 -import com.vlion.ad.moudle.banner.BannerManager;  
11 -import com.vlion.ad.moudle.banner.BannerView;  
12 -import com.vlion.ad.moudle.banner.BannerViewListener;  
13 -import com.vlion.simple.util.ScreenUtil; 7 +import com.vlion.simple.R;
  8 +
  9 +import cn.vlion.ad.core.Config;
  10 +import cn.vlion.ad.moudle.banner.BannerManager;
  11 +import cn.vlion.ad.moudle.banner.BannerView;
  12 +import cn.vlion.ad.moudle.banner.BannerViewListener;
14 13
15 public class BannerActivity extends AppCompatActivity { 14 public class BannerActivity extends AppCompatActivity {
16 15
@@ -27,37 +26,36 @@ public class BannerActivity extends AppCompatActivity { @@ -27,37 +26,36 @@ public class BannerActivity extends AppCompatActivity {
27 26
28 BannerManager.getInstance().setAdScalingModel(Config.AD_SCALING_MODE_SCALE_TO_FIT); 27 BannerManager.getInstance().setAdScalingModel(Config.AD_SCALING_MODE_SCALE_TO_FIT);
29 28
30 - bannerView = BannerManager.getInstance().getBannerView(this, "350", R.mipmap.ic_launcher, new BannerViewListener() { 29 + bannerView = BannerManager.getInstance().getBannerView(this, "350", new BannerViewListener() {
  30 +
31 @Override 31 @Override
32 - public void onRequestSuccess(int viewWidth, int viewHeight) {  
33 - Log.e(TAG, "onRequestSuccess: " + viewWidth + "," + viewHeight);  
34 - bannerContainer.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;  
35 - bannerContainer.getLayoutParams().height = ScreenUtil.getScreenWidth(BannerActivity.this) * viewHeight / viewWidth; 32 + public void onRequestFailed(int i, String s) {
  33 +
36 } 34 }
37 35
38 @Override 36 @Override
39 - public void onRequestFailed(int code, String errorMsg) {  
40 - Log.e(TAG, "onRequestFailed" + code + " : " + errorMsg); 37 + public void onRequestSuccess(int i, int i1) {
  38 +
41 } 39 }
42 40
43 @Override 41 @Override
44 public void onShowSuccess() { 42 public void onShowSuccess() {
45 - Log.e(TAG, "onShowSuccess"); 43 +
46 } 44 }
47 45
48 @Override 46 @Override
49 public void onSwitchBanner() { 47 public void onSwitchBanner() {
50 - Log.e(TAG, "onSwitchBanner"); 48 +
51 } 49 }
52 50
53 @Override 51 @Override
54 - public void onShowFailed(int code, String msg) {  
55 - Log.e(TAG, "onShowFailed: " + code + "," + msg); 52 + public void onShowFailed(int i, String s) {
  53 +
56 } 54 }
57 55
58 @Override 56 @Override
59 public void onBannerClicked() { 57 public void onBannerClicked() {
60 - Log.e(TAG, "onBannerClicked"); 58 +
61 } 59 }
62 }); 60 });
63 61
app/src/main/java/com/vlion/simple/MainActivity.java renamed to app/src/main/java/cn/vlion/simple/MainActivity.java
1 -package com.vlion.simple; 1 +package cn.vlion.simple;
2 2
3 import android.content.Intent; 3 import android.content.Intent;
4 import android.os.Bundle; 4 import android.os.Bundle;
5 import android.support.v7.app.AppCompatActivity; 5 import android.support.v7.app.AppCompatActivity;
6 import android.view.View; 6 import android.view.View;
7 7
  8 +import com.vlion.simple.R;
  9 +
8 public class MainActivity extends AppCompatActivity { 10 public class MainActivity extends AppCompatActivity {
9 11
10 private static final String TAG = "MainActivity"; 12 private static final String TAG = "MainActivity";
app/src/main/java/com/vlion/simple/NativeActivity.java renamed to app/src/main/java/cn/vlion/simple/NativeActivity.java
1 -package com.vlion.simple; 1 +package cn.vlion.simple;
2 2
3 import android.os.Bundle; 3 import android.os.Bundle;
4 import android.support.annotation.Nullable; 4 import android.support.annotation.Nullable;
@@ -7,13 +7,15 @@ import android.util.Log; @@ -7,13 +7,15 @@ import android.util.Log;
7 import android.view.View; 7 import android.view.View;
8 8
9 import com.google.gson.Gson; 9 import com.google.gson.Gson;
10 -import com.vlion.ad.moudle.natives.NativeListener;  
11 -import com.vlion.ad.moudle.natives.NativeManager;  
12 -import com.vlion.ad.moudle.natives.model.NativeAppWallData;  
13 -import com.vlion.ad.moudle.natives.model.NativeCarouselData;  
14 -import com.vlion.ad.moudle.natives.model.NativeFeedsData;  
15 -import com.vlion.ad.moudle.natives.model.NativeNewsData;  
16 -import com.vlion.ad.moudle.natives.model.NativeWaterfallData; 10 +import com.vlion.simple.R;
  11 +
  12 +import cn.vlion.ad.moudle.natives.NativeListener;
  13 +import cn.vlion.ad.moudle.natives.NativeManager;
  14 +import cn.vlion.ad.moudle.natives.model.NativeAppWallData;
  15 +import cn.vlion.ad.moudle.natives.model.NativeCarouselData;
  16 +import cn.vlion.ad.moudle.natives.model.NativeFeedsData;
  17 +import cn.vlion.ad.moudle.natives.model.NativeNewsData;
  18 +import cn.vlion.ad.moudle.natives.model.NativeWaterfallData;
17 19
18 /** 20 /**
19 * Created by xiansong on 2017/10/14. 21 * Created by xiansong on 2017/10/14.
app/src/main/java/com/vlion/simple/SplashActivity.java renamed to app/src/main/java/cn/vlion/simple/SplashActivity.java
1 -package com.vlion.simple; 1 +package cn.vlion.simple;
2 2
3 import android.content.Intent; 3 import android.content.Intent;
4 import android.os.Build; 4 import android.os.Build;
@@ -10,11 +10,13 @@ import android.view.View; @@ -10,11 +10,13 @@ import android.view.View;
10 import android.view.ViewGroup; 10 import android.view.ViewGroup;
11 import android.widget.RelativeLayout; 11 import android.widget.RelativeLayout;
12 12
13 -import com.vlion.ad.core.Config;  
14 -import com.vlion.ad.moudle.splash.SplashManager;  
15 -import com.vlion.ad.moudle.splash.SplashViewListener;  
16 -import com.vlion.simple.util.PermissionHelper;  
17 -import com.vlion.simple.util.ScreenUtil; 13 +import com.vlion.simple.R;
  14 +
  15 +import cn.vlion.ad.core.Config;
  16 +import cn.vlion.ad.moudle.splash.SplashManager;
  17 +import cn.vlion.ad.moudle.splash.SplashViewListener;
  18 +import cn.vlion.simple.util.PermissionHelper;
  19 +import cn.vlion.simple.util.ScreenUtil;
18 20
19 /** 21 /**
20 * Created by gujun on 2017/10/11. 22 * Created by gujun on 2017/10/11.
@@ -72,7 +74,7 @@ public class SplashActivity extends AppCompatActivity { @@ -72,7 +74,7 @@ public class SplashActivity extends AppCompatActivity {
72 SplashManager.getInstance().setAutoJumpToTargetWhenShowFailed(true); 74 SplashManager.getInstance().setAutoJumpToTargetWhenShowFailed(true);
73 SplashManager.getInstance().setSplashViewContainer(splashAdContainer); 75 SplashManager.getInstance().setSplashViewContainer(splashAdContainer);
74 SplashManager.getInstance().setAdScalingModel(Config.AD_SCALING_MODE_SCALE_TO_FIT); 76 SplashManager.getInstance().setAdScalingModel(Config.AD_SCALING_MODE_SCALE_TO_FIT);
75 - SplashManager.getInstance().showSplash(this, "353", R.mipmap.ic_launcher, new SplashViewListener() { 77 + SplashManager.getInstance().showSplash(this, "353", new SplashViewListener() {
76 78
77 @Override 79 @Override
78 public void onRequestSuccess(int viewWidth, int viewHeight) { 80 public void onRequestSuccess(int viewWidth, int viewHeight) {
app/src/main/java/com/vlion/simple/SpotActivity.java renamed to app/src/main/java/cn/vlion/simple/SpotActivity.java
1 -package com.vlion.simple; 1 +package cn.vlion.simple;
2 2
3 import android.os.Bundle; 3 import android.os.Bundle;
4 import android.support.annotation.Nullable; 4 import android.support.annotation.Nullable;
@@ -8,10 +8,12 @@ import android.view.View; @@ -8,10 +8,12 @@ import android.view.View;
8 import android.view.ViewGroup; 8 import android.view.ViewGroup;
9 import android.widget.RelativeLayout; 9 import android.widget.RelativeLayout;
10 10
11 -import com.vlion.ad.core.Config;  
12 -import com.vlion.ad.moudle.spot.SpotManager;  
13 -import com.vlion.ad.moudle.spot.SpotViewListener;  
14 -import com.vlion.simple.util.ScreenUtil; 11 +import cn.vlion.ad.core.Config;
  12 +import cn.vlion.ad.moudle.spot.SpotManager;
  13 +import cn.vlion.ad.moudle.spot.SpotViewListener;
  14 +import com.vlion.simple.R;
  15 +
  16 +import cn.vlion.simple.util.ScreenUtil;
15 17
16 /** 18 /**
17 * Created by gujun on 2017/10/12. 19 * Created by gujun on 2017/10/12.
app/src/main/java/com/vlion/simple/application/VLionApplication.java renamed to app/src/main/java/cn/vlion/simple/application/VLionApplication.java
1 -package com.vlion.simple.application; 1 +package cn.vlion.simple.application;
2 2
3 import android.app.Application; 3 import android.app.Application;
4 4
5 -import com.vlion.ad.core.ADManager; 5 +import cn.vlion.ad.core.ADManager;
6 6
7 /** 7 /**
8 * Created by xiansong on 2017/9/29. 8 * Created by xiansong on 2017/9/29.
app/src/main/java/com/vlion/simple/util/PermissionHelper.java renamed to app/src/main/java/cn/vlion/simple/util/PermissionHelper.java
1 -package com.vlion.simple.util; 1 +package cn.vlion.simple.util;
2 2
3 import android.Manifest; 3 import android.Manifest;
4 import android.app.Activity; 4 import android.app.Activity;
app/src/main/java/com/vlion/simple/util/ScreenUtil.java renamed to app/src/main/java/cn/vlion/simple/util/ScreenUtil.java
1 -package com.vlion.simple.util; 1 +package cn.vlion.simple.util;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 import android.view.WindowManager; 4 import android.view.WindowManager;
app/src/main/res/layout/activity_banner.xml
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 - tools:context="com.vlion.simple.BannerActivity"> 6 + tools:context="cn.vlion.simple.BannerActivity">
7 7
8 <RelativeLayout 8 <RelativeLayout
9 android:id="@+id/bannerContainer" 9 android:id="@+id/bannerContainer"
app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 android:orientation="vertical" 6 android:orientation="vertical"
7 - tools:context="com.vlion.simple.MainActivity"> 7 + tools:context="cn.vlion.simple.MainActivity">
8 8
9 <Button 9 <Button
10 android:id="@+id/bannerBtn" 10 android:id="@+id/bannerBtn"
app/src/main/res/layout/activity_native.xml
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
6 android:orientation="vertical" 6 android:orientation="vertical"
7 - tools:context="com.vlion.simple.NativeActivity" 7 + tools:context="cn.vlion.simple.NativeActivity"
8 android:gravity="center"> 8 android:gravity="center">
9 9
10 <Button 10 <Button
app/src/test/java/com/vlion/simple/ExampleUnitTest.java deleted 100644 → 0
1 -package com.vlion.simple;  
2 -  
3 -import org.junit.Test;  
4 -  
5 -import static org.junit.Assert.*;  
6 -  
7 -/**  
8 - * Example local unit test, which will execute on the development machine (host).  
9 - *  
10 - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>  
11 - */  
12 -public class ExampleUnitTest {  
13 - @Test  
14 - public void addition_isCorrect() throws Exception {  
15 - assertEquals(4, 2 + 2);  
16 - }  
17 -}  
18 \ No newline at end of file 0 \ No newline at end of file