From 4bc924d0ce29560a5e1ad1adf1042de032d954a1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 04 十二月 2025 14:50:56 +0800
Subject: [PATCH] 2025年12月04日14:50:54
---
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 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 b3373b7..4526576 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -8,11 +8,13 @@
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;
import androidx.annotation.NonNull;
+import com.alibaba.fastjson.JSONObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.HDLApp;
@@ -20,6 +22,7 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
@@ -27,12 +30,13 @@
import com.hdl.photovoltaic.ui.me.WebActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
-import com.hdl.photovoltaic.utils.LocalManageUtil;
+import com.hdl.photovoltaic.utils.BadgeUtils;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.umeng.commonsdk.UMConfigure;
import java.util.List;
+import java.util.Objects;
import cn.jpush.android.api.JPushInterface;
@@ -49,8 +53,11 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ Log.d("StartActivity====", "onBindView");
setStatusBarTranslucent();
getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
+ BadgeUtils.cancelAllNotifications(_mActivity);
+ BadgeUtils.clearBadge(_mActivity);
//鍙戝竷瀹℃牳灏忕背搴旂敤甯傚満瑕佹眰APP绗竴娆″惎鍔ㄦ彁鍓嶆彁绀恒�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥�嬫墠鍏佽涓婄嚎
final String key = "is_login";
HDLUniMPSDKManager.isExistsActivity = false;
@@ -93,6 +100,7 @@
//瀹夎鍟嗚烦杞晫闈�
Intent intent = new Intent();
intent.setClass(StartActivity.this, BPowerStationActivity.class);
+ intent.putExtra("pushData", getIntentExpantData());
openActivity(intent);
} else {
//C绔敤鎴疯烦杞晫闈�
@@ -104,6 +112,7 @@
HdlResidenceLogic.getInstance().setHouseIdList(obj);
Intent intent = new Intent();
intent.setClass(StartActivity.this, CPowerStationActivity.class);
+ intent.putExtra("pushData", getIntentExpantData());
openActivity(intent);
}
@@ -128,7 +137,9 @@
}
}
+
}
+
@Override
public void startActivity(Intent intent) {
@@ -145,6 +156,7 @@
@Override
protected void onDestroy() {
super.onDestroy();
+ Log.d("StartActivity", "onDestroy");
overridePendingTransition(0, 0);
}
@@ -172,7 +184,7 @@
int startIndex2 = s.lastIndexOf("銆�");
int endIndex2 = s.lastIndexOf("銆�") + 1;
- if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.en)) {
s = s.replace("銆�", "").replace("銆�", "");
endIndex1 -= 1;
startIndex2 -= 2;//绉婚櫎"銆�"鍜�"銆�"鎬婚暱搴﹀彂鐢熷彉鍖栵紝绱㈠紩涔熸敼鍙�;
@@ -196,8 +208,8 @@
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(R.color.text_38C494, null));
- // 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ // 鍘绘帀涓嬪垝绾�(涓枃淇濈暀涓嬪垝绾�)
+ ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
}
@@ -220,7 +232,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(R.color.text_38C494, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
}
@@ -250,8 +262,9 @@
HDLApp.getInstance().isStartInitThirdSDK = true;
//鍒濆鍖栧弸鐩烻DK
initUMengSDK();
- //鍒濆鍖栨瀬鍏夋帹閫�
- initJPush();
+// //鍒濆鍖栨瀬鍏夋帹閫�
+// initJPush();
+
}
@@ -276,4 +289,27 @@
UMConfigure.setLogEnabled(false);//AppConfigManage.isDebug()
}
+ /**
+ * 澶勭悊浠庨�氱煡鐐瑰嚮甯︽潵鐨勬暟鎹紝杩欓噷鑾峰彇鏁版嵁锛岀劧鍚庨�忎紶缁欎富鐣岄潰鍋氬鐞�
+ *
+ * @return 杩斿洖闄勫姞鏁版嵁
+ */
+ private String getIntentExpantData() {
+ try {
+ // 澶勭悊浠庨�氱煡鐐瑰嚮甯︽潵鐨勬暟鎹紝杩欓噷鑾峰彇鏁版嵁锛岀劧鍚庨�忎紶缁欎富鐣岄潰鍋氬鐞�
+ if (getIntent().getExtras() != null) {
+ Log.d("鏉ヨ嚜鐐瑰嚮娑堟伅鐨勬暟鎹�===", JSONObject.toJSONString(getIntent().getExtras()));
+ for (String key : getIntent().getExtras().keySet()) {
+ Log.d("鏉ヨ嚜鐐瑰嚮娑堟伅鐨勬暟鎹�", "key: " + key + " value: " + getIntent().getExtras().get(key));
+ if (key.equals("pushData") || key.equals("extraMap")) {
+ return Objects.requireNonNull(getIntent().getExtras().get(key)).toString();
+ }
+ }
+ }
+ } catch (Exception e) {
+ return "";
+ }
+ return "";
+ }
+
}
--
Gitblit v1.8.0