From ec92a4e41838ae1954af337386a3508398602051 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期日, 27 四月 2025 13:43:22 +0800
Subject: [PATCH] 2025年04月27日13:43:20

---
 app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java |  158 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 91 insertions(+), 67 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index 2407b1a..3d59557 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -8,7 +8,6 @@
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
-import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
@@ -16,20 +15,23 @@
 
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
+import com.hdl.photovoltaic.HDLApp;
 import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.base.CustomBaseActivity;
 import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlCommonLogic;
 import com.hdl.photovoltaic.other.HdlResidenceLogic;
 import com.hdl.photovoltaic.ui.bean.HouseIdBean;
 import com.hdl.photovoltaic.ui.me.WebActivity;
+import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
 import com.hdl.photovoltaic.utils.LocalManageUtil;
 import com.hdl.photovoltaic.utils.SharedPreUtils;
 import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
 
 import java.util.List;
+
+import cn.jpush.android.api.JPushInterface;
 
 
 /**
@@ -46,74 +48,76 @@
     public void onBindView(Bundle savedInstanceState) {
         setStatusBarTranslucent();
         getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
-        //鍒濆鍖栨湇鍔″櫒鍩熷悕锛堢敤鎴锋敞鍐屾墍鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃锛�
-        AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
-        //鍒ゆ柇AccessToken鏄惁null
-        if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
-            if (UserConfigManage.getInstance().isBAccount()) {
-                //瀹夎鍟嗚烦杞晫闈�
-                Intent intent = new Intent();
-                intent.setClass(StartActivity.this, BPowerStationActivity.class);
-                openActivity(intent);
-            } else {
-                //C绔敤鎴疯烦杞晫闈�
-//                showLoading();
-                HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
-                    @Override
-                    public void onSuccess(List<HouseIdBean> obj) {
-//                        hideLoading();
-                        HdlResidenceLogic.getInstance().setHouseIdList(obj);
-                        Intent intent = new Intent();
-                        intent.setClass(StartActivity.this, CPowerStationActivity.class);
-                        openActivity(intent);
-                    }
-
-                    @Override
-                    public void onFailure(HDLException e) {
-//                        hideLoading();
-                        Intent intent = new Intent();
-                        intent.setClass(StartActivity.this, CPowerStationActivity.class);
-                        openActivity(intent);
-                    }
-                });
-            }
+        //鍙戝竷瀹℃牳灏忕背搴旂敤甯傚満瑕佹眰APP绗竴娆″惎鍔ㄦ彁鍓嶆彁绀恒�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥�嬫墠鍏佽涓婄嚎
+        final String key = "is_login";
+        HDLUniMPSDKManager.isExistsActivity=false;
+        boolean isLogin = SharedPreUtils.getBoolean(key);
+        if (!isLogin) {
+            ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(this);
+            confirmationCancelDialog.setTitle(getString(R.string.user_agreement_and_privacy_agreement));
+            confirmationCancelDialog.setContent(getString(R.string.thank_you_for_using));
+            confirmationCancelDialog.setConfirmation(getString(R.string.agree));
+            confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
+            confirmationCancelDialog.show();
+            setStringDifferentColors(confirmationCancelDialog.getContentTextView());
+            confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+                @Override
+                public void Cancel() {
+                    confirmationCancelDialog.dismiss();
+                    SharedPreUtils.putBoolean(key, false);
+                    finish();
+                }
+            });
+            confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+                @Override
+                public void Confirm() {
+                    confirmationCancelDialog.dismiss();
+                    initSdk();
+                    SharedPreUtils.putBoolean(key, true);
+                    Intent intent = new Intent();
+                    intent.setClass(StartActivity.this, LoginActivity.class);
+                    openActivity(intent);
+                }
+            });
         } else {
-            //鍙戝竷瀹℃牳灏忕背搴旂敤甯傚満瑕佹眰APP绗竴娆″惎鍔ㄦ彁鍓嶆彁绀恒�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥�嬫墠鍏佽涓婄嚎
-            final String key = "is_login";
-            boolean isLogin = SharedPreUtils.getBoolean(key);
-            if (isLogin) {
+            initSdk();
+            //鍒濆鍖栨湇鍔″櫒鍩熷悕锛堢敤鎴锋敞鍐屾墍鍦ㄦ湇鍔″櫒鍩熷悕鍦板潃锛�
+            AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
+            //鍒ゆ柇AccessToken鏄惁null
+            if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
+                if (UserConfigManage.getInstance().isBAccount()) {
+                    //瀹夎鍟嗚烦杞晫闈�
+                    Intent intent = new Intent();
+                    intent.setClass(StartActivity.this, BPowerStationActivity.class);
+                    openActivity(intent);
+                } else {
+                    //C绔敤鎴疯烦杞晫闈�
+//                showLoading();
+                    HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
+                        @Override
+                        public void onSuccess(List<HouseIdBean> obj) {
+//                        hideLoading();
+                            HdlResidenceLogic.getInstance().setHouseIdList(obj);
+                            Intent intent = new Intent();
+                            intent.setClass(StartActivity.this, CPowerStationActivity.class);
+                            openActivity(intent);
+                        }
+
+                        @Override
+                        public void onFailure(HDLException e) {
+//                        hideLoading();
+                            Intent intent = new Intent();
+                            intent.setClass(StartActivity.this, CPowerStationActivity.class);
+                            openActivity(intent);
+                        }
+                    });
+                }
+            } else {
                 Intent intent = new Intent();
                 intent.setClass(StartActivity.this, LoginActivity.class);
                 openActivity(intent);
-            } else {
-                ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(this);
-                confirmationCancelDialog.setTitle(getString(R.string.user_agreement_and_privacy_agreement));
-                confirmationCancelDialog.setContent(getString(R.string.thank_you_for_using));
-                confirmationCancelDialog.setConfirmation(getString(R.string.agree));
-                confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
-                confirmationCancelDialog.show();
-                setStringDifferentColors(confirmationCancelDialog.getContentTextView());
-                confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
-                    @Override
-                    public void Cancel() {
-                        SharedPreUtils.putBoolean(key, false);
-                        finish();
-                    }
-                });
-                confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
-                    @Override
-                    public void Confirm() {
-                        SharedPreUtils.putBoolean(key, true);
-                        Intent intent = new Intent();
-                        intent.setClass(StartActivity.this, LoginActivity.class);
-                        openActivity(intent);
-                    }
-                });
             }
-
-
         }
-
 
     }
 
@@ -182,7 +186,7 @@
                     public void updateDrawState(@NonNull TextPaint ds) {
                         super.updateDrawState(ds);
                         //璁剧疆瀛椾綋棰滆壊
-                        ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+                        ds.setColor(getResources().getColor(R.color.text_38C494, null));
                         // 鍘绘帀涓嬪垝绾�
                         ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                     }
@@ -205,7 +209,7 @@
                     public void updateDrawState(@NonNull TextPaint ds) {
                         super.updateDrawState(ds);
                         //璁剧疆瀛椾綋棰滆壊
-                        ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+                        ds.setColor(getResources().getColor(R.color.text_38C494, null));
                         // 鍘绘帀涓嬪垝绾�
                         ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
                     }
@@ -218,7 +222,7 @@
             }
             textView.setText(spannable);
             //涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
-            textView.setHighlightColor(getResources().getColor(R.color.text_66FFFFFF, null));
+            textView.setHighlightColor(getResources().getColor(R.color.text_FFACACAC, null));
             //鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
             textView.setMovementMethod(LinkMovementMethod.getInstance());
         } catch (Exception ignored) {
@@ -226,5 +230,25 @@
 
     }
 
+    /**
+     * 鍒濆鍖栦笁鏂圭浉鍏砈DK
+     * 灏忕背骞冲彴涓婄嚎锛岄渶瑕佸厛鍚屾剰鍚庯紝鍦ㄥ垵濮嬪寲鏋佸厜SDK,鍚﹀垯骞冲彴瀹℃牳涓嶈閫氳繃
+     */
+    private void initSdk() {
+        if (HDLApp.getInstance().isStartInitThirdSDK) {
+            return;
+        }
+        HDLApp.getInstance().isStartInitThirdSDK = true;
+        //鍒濆鍖栨瀬鍏夋帹閫�
+        initJPush();
+    }
+
+    /**
+     * 鍒濆鍖栨瀬鍏塖DK
+     */
+    private void initJPush() {
+        JPushInterface.setDebugMode(true);
+        JPushInterface.init(getBaseContext());
+    }
 
 }

--
Gitblit v1.8.0