From 4c7cde7ae5ed57335405459e47de4bbd2726c4ba Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 07 五月 2022 19:43:39 +0800
Subject: [PATCH] 功能完善
---
android/app/src/main/java/com/yeshi/makemoney/video/app/ui/SplashActivity.java | 118 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 62 insertions(+), 56 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..a547560 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
@@ -7,6 +7,7 @@
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.os.Bundle;
+import android.os.PersistableBundle;
import android.view.ViewGroup;
import com.yeshi.makemoney.video.app.MyApplication;
@@ -15,6 +16,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;
@@ -24,11 +26,16 @@
import org.json.JSONObject;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
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 com.yeshi.makemoney.video.app.utils.videos.DrawVideoHBManager;
+
+import java.util.Iterator;
import static android.content.pm.PackageManager.PERMISSION_DENIED;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
@@ -85,7 +92,7 @@
"1銆佹垜浠鎮ㄧ殑涓汉淇℃伅锛堝寘鎷絾涓嶉檺浜�<font color='#FF0000'>璁惧MAC鍦板潃銆両MEI/Android ID</font>绛変俊鎭級鐨勬敹闆�/淇濆瓨/浣跨敤/瀵瑰鎻愪緵/淇濇姢绛夎鍒欐潯娆�,浠ュ強鎮ㄧ殑鐢ㄦ埛鏉冨埄绛夋潯娆撅紱<br>" +
"2銆佺害瀹氭垜浠殑闄愬埗璐ｄ换銆佸厤璐ｆ潯娆撅紱<br>" +
"3銆佸叾浠栦互鍔犵矖鎴栨枩浣撳瓧杩涜鏍囪瘑鐨勯噸瑕佹潯娆俱��</b><br>" +
- "濡傛偍瀵瑰崗璁湁浠讳綍鐤戣檻锛屽彲閫氳繃鐢靛瓙閭锛� xcwapp@qq.com 鍚戞垜浠闂紝鎴戜滑灏嗕负鎮ㄧ璇氳В绛斻�傛偍鐐瑰嚮鈥滃悓鎰忊�濈殑琛屼负浠ｈ〃鎮ㄥ凡闃呰瀹屾瘯骞舵帴鍙椾互涓婂崗璁叏閮ㄦ潯娆俱�傚鎮ㄥ悓鎰忎互涓婂崗璁唴瀹癸紝璇锋偍鐐瑰嚮鈥滃悓鎰忊�濓紝寮�濮嬩娇鐢ㄦ偍鐨勪骇鍝併��";
+ "濡傛偍瀵瑰崗璁湁浠讳綍鐤戣檻锛屽彲閫氳繃鐢靛瓙閭锛� yes_vip_draw_video@163.com 鍚戞垜浠闂紝鎴戜滑灏嗕负鎮ㄧ璇氳В绛斻�傛偍鐐瑰嚮鈥滃悓鎰忊�濈殑琛屼负浠ｈ〃鎮ㄥ凡闃呰瀹屾瘯骞舵帴鍙椾互涓婂崗璁叏閮ㄦ潯娆俱�傚鎮ㄥ悓鎰忎互涓婂崗璁唴瀹癸紝璇锋偍鐐瑰嚮鈥滃悓鎰忊�濓紝寮�濮嬩娇鐢ㄦ偍鐨勪骇鍝併��";
if (!UserUtil.isAgreeUserProtocol(getApplicationContext()) && !Constant.DEBUG) {
new UserProtocolDialog.Builder(SplashActivity.this).setNegativeButton("涓嶅悓鎰�", new DialogInterface.OnClickListener() {
@@ -143,68 +150,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 +219,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