From da53ba3b968531f4d9af8bc6487d174309281c0f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十二月 2023 16:13:39 +0800
Subject: [PATCH] 2023年12月05日16:13:31

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java |   91 ++++++++++++++++++++++++++++-----------------
 1 files changed, 56 insertions(+), 35 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 254ced8..0cb3ecc 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
@@ -1,19 +1,33 @@
 package com.hdl.photovoltaic.ui.me;
 
 
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
 import android.os.Bundle;
+import android.os.IBinder;
 import android.view.View;
+
+import androidx.annotation.Nullable;
 
 import com.hdl.linkpm.sdk.HDLLinkPMSdk;
 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.UserConfigManage;
 import com.hdl.photovoltaic.databinding.ActivitySetBinding;
+import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
+import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpService;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.other.HdlAccountLogic;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.ui.StartActivity;
+import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
+import com.hdl.photovoltaic.utils.AppManagerUtils;
+import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
 import com.hdl.photovoltaic.widget.ConfirmationInputDialog;
 
 /**
@@ -21,7 +35,9 @@
  */
 public class SetActivity extends CustomBaseActivity {
 
+
     private ActivitySetBinding viewBinding;
+
 
     @Override
     public Object getContentView() {
@@ -31,7 +47,8 @@
 
     @Override
     public void onBindView(Bundle savedInstanceState) {
-
+        setNotificationBarBackgroundColor(CustomColor.white);
+        setStatusBarTextColor();
         //鍒濆鍖�
         initView();
         //鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -46,24 +63,30 @@
                 finish();
             }
         });
-        viewBinding.setNicknameIl.sllLlNameRl.setOnClickListener(new View.OnClickListener() {
+        //澶氳瑷�
+        viewBinding.setLanguageIl.getRoot().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                changedNickname();
+                startActivity(languageSelectionActivity.class);
             }
         });
-        viewBinding.setChangePasswordIl.sllLlNameRl.setOnClickListener(new View.OnClickListener() {
+        //璐﹀彿涓庡畨鍏�
+        viewBinding.setAccountSecurityIl.getRoot().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(MeChangePasswordActivity.class);
+                Intent intent = new Intent();
+                intent.setClass(_mActivity, AccountAndSecurityActivity.class);
+                startActivity(intent);
             }
         });
-        viewBinding.setPushMsgIl.sllLlRlRightSwitchIv.setOnClickListener(new View.OnClickListener() {
+        //娓╁害鍗曚綅
+        viewBinding.setTemperatureUnitIl.getRoot().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                v.setSelected(!v.isSelected());
+                startActivity(TemperatureUnitActivity.class);
             }
         });
+        //閫�鍑虹櫥褰�
         viewBinding.outTv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -76,33 +99,12 @@
 
     private void initView() {
         viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_set);
-        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C,null));
+        viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
         viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
-        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF,null));
-        viewBinding.setNicknameIl.sllLlRlNameTv.setText(R.string.set_nickname);
-        viewBinding.setChangePasswordIl.sllLlRlNameTv.setText(R.string.home_login_change_password);
-        viewBinding.setCloseAccountIl.sllLlRlNameTv.setText(R.string.set_close_account);
-        viewBinding.setMesIl.sllLlRlTitleTv.setText(R.string.set_message_setting);
-        viewBinding.setPushMsgIl.sllLlRlNameTv.setText(R.string.set_push_notification);
-        viewBinding.setPushMsgIl.sllLlRlRightNextIv.setVisibility(View.GONE);
-        viewBinding.setPushMsgIl.sllLlRlRightSwitchIv.setVisibility(View.VISIBLE);
-        viewBinding.setCallMsgIl.sllLlRlNameTv.setText(R.string.set_alarm_message);
-        viewBinding.setGeneralMsgIl.sllLlRlTitleTv.setText(R.string.set_general_setting);
-        viewBinding.setMultiLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
-        viewBinding.setDataCenterIl.sllLlRlNameTv.setText(R.string.set_data_centre);
-        viewBinding.setPrivacyIl.sllLlRlTitleTv.setText(R.string.set_privacy);
-        viewBinding.setSystemAuthorizationIl.sllLlRlNameTv.setText(R.string.set_system_rights_managemen);
-        viewBinding.setShareIl.sllLlRlNameTv.setText(R.string.set_3_msg_sharing);
-
-        if (UserConfigManage.getInstance().isBAccount()) {
-            //B绔�
-            viewBinding.setNicknameIl.sllLlNameRl.setVisibility(View.GONE);
-        } else {
-            //C绔�
-            viewBinding.setNicknameIl.sllLlNameRl.setVisibility(View.VISIBLE);
-        }
-
-
+        viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, 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);
     }
 
     /**
@@ -125,7 +127,7 @@
                         public void onSuccess(Boolean obj) {
                             UserConfigManage.getInstance().setUserName(str);
                             UserConfigManage.getInstance().Save();
-                            HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_change_name_succeed),0);
+                            HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_change_name_succeed), 0);
                         }
 
                         @Override
@@ -146,10 +148,29 @@
 
     }
 
+
     /**
      * 閫�鍑虹櫥褰曡姹傜殑鏂规硶
      */
     private void logoutRequest() {
-        HDLLinkPMUser.getInstance().logout(0);
+        // 浜屾纭鎻愮ず妗�
+        ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(this);
+        dialog.setTitle(getString(R.string.loading_title_tip));
+        dialog.setContent(getString(R.string.loading_log_out));
+        dialog.show();
+        dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+            @Override
+            public void Confirm() {
+                HDLLinkPMUser.getInstance().logout(0);
+            }
+        });
+        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+            @Override
+            public void Cancel() {
+                dialog.dismiss();
+            }
+        });
+
     }
+
 }
\ No newline at end of file

--
Gitblit v1.8.0