From a8a25a3ae373115f9342c766a7ee241e8ca8f479 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 15 七月 2025 15:20:34 +0800 Subject: [PATCH] 2025年07月15日15:20:32 --- app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 75 ++++++++++++++++++++++++++++++++++--- 1 files changed, 69 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 ba94161..bbafcfa 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 @@ -7,14 +7,22 @@ import androidx.annotation.Nullable; +import com.hdl.linkpm.sdk.core.exception.HDLException; 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.enums.LogoutType; +import com.hdl.photovoltaic.listener.CloudCallBeak; +import com.hdl.photovoltaic.other.HdlAccountLogic; +import com.hdl.photovoltaic.other.HdlLogLogic; +import com.hdl.photovoltaic.other.HdlResidenceLogic; import com.hdl.photovoltaic.ui.test.TestMainActivity; import com.hdl.photovoltaic.utils.LocalManageUtil; import com.hdl.photovoltaic.widget.ConfirmationCancelDialog; + /** * 鎴戠殑-璁剧疆-鐣岄潰 @@ -33,8 +41,8 @@ @Override public void onBindView(Bundle savedInstanceState) { - setNotificationBarBackgroundColor(CustomColor.white); - setStatusBarTextColor(); + setStatusBarTranslucent(); + getWindow().setNavigationBarColor(getColor(R.color.text_FF000000)); //鍒濆鍖� initView(); //鍒濆鍖栫晫闈㈢洃鍚櫒 @@ -76,6 +84,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 @@ -99,18 +115,35 @@ 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); + } @@ -139,7 +172,9 @@ @Override public void Confirm() { dialog.dismiss(); - HDLLinkPMUser.getInstance().logout(0); + HdlLogLogic.print("璁剧疆鐣岄潰閫�鍑虹櫥褰�---", true); + HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout); + } }); dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() { @@ -151,4 +186,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); + HdlAccountLogic.getInstance().logout(LogoutType.ServerSwitchingLogout); + } + }); + dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() { + @Override + public void Cancel() { + dialog.dismiss(); + } + }); + + } + + } \ No newline at end of file -- Gitblit v1.8.0