From c19f27f32f3c3d2caf82ddbdc3b2602ee3610e46 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:11:34 +0800
Subject: [PATCH] Merge branch '1.3.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 450e7b2..5c0183d 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,8 +1,6 @@
package com.hdl.photovoltaic.ui.me;
-import android.app.ActivityManager;
-import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
@@ -16,15 +14,10 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivitySetBinding;
import com.hdl.photovoltaic.other.HdlLogLogic;
-import com.hdl.photovoltaic.ui.StartActivity;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
-import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
-import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.umeng.analytics.MobclickAgent;
-import java.util.List;
/**
* 鎴戠殑-璁剧疆-鐣岄潰
@@ -133,6 +126,7 @@
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 {
@@ -140,9 +134,10 @@
}
} else {
viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+ viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);
}
- viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
+// viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
}
@@ -198,15 +193,15 @@
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
-// dialog.dismiss();
+ dialog.dismiss();
HdlLogLogic.print("璁剧疆鏄惁鍒囨崲鐜鐣岄潰閫�鍑虹櫥褰�---", true);
- HDLLinkPMUser.getInstance().logout(5);
+ HDLLinkPMUser.getInstance().logout(100);
}
});
dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@Override
public void Cancel() {
-// dialog.dismiss();
+ dialog.dismiss();
}
});
--
Gitblit v1.8.0