From 355fe96b2a4c7821256d9e8828d2cb9539904878 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 05 五月 2022 19:29:16 +0800
Subject: [PATCH] 功能完善

---
 android/app/src/main/java/com/yeshi/makemoney/video/app/ui/SplashActivity.java |  113 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/android/app/src/main/java/com/yeshi/makemoney/video/app/ui/SplashActivity.java b/android/app/src/main/java/com/yeshi/makemoney/video/app/ui/SplashActivity.java
index c94328c..6fae566 100644
--- a/android/app/src/main/java/com/yeshi/makemoney/video/app/ui/SplashActivity.java
+++ b/android/app/src/main/java/com/yeshi/makemoney/video/app/ui/SplashActivity.java
@@ -15,6 +15,7 @@
 import com.yeshi.makemoney.video.app.ui.dialog.UserProtocolDialog;
 import com.yeshi.makemoney.video.app.utils.AppConfigUtil;
 import com.yeshi.makemoney.video.app.utils.Constant;
+import com.yeshi.makemoney.video.app.utils.SettingUtil;
 import com.yeshi.makemoney.video.app.utils.UserUtil;
 import com.demo.library_ad.AdUtil;
 import com.demo.library_ad.SplashAdUtil;
@@ -27,8 +28,11 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+
 import com.yeshi.makemoney.video.app.utils.api.HttpApiUtil;
 import com.yeshi.makemoney.video.app.utils.api.BasicTextHttpResponseHandler;
+
+import java.util.Iterator;
 
 import static android.content.pm.PackageManager.PERMISSION_DENIED;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
@@ -143,68 +147,67 @@
         MyApplication.init(MyApplication.application, new MyApplication.InitListener() {
             @Override
             public void onFinish() {
-                toMainActivity();
-            }
-        });
-
-//        if (1 > 0) {
-//            vg_ad.postDelayed(new Runnable() {
-//                @Override
-//                public void run() {
-//                    toMainActivity();
-//                }
-//            },3000);
-//
-//            return;
-//        }
-
-
-        int delayMs = 1;
-        vg_ad.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                HttpApiUtil.getConfig(getApplicationContext(), new BasicTextHttpResponseHandler() {
-
+                SettingUtil.initSettings(getApplicationContext());
+                int delayMs = 1;
+                vg_ad.postDelayed(new Runnable() {
                     @Override
-                    public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
-                        if (jsonObject != null) {
-                            if (jsonObject.getBoolean("IsPost")) {
-                                JSONObject data = jsonObject.getJSONObject("Data");
-                                JSONObject ad = data.optJSONObject("adNew");
-                                //娴忚鍣ㄥ璺冲崗璁�
-                                AppConfigUtil.saveBrowserJumpOutProtocolPrefix(getApplicationContext(), data.optString("jumpAppProtocolPrefix"));
-                                //淇濆瓨鑱旂郴瀹㈡湇锛屾敞閿�閾炬帴
-                                AppConfigUtil.saveConcatUsLink(getApplicationContext(), data.optString("contactUsLink"));
-                                AppConfigUtil.saveUnRegisterLink(getApplicationContext(), data.optString("unRegisterLink"));
-                                AdUtil.saveAdConfig(getApplicationContext(), ad);
-                                MyApplication.initAd(MyApplication.application, new MyApplication.InitListener() {
-                                    @Override
-                                    public void onFinish() {
-                                        runOnUiThread(new Runnable() {
+                    public void run() {
+                        HttpApiUtil.getConfig(getApplicationContext(), new BasicTextHttpResponseHandler() {
+
+                            @Override
+                            public void onSuccessPerfect(int statusCode, Header[] headers, JSONObject jsonObject) throws Exception {
+                                if (jsonObject != null) {
+                                    if (jsonObject.getInt("code") == 0) {
+                                        JSONObject data = jsonObject.getJSONObject("data");
+                                        JSONObject ad = data.optJSONObject("ad");
+                                        for (Iterator<String> its = data.keys(); its.hasNext(); ) {
+                                            String key = its.next();
+                                            AppConfigUtil.ConfigKey configKey = null;
+                                            try {
+                                                configKey = AppConfigUtil.ConfigKey.valueOf(key);
+                                            } catch (Exception e) {
+
+                                            }
+                                            if (configKey != null) {
+                                                //淇濆瓨閰嶇疆鏂囦欢
+                                                AppConfigUtil.saveConfig(configKey, data.optString(configKey.name()), getApplicationContext());
+                                            }
+                                        }
+                                        //淇濆瓨骞垮憡閰嶇疆
+                                        AdUtil.saveAdConfig(getApplicationContext(), ad);
+                                        MyApplication.initAd(MyApplication.application, new MyApplication.InitListener() {
                                             @Override
-                                            public void run() {
-                                                loadSplashAd();
+                                            public void onFinish() {
+                                                runOnUiThread(new Runnable() {
+                                                    @Override
+                                                    public void run() {
+                                                        loadSplashAd();
+                                                    }
+                                                });
                                             }
                                         });
+                                        return;
+                                    } else {
+                                        loadSplashAd();
                                     }
-                                });
-                                return;
+                                } else {
+                                    loadSplashAd();
+                                }
                             }
-                        }
-                        loadSplashAd();
+
+
+                            @Override
+                            public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
+                                super.onFailure(statusCode, headers, responseString, throwable);
+                                loadSplashAd();
+                            }
+                        });
+
+
                     }
-
-
-                    @Override
-                    public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) {
-                        super.onFailure(statusCode, headers, responseString, throwable);
-                        loadSplashAd();
-                    }
-                });
-
-
+                }, delayMs);
             }
-        }, delayMs);
+        });
     }
 
 
@@ -213,7 +216,7 @@
      */
     private void loadSplashAd() {
 
-        AdUtil.AD_TYPE splashType = AdUtil.getAdType(getApplicationContext(), "");
+        AdUtil.AD_TYPE splashType = AdUtil.getAdType(getApplicationContext(), "splashAd");
         if (splashType == null) {
             vg_ad.postDelayed(new Runnable() {
                 @Override

--
Gitblit v1.8.0