Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/VLionSimple

朱显松
2 parents bb6c2dad 37a8ffe7
Showing 8 changed files with 166 additions and 156 deletions
app/libs/vlionSdk1.0.jar
app/src/main/AndroidManifest.xml
app/src/main/java/cn/vlion/simple/BannerActivity.java
app/src/main/java/cn/vlion/simple/SplashActivity.java
app/src/main/java/cn/vlion/simple/SpotActivity.java
app/src/main/java/cn/vlion/simple/util/PermissionHelper.java
app/src/main/res/drawable/vlion_bg_jump.xml
app/src/main/res/xml/file_provider.xml
@@ -26,7 +26,7 @@
             </intent-filter>
         </activity>
-        <receiver android:name="cn.vlion.ad.utils.apkdownload.DownloadCompleteReceiver">
+        <receiver android:name="cn.vlion.ad.core.VLionReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
             </intent-filter>
@@ -36,6 +36,16 @@
             </intent-filter>
         </receiver>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="cn.vlion.ad.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider" />
+        </provider>
+
         <activity
             android:name="cn.vlion.simple.BannerActivity"
             android:configChanges="keyboardHidden|screenSize|orientation"
@@ -2,12 +2,15 @@ package cn.vlion.simple;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import cn.vlion.ad.core.Config;
 import cn.vlion.ad.moudle.banner.BannerManager;
 import cn.vlion.ad.moudle.banner.BannerView;
 import cn.vlion.ad.moudle.banner.BannerViewListener;
