From 788c70114287306db20e9a4539018d6e32fb5cb7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 四月 2024 10:10:10 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
index 680757a..4012af1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
@@ -2,10 +2,12 @@
import androidx.recyclerview.widget.LinearLayoutManager;
+import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
+import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
@@ -15,7 +17,9 @@
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
+import com.hdl.photovoltaic.uni.HDLUniMP;
import java.util.ArrayList;
import java.util.List;
@@ -79,7 +83,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- setResult(40);
+ backPressedData();
finish();
}
});
@@ -148,5 +152,28 @@
});
}
+ /**
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ */
+ @Override
+ public void onBackPressed() {
+ backPressedData();
+ super.onBackPressed();
+ }
+
+ /**
+ * 杩斿洖缁欎笂涓�绾х晫闈㈡暟鎹�
+ */
+ private void backPressedData() {
+ setResult(40);
+ //閫氱煡缁欏皬绋嬪簭鏇存柊娓╁害鍗曚綅
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("temperature_unit", UserConfigManage.getInstance().getTemperature_unit());
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_TEMPERATURE);
+ uniCallBackBaseBean.setData(jsonObject);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0