[修改]更新版本号

app/build.gradle

@@ -180,6 +180,7 @@ dependencies {
     implementation(name: 'alipaySdk-15.5.9', ext: 'aar')
     implementation(name: 'ad_dk_sdk', ext: 'aar')
     implementation(name: 'klevinSDK', ext: 'aar')
+    /*implementation(name: 'lygamewrapper-sheep-release', ext: 'aar')*/
 
     //其中latest.release指代最新版本号，也可以指定明确的版本号，例如1.2.0
     implementation 'com.tencent.bugly:nativecrashreport:3.3.1'

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -859,7 +859,7 @@ public interface ApiService {
     Observable<BaseMessage> commitIdEvent(@Body JSONObject jsonObject);
 
     /**
-     * 闲玩
+     * 闲玩、广告
      */
     @GET("app/common_config")
     Observable<BaseMessage> commonConfig(@Query("type_name") String type_name);

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -169,14 +169,19 @@ public class SplashAct extends BaseActivity {
      * 加载SDK的广告
      */
     private void initSdkAdvertising(int adType) {
+        Log.d("!!!!!!", String.valueOf(adType));
         if (adType == AD_SPLASH_TYPE_YKY) {
             Log.d("!!!!!!", "加载游可盈广告");
             //游可盈
             launchYKYSplash();
         } else if (adType == AD_SPLASH_TYPE_YT) {
-            Log.d("!!!!!!", "加载优投告");
+            Log.d("!!!!!!", "加载优投广告");
             //优投
             launchYTSplash();
+        } else if(adType == AD_SPLASH_TYPE_ZK){
+            Log.d("!!!!!!", "加载掌酷广告");
+            //掌酷
+            launchZKSplash();
         }
     }
 
@@ -290,6 +295,11 @@ public class SplashAct extends BaseActivity {
         }
     }
 
+    //展示掌酷广告
+    private void launchZKSplash(){
+
+    }
+
     /**
      * 重要 mForceGoMain跳转主页 请参照此方法调用，否则可能导致广告展示链路断开 导致收益下降！！！
      * 设置一个变量来控制当前开屏页面是否可以跳转，当开屏广告为普链类广告时，点击会打开一个广告落地页，此时开发者还不能打开自己的App主页。当从广告落地页返回以后，

app/src/main/java/com/sheep/gamegroup/view/activity/helper/AdHelper.java

@@ -27,6 +27,7 @@ public class AdHelper {
     public static int AD_TYPE_SHEEP = 1; //广告类型：小绵羊平台自己的广告
     public static int AD_SPLASH_TYPE_YKY = 2; //广告类型：游可盈的广告
     public static int AD_SPLASH_TYPE_YT = 3; //广告类型：优投的广告
+    public static int AD_SPLASH_TYPE_ZK = 4; //广告类型：掌酷的广告
 
     // 返回true 为apk下载
     public static boolean goAdLink(Context context, SheepAd advertising) {

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -57,7 +57,11 @@ import com.tencent.smtt.sdk.WebView;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.socialize.PlatformConfig;
 import com.youmi.android.offer.YmConfig;
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
 import org.xutils.x;
 
@@ -256,7 +260,9 @@ public class SheepApp extends MultiDexApplication {
                 .subscribe(new SheepSubscriber<BaseMessage>(this) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage.getMsg() + "");
+                        SplashAct.YTHasInit = false;
+                        SplashAct.YKYHasInit = false;
+                        G.showToast("获取三房广告配置失败" + baseMessage.getMsg());
                     }
 
                     @Override
@@ -337,6 +343,11 @@ public class SheepApp extends MultiDexApplication {
                 });
     }
 
+    //初始化掌酷广告
+    private void initZKAd(){
+
+    }
+
     /**
      * https://bugly.qq.com/v2/crash-reporting/crashes/0dd998212c/21541?pid=1
      * #21541 android.os.FileUriExposedException

app/src/main/res/layout/fragment_find_account.xml

@@ -1,7 +1,6 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
               android:orientation="vertical"
               android:paddingTop="24dp"
 

gradle.properties

@@ -18,7 +18,7 @@
 #android.injected.build.model.only.versioned = 3
 
 VERSION_NAME=3.8.4
-VERSION_CODE=3008003
+VERSION_CODE=3008004
 ANDROID_COMPILE_SDK_VERSION=30
 ANDROID_MIN_SDK_VERSION=18
 ANDORID_TARGET_SDK_VERSION=28