+import cn.vlion.simple.util.ScreenUtil;
 public class BannerActivity extends AppCompatActivity {
@@ -23,44 +26,46 @@ public class BannerActivity extends AppCompatActivity {
         bannerContainer = (RelativeLayout) findViewById(R.id.bannerContainer);
         BannerManager.getInstance().setAdScalingModel(Config.AD_SCALING_MODE_SCALE_TO_FIT);
-
-        bannerView = BannerManager.getInstance().getBannerView(this, "350", new BannerViewListener() {
-
+        //430 h5
+        //431 image
+        bannerView = BannerManager.getInstance().getBannerView(this, "430", new BannerViewListener() {
             @Override
-            public void onRequestFailed(int i, String s) {
-
+            public void onRequestSuccess(int viewWidth, int viewHeight) {
+                Log.e(TAG, "onRequestSuccess: " + viewWidth + "," + viewHeight);
+                bannerContainer.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
+                bannerContainer.getLayoutParams().height = ScreenUtil.getScreenWidth(BannerActivity.this) * viewHeight / viewWidth;
             }
             @Override
-            public void onRequestSuccess(int i, int i1) {
-
+            public void onRequestFailed(int code, String errorMsg) {
+                Log.e(TAG, "onRequestFailed" + code + " : " + errorMsg);
             }
             @Override
             public void onShowSuccess() {
-
+                Log.e(TAG, "onShowSuccess");
             }
             @Override
             public void onSwitchBanner() {
-
+                Log.e(TAG, "onSwitchBanner");
             }
             @Override
-            public void onShowFailed(int i, String s) {
-
+            public void onShowFailed(int code, String msg) {
+                Log.e(TAG, "onShowFailed: " + code + "," + msg);
             }
             @Override
             public void onBannerClicked() {
-
+                Log.e(TAG, "onBannerClicked");
             }
         });
-//        bannerView.setLayoutParams(new RelativeLayout.LayoutParams(300, 300));
         bannerContainer.addView(bannerView);
     }
+
     @Override
     protected void onPause() {
         super.onPause();
@@ -72,7 +72,9 @@ public class SplashActivity extends AppCompatActivity {
         SplashManager.getInstance().setAutoJumpToTargetWhenShowFailed(true);
         SplashManager.getInstance().setSplashViewContainer(splashAdContainer);
         SplashManager.getInstance().setAdScalingModel(Config.AD_SCALING_MODE_SCALE_TO_FIT);
-        SplashManager.getInstance().showSplash(this, "353", new SplashViewListener() {
+        //432 h5
+        //433 image
+        SplashManager.getInstance().showSplash(this, "432", new SplashViewListener() {
             @Override
             public void onRequestSuccess(int viewWidth, int viewHeight) {
@@ -36,15 +36,16 @@ public class SpotActivity extends AppCompatActivity {
         adLayout = (RelativeLayout) findViewById(R.id.adLayout);
         SpotManager.getInstance().setSpotViewContainer(spotAdContainer);
-//        SpotManager.getInstance().setSplashViewContainerAndLayoutParams(splashContainer, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 600));
         SpotManager.getInstance().setAdScalingModel(Config.AD_SCALING_MODE_SCALE_TO_FIT);
-        SpotManager.getInstance().showSpot(this, "355",new SpotViewListener() {
+        //434 h5
+        //438 image
+        SpotManager.getInstance().showSpot(this, "438", new SpotViewListener() {
             @Override
             public void onRequestSuccess(int viewWidth, int viewHeight, int closeViewHeight) {
                 Log.e(TAG, "onRequestSuccess: " + viewWidth + "," + viewHeight);
-                spotAdContainer.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
-                spotAdContainer.getLayoutParams().height = ScreenUtil.getScreenWidth(SpotActivity.this) * viewHeight / viewWidth + closeViewHeight;
+                spotAdContainer.getLayoutParams().width = 300;
+                spotAdContainer.getLayoutParams().height = 300 * viewHeight / viewWidth + closeViewHeight;
             }
             @Override
@@ -13,46 +13,25 @@ import android.support.v4.content.ContextCompat;
 import android.util.Log;
 /**
- * Android 6.0 上权限分为<b>正常</b>和<b>危险</b>级别
- * <ul>
- * <li>正常级别权限：开发者仅仅需要在AndroidManifext.xml上声明，那么应用就会被允许拥有该权限，如：android.permission.INTERNET</li>
- * <li>危险级别权限：开发者需要在AndroidManifext.xml上声明，并且在运行时进行申请，而且用户允许了，应用才会被允许拥有该权限，如：android.permission.WRITE_EXTERNAL_STORAGE</li>
- * </ul>
- * 有米的以下权限需要在Android6.0上被允许，有米广告sdk才能正常工作，开发者需要在调用有米的任何代码之前，提前让用户允许权限
- * <ul>
- * <li>必须申请的权限
- * <ul>
- * <li>android.permission.READ_PHONE_STATE</li>
- * <li>android.permission.WRITE_EXTERNAL_STORAGE</li>
- * </ul>
- * </li>
- * <li>可选申请的权限
- * <ul>
- * <li>android.permission.ACCESS_FINE_LOCATION</li>
- * </ul>
- * </li>
- * </ul>
- * Android 6.0+ 权限申请助手
- *
- * @since 2016-01-12
+ * sdk所需权限工具类
  */
 public class PermissionHelper {
-	
+
 	private static final String TAG = "PermissionHelper";
-	
+
 	/**
 	 * 小tips:这里的int数值不能太大，否则不会弹出请求权限提示，测试的时候,改到1000就不会弹出请求了
 	 */
 	private final static int READ_PHONE_STATE_CODE = 101;
-	
+
 	private final static int WRITE_EXTERNAL_STORAGE_CODE = 102;
-	
+
 	private final static int REQUEST_OPEN_APPLICATION_SETTINGS_CODE = 12345;
-	
+
 	/**
-	 * 有米 Android SDK 所需要向用户申请的权限列表
+	 * Android SDK 所需要向用户申请的权限列表
 	 */
-	private PermissionModel[] mPermissionModels = new PermissionModel[] {
+	private PermissionModel[] mPermissionModels = new PermissionModel[]{
 			new PermissionModel("电话", Manifest.permission.READ_PHONE_STATE, "我们需要读取手机信息的权限来标识您的身份", READ_PHONE_STATE_CODE),
 			new PermissionModel(
 					"存储空间",
@@ -61,19 +40,19 @@ public class PermissionHelper {
 					WRITE_EXTERNAL_STORAGE_CODE
 			)
 	};
-	
+
 	private Activity mActivity;
-	
+
 	private OnApplyPermissionListener mOnApplyPermissionListener;
-	
+
 	public PermissionHelper(Activity activity) {
 		mActivity = activity;
 	}
-	
+
 	public void setOnApplyPermissionListener(OnApplyPermissionListener onApplyPermissionListener) {
 		mOnApplyPermissionListener = onApplyPermissionListener;
 	}
-	
+
 	/**
 	 * 这里我们演示如何在Android 6.0+上运行时申请权限
 	 */
@@ -81,7 +60,7 @@ public class PermissionHelper {
 		try {
 			for (final PermissionModel model : mPermissionModels) {
 				if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(mActivity, model.permission)) {
-					ActivityCompat.requestPermissions(mActivity, new String[] { model.permission }, model.requestCode);
+					ActivityCompat.requestPermissions(mActivity, new String[]{model.permission}, model.requestCode);
 					return;
 				}
 			}
@@ -92,7 +71,7 @@ public class PermissionHelper {
 			Log.e(TAG, "", e);
 		}
 	}
-	
+
 	/**
 	 * 对应Activity的 {@code onRequestPermissionsResult(...)} 方法
 	 *
@@ -102,85 +81,85 @@ public class PermissionHelper {
 	 */
 	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
 		switch (requestCode) {
-		case READ_PHONE_STATE_CODE:
-		case WRITE_EXTERNAL_STORAGE_CODE:
-			// 如果用户不允许，我们视情况发起二次请求或者引导用户到应用页面手动打开
-			if (PackageManager.PERMISSION_GRANTED != grantResults[0]) {
-				
-				// 二次请求，表现为：以前请求过这个权限，但是用户拒接了
-				// 在二次请求的时候，会有一个“不再提示的”checkbox
-				// 因此这里需要给用户解释一下我们为什么需要这个权限，否则用户可能会永久不在激活这个申请
-				// 方便用户理解我们为什么需要这个权限
-				if (ActivityCompat.shouldShowRequestPermissionRationale(mActivity, permissions[0])) {
-					AlertDialog.Builder builder = new AlertDialog.Builder(mActivity).setTitle("权限申请")
-					                                                                .setMessage(findPermissionExplain
-							                                                                (permissions[0])).setPositiveButton(
-							                                                                "确定",
-							                                                                new DialogInterface.OnClickListener
-									                                                                () {
-								
-								                                                                @Override
-								                                                                public void onClick(
-										                                                                DialogInterface dialog,
-										                                                                int which) {
-									                                                                applyPermissions();
-								                                                                }
-							                                                                }
-					                                                                );
-					builder.setCancelable(false);
-					builder.show();
-				}
-				// 到这里就表示已经是第3+次请求，而且此时用户已经永久拒绝了，这个时候，我们引导用户到应用权限页面，让用户自己手动打开
-				else {
-					AlertDialog.Builder builder = new AlertDialog.Builder(mActivity).setTitle("权限申请")
-					                                                                .setMessage("请在打开的窗口的权限中开启" +
-					                                                                            findPermissionName
-							                                                                            (permissions[0]) +
-					                                                                            "权限，以正常使用本应用")
-					                                                                .setPositiveButton(
-							                                                                "去设置",
-							                                                                new DialogInterface.OnClickListener
-									                                                                () {
-								
-								                                                                @Override
-								                                                                public void onClick(
-										                                                                DialogInterface dialog,
-										                                                                int which) {
-									                                                                openApplicationSettings(
-											                                                                REQUEST_OPEN_APPLICATION_SETTINGS_CODE);
-								                                                                }
-							                                                                }
-					                                                                )
-					                                                                .setNegativeButton(
-							                                                                "取消",
-							                                                                new DialogInterface.OnClickListener
-									                                                                () {
-								                                                                @Override
-								                                                                public void onClick(
-										                                                                DialogInterface dialog,
-										                                                                int which) {
-									                                                                mActivity.finish();
-								                                                                }
-							                                                                }
-					                                                                );
-					builder.setCancelable(false);
-					builder.show();
+			case READ_PHONE_STATE_CODE:
+			case WRITE_EXTERNAL_STORAGE_CODE:
+				// 如果用户不允许，我们视情况发起二次请求或者引导用户到应用页面手动打开
+				if (PackageManager.PERMISSION_GRANTED != grantResults[0]) {
+
+					// 二次请求，表现为：以前请求过这个权限，但是用户拒接了
+					// 在二次请求的时候，会有一个“不再提示的”checkbox
+					// 因此这里需要给用户解释一下我们为什么需要这个权限，否则用户可能会永久不在激活这个申请
+					// 方便用户理解我们为什么需要这个权限
+					if (ActivityCompat.shouldShowRequestPermissionRationale(mActivity, permissions[0])) {
+						AlertDialog.Builder builder = new AlertDialog.Builder(mActivity).setTitle("权限申请")
+								.setMessage(findPermissionExplain
+										(permissions[0])).setPositiveButton(
+										"确定",
+										new DialogInterface.OnClickListener
+												() {
+
+											@Override
+											public void onClick(
+													DialogInterface dialog,
+													int which) {
+												applyPermissions();
+											}
+										}
+								);
+						builder.setCancelable(false);
+						builder.show();
+					}
+					// 到这里就表示已经是第3+次请求，而且此时用户已经永久拒绝了，这个时候，我们引导用户到应用权限页面，让用户自己手动打开
+					else {
+						AlertDialog.Builder builder = new AlertDialog.Builder(mActivity).setTitle("权限申请")
+								.setMessage("请在打开的窗口的权限中开启" +
+										findPermissionName
+												(permissions[0]) +
+										"权限，以正常使用本应用")
+								.setPositiveButton(
+										"去设置",
+										new DialogInterface.OnClickListener
+												() {
+
+											@Override
+											public void onClick(
+													DialogInterface dialog,
+													int which) {
+												openApplicationSettings(
+														REQUEST_OPEN_APPLICATION_SETTINGS_CODE);
+											}
+										}
+								)
+								.setNegativeButton(
+										"取消",
+										new DialogInterface.OnClickListener
+												() {
+											@Override
+											public void onClick(
+													DialogInterface dialog,
+													int which) {
+												mActivity.finish();
+											}
+										}
+								);
+						builder.setCancelable(false);
+						builder.show();
+					}
+					return;
 				}
-				return;
-			}
-			
-			// 到这里就表示用户允许了本次请求，我们继续检查是否还有待申请的权限没有申请
-			if (isAllRequestedPermissionGranted()) {
-				if (mOnApplyPermissionListener != null) {
-					mOnApplyPermissionListener.onAfterApplyAllPermission();
+
+				// 到这里就表示用户允许了本次请求，我们继续检查是否还有待申请的权限没有申请
+				if (isAllRequestedPermissionGranted()) {
+					if (mOnApplyPermissionListener != null) {
+						mOnApplyPermissionListener.onAfterApplyAllPermission();
+					}
+				} else {
+					applyPermissions();
 				}
-			} else {
-				applyPermissions();
-			}
-			break;
+				break;
 		}
 	}
-	
+
 	/**
 	 * 对应Activity的 {@code onActivityResult(...)} 方法
 	 *
@@ -190,18 +169,18 @@ public class PermissionHelper {
 	 */
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
 		switch (requestCode) {
-		case REQUEST_OPEN_APPLICATION_SETTINGS_CODE:
-			if (isAllRequestedPermissionGranted()) {
-				if (mOnApplyPermissionListener != null) {
-					mOnApplyPermissionListener.onAfterApplyAllPermission();
+			case REQUEST_OPEN_APPLICATION_SETTINGS_CODE:
+				if (isAllRequestedPermissionGranted()) {
+					if (mOnApplyPermissionListener != null) {
+						mOnApplyPermissionListener.onAfterApplyAllPermission();
+					}
+				} else {
+					mActivity.finish();
 				}
-			} else {
-				mActivity.finish();
-			}
-			break;
+				break;
 		}
 	}
-	
+
 	/**
 	 * 判断是否所有的权限都被授权了
 	 *
@@ -215,12 +194,11 @@ public class PermissionHelper {
 		}
 		return true;
 	}
-	
+
 	/**
 	 * 打开应用设置界面
 	 *
 	 * @param requestCode 请求码
-	 *
 	 * @return
 	 */
 	private boolean openApplicationSettings(int requestCode) {
@@ -228,7 +206,7 @@ public class PermissionHelper {
 			Intent intent =
 					new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse("package:" + mActivity.getPackageName()));
 			intent.addCategory(Intent.CATEGORY_DEFAULT);
-			
+
 			// Android L 之后Activity的启动模式发生了一些变化
 			// 如果用了下面的 Intent.FLAG_ACTIVITY_NEW_TASK ，并且是 startActivityForResult
 			// 那么会在打开新的activity的时候就会立即回调 onActivityResult
@@ -240,12 +218,11 @@ public class PermissionHelper {
 		}
 		return false;
 	}
-	
+
 	/**
 	 * 查找申请权限的解释短语
 	 *
 	 * @param permission 权限
-	 *
 	 * @return
 	 */
 	private String findPermissionExplain(String permission) {
@@ -258,12 +235,11 @@ public class PermissionHelper {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * 查找申请权限的名称
 	 *
 	 * @param permission 权限
-	 *
 	 * @return
 	 */
 	private String findPermissionName(String permission) {
@@ -276,29 +252,29 @@ public class PermissionHelper {
 		}
 		return null;
 	}
-	
+
 	private static class PermissionModel {
-		
+
 		/**
 		 * 权限名称
 		 */
 		public String name;
-		
+
 		/**
 		 * 请求的权限
 		 */
 		public String permission;
-		
+
 		/**
 		 * 解析为什么请求这个权限
 		 */
 		public String explain;
-		
+
 		/**
 		 * 请求代码
 		 */
 		public int requestCode;
-		
+
 		public PermissionModel(String name, String permission, String explain, int requestCode) {
 			this.name = name;
 			this.permission = permission;
@@ -306,16 +282,16 @@ public class PermissionHelper {
 			this.requestCode = requestCode;
 		}
 	}
-	
+
 	/**
 	 * 权限申请事件监听
 	 */
 	public interface OnApplyPermissionListener {
-		
+
 		/**
 		 * 申请所有权限之后的逻辑
 		 */
 		void onAfterApplyAllPermission();
 	}
-	
+
 }
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle"
     android:useLevel="false">
-    <solid android:color="#66000000" />
+    <solid android:color="#2f000000" />
     <corners
         android:bottomLeftRadius="10dp"
         android:bottomRightRadius="10dp"
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+
+    <!--
+        ## 说明
+
+        这个文件为开发者适配Android 7.0系统以上才需要配置瑞狮的相关内容，如果没有兼容到的话，可以不管
+    -->
+
+    <cache-path
+        name="apk1"
+        path="." />
+    <external-path
+        name="apk2"
+        path="." />
+</paths>
 \ No newline at end of file