From abce02c7a61820f5d580f87364d542e817be429c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 06 七月 2021 15:22:11 +0800
Subject: [PATCH] 1.1.1完善
---
app/src/main/java/com/tejia/lijin/app/ui/SplashActivity.java | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/app/src/main/java/com/tejia/lijin/app/ui/SplashActivity.java b/app/src/main/java/com/tejia/lijin/app/ui/SplashActivity.java
index eb02d00..1294f2c 100644
--- a/app/src/main/java/com/tejia/lijin/app/ui/SplashActivity.java
+++ b/app/src/main/java/com/tejia/lijin/app/ui/SplashActivity.java
@@ -5,6 +5,7 @@
import android.app.Activity;
import android.app.ActivityManager;
import android.content.Context;
+import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
@@ -31,14 +32,14 @@
import com.alibaba.baichuan.android.trade.callback.AlibcTradeInitCallback;
import com.alibaba.baichuan.trade.biz.core.taoke.AlibcTaokeParams;
import com.google.gson.Gson;
-import com.huawei.android.hms.agent.HMSAgent;
-import com.huawei.android.hms.agent.common.handler.ConnectHandler;
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.qq.e.ads.splash.SplashAD;
import com.qq.e.ads.splash.SplashADListener;
import com.qq.e.comm.managers.GDTADManager;
import com.qq.e.comm.util.AdError;
import com.tejia.lijin.app.ShoppingApplication;
+import com.tejia.lijin.app.ui.dialog.UserGuideDialog;
+import com.tejia.lijin.app.ui.dialog.UserProtocolDialog;
import com.tejia.lijin.app.util.user.UserUtil;
import com.umeng.analytics.MobclickAgent;
import com.wpc.library.okhttp.OkHttpUtils;
@@ -158,31 +159,54 @@
e.printStackTrace();
}
-
- if (!AlibcTradeSDK.initState.isInitialized() && !AlibcTradeSDK.initState.isInitializing())
- taobaoInit();
-
mPermissionsChecker = new PermissionsChecker(this);
iv_splash = findViewById(R.id.iv_splash);
- /**
- * SDK杩炴帴HMS
- */
- if (MobileUtil.getDeviceBrand().equalsIgnoreCase("HUAWEI")
- || MobileUtil.getDeviceBrand().equalsIgnoreCase("HONOR")) {
- HMSAgent.connect(this, new ConnectHandler() {
- @Override
- public void onConnect(int rst) {
-// Toast.makeText(SplashActivity.this, "HMS connect end:" + rst, Toast.LENGTH_LONG).show();
- Log.e("mResult", "HMS connect end:" + rst);
-// getToken();
- }
- });
+ if (UserUtil.isAgreeUserProtocol(this)) {
+ init();
+ } else {
+ String data = "鎰熻阿鎮ㄥ鐗逛环涓�鐩翠互鏉ョ殑淇′换锛�<br> 鎴戜滑渚濈収鏂扮殑鐩戠瑕佹眰鏉′緥鏇存柊浜�<a href=\"http://h5.tejia.yeshitv.com/privacy.html\" style=\"text-decoration: none;\">銆婇殣绉佹斂绛栥��</a> 鍜�<a href=\"http://h5.tejia.yeshitv.com/user-protocol.html\" style=\"text-decoration: none;\">銆婄敤鎴峰崗璁��</a>锛屼负閲囧彇鐩稿簲瀹夊叏淇濇姢鎺柦锛屽敖鍔涗繚鎶ゆ偍鐨勪釜浜轰俊鎭畨鍏ㄥ彲鎺э紝鐗瑰悜浣犺鏄庡涓嬶細\n" +
+ "\t\t<br> 1銆佹偍鍦ㄤ娇鐢ㄧ壒浠峰悇椤逛骇鍝佹垨鏈嶅姟鏃讹紝灏嗕細鎻愪緵涓庡叿浣撳姛鑳界浉鍏崇殑涓汉淇℃伅锛堝彲鑳芥秹鍙婂笎鍙枫�佷綅缃�佷氦鏄撶瓑淇℃伅锛夈�俓n" +
+ "\t\t<br> 2銆佹偍鍙互闅忔椂鏌ヨ銆佹洿姝ｃ�佸垹闄ゆ偍鐨勪釜浜轰俊鎭紝鎴戜滑涔熸彁渚涜处鎴锋敞閿�鐨勬笭閬撱�俓n" +
+ "\t\t<br> 3銆佹湭缁忔偍鐨勫啀娆″悓鎰忥紝鎴戜滑涓嶄細灏嗕笂杩颁俊鎭敤浜庢偍鏈巿鏉冪殑鍏朵粬鐢ㄩ�旀垨鐩殑銆俓n" +
+ "\t\t<br> 4銆佹湭缁忕洃鎶や汉鍚屾剰锛屾垜浠笉浼氭敹闆嗕娇鐢�14鍛ㄥ瞾浠ヤ笅锛堝惈14鍛ㄥ瞾锛夋湭鎴愬勾浜轰釜浜轰俊鎭紝涓斾笉浼氬埄鐢ㄥ叾淇℃伅鎺ㄩ�佹柊闂汇�佹椂鏀夸俊鎭�佸箍鍛婄瓑瀹氬悜鎺ㄩ�佹椿鍔ㄣ��";
+ showUserProtocolAndGuide(data);
}
+ }
+
+
+ /**
+ * 鏄剧ず鐢ㄦ埛鍗忚涓庡脊绐�
+ */
+ private void showUserProtocolAndGuide(String protocol) {
+
+ final UserProtocolDialog.Builder dialogBuilder = new UserProtocolDialog.Builder(this).setData(protocol).setNegativeButton(null, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ finish();
+ }
+ }).setPositiveButton(null, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ UserUtil.agreeUserProtocol(getApplicationContext());
+ dialog.dismiss();
+ ShoppingApplication.init(ShoppingApplication.application);
+ init();
+ }
+ });
+ dialogBuilder.create().show();
+
+ }
+
+ private void init() {
+ if (!AlibcTradeSDK.initState.isInitialized() && !AlibcTradeSDK.initState.isInitializing())
+ taobaoInit();
getSystemParams();
setGoodsIndex();
getHomeNavbar();
+ jumpActivitry();//璺宠浆涓婚〉
}
+
private void initView() {
ll_ad = findViewById(R.id.ll_ad);
@@ -271,7 +295,7 @@
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (requestCode == 1024 && hasAllPermissionsGranted(grantResults)) {
GDTAdInfo adInfo = AdUtil.getGDTADInfo(getApplicationContext());
- if(adInfo==null)
+ if (adInfo == null)
return;
fetchSplashAD(this, container, skipView, adInfo.getSplashPid(), this, 0);
} else {
@@ -334,7 +358,6 @@
// isHomeJump = false;
// startPermissionsActivity();
// } else {
- jumpActivitry();//璺宠浆涓婚〉
// }
if (canJump) {
--
Gitblit v1.8.0