更新jar包及demo

王琳
1 parent 24cc7626
Showing 8 changed files with 55 additions and 21 deletions
.idea/misc.xml
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/res/drawable/vlion_bg_jump.xml
app/src/main/res/xml/file_provider.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <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">
+  <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">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -27,7 +27,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>
@@ -37,6 +37,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
@@ -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