From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
index 49db2bd..582bf17 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
@@ -10,10 +10,14 @@
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
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.databinding.ActivitySetBinding;
+import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
+
/**
* 鎴戠殑-璁剧疆-鐣岄潰
@@ -32,8 +36,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -75,6 +79,14 @@
startActivityForResult(intent, 40);
}
});
+ //鍒囪姳鐜
+ viewBinding.setContextSwitchIl.getRoot().setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ switchServer();
+ }
+ });
+
//閫�鍑虹櫥褰�
viewBinding.outTv.setOnClickListener(new View.OnClickListener() {
@Override
@@ -82,24 +94,52 @@
logoutRequest();
}
});
-
+ final int[] count = {0};
+ viewBinding.toolbarTopRl.topTitleTv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ count[0] = count[0] + 1;
+ if (count[0] > 3) {
+ count[0] = 0;
+ startActivity(TestMainActivity.class);
+ }
+ }
+ });
}
private void initView() {
viewBinding.toolbarTopRl.topTitleTv.setText(R.string.me_set);
- viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
viewBinding.setLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
viewBinding.setAccountSecurityIl.sllLlRlNameTv.setText(R.string.set_account_security);
viewBinding.setTemperatureUnitIl.sllLlRlNameTv.setText(R.string.set_temperature_unit);
viewBinding.setLanguageIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ viewBinding.setLanguageIl.lineV.setVisibility(View.VISIBLE);
+ viewBinding.setAccountSecurityIl.lineV.setVisibility(View.VISIBLE);
String str = LocalManageUtil.getLanguage(UserConfigManage.getInstance().getCurrentAppLanguage()).getTitle();
viewBinding.setLanguageIl.sllLlRlRightContentTv.setText(str);
viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getTemperature_unit());
+
+// if (AppConfigManage.isDebug()) {
+// viewBinding.setContextSwitchIl.parentCl.setVisibility(View.VISIBLE);
+// viewBinding.setContextSwitchIl.sllLlRlNameTv.setText("褰撳墠鐜");
+// viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+// viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.VISIBLE);
+// if (AppConfigManage.getOnlineServer()) {
+// viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("绾夸笂");
+// } else {
+// viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("娴嬭瘯");
+// }
+// } else {
+// viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+// viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);
+// }
+
+ viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+ viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);
+
}
@@ -128,6 +168,7 @@
@Override
public void Confirm() {
dialog.dismiss();
+ HdlLogLogic.print("璁剧疆鐣岄潰閫�鍑虹櫥褰�---", true);
HDLLinkPMUser.getInstance().logout(0);
}
});
@@ -140,4 +181,32 @@
}
+
+ /**
+ * 鍒囨崲鐜鐨勬柟娉�
+ */
+ private void switchServer() {
+ // 浜屾纭鎻愮ず妗�
+ ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(this);
+ dialog.show();
+ dialog.setContent("鏄惁鍒囨崲鐜?");
+ dialog.isHideTitle(true);
+ dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ dialog.dismiss();
+ HdlLogLogic.print("璁剧疆鏄惁鍒囨崲鐜鐣岄潰閫�鍑虹櫥褰�---", true);
+ HDLLinkPMUser.getInstance().logout(100);
+ }
+ });
+ dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ dialog.dismiss();
+ }
+ });
+
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0