From f7c38847b8e00c84c30e51a92c03071d3e9a9da8 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 14 五月 2024 09:08:57 +0800
Subject: [PATCH] 2024年05月14日09:08:49

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 1975031..d422b52 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -43,6 +43,7 @@
 import com.hdl.photovoltaic.ui.bean.Geolocation;
 import com.hdl.photovoltaic.ui.bean.LinkBean;
 import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.ui.bean.UnCountBean;
 import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
 import com.hdl.photovoltaic.ui.me.PersonalDataActivity;
 import com.hdl.photovoltaic.ui.me.SetActivity;
@@ -236,7 +237,6 @@
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME: {
                         this.uniGetInverterTime(mode_type, data, callback);
                     }
-
                     break;
                     //閫嗗彉鍣ㄦ椂闂寸紪杈�
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
@@ -266,6 +266,11 @@
                     //鑾峰彇鏈鐞�/鏈娑堟伅鏁伴噺
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MESSAGE_NUMBER: {
                         this.uniGetMessageNumber(mode_type, data, callback);
+                    }
+                    break;
+                    //鍒濆鍖栭�嗗彉鍣�
+                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_INITIALIZEINVERTER: {
+                        this.setInitializeGateway(mode_type, data, callback);
                     }
                     break;
 
@@ -302,6 +307,7 @@
                     //鎵撳紑鎵嬫満Wifi璁剧疆鐣岄潰
                     case HDLUniMP.UNI_EVENT_REPLY_OPEN_WIFI_SETTINGS: {
                         Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         HDLApp.getInstance().startActivity(intent);
                     }
                     break;
@@ -427,6 +433,7 @@
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         intent.setClass(HDLApp.getInstance(), SetActivity.class);
                         HDLApp.getInstance().startActivity(intent);
+
                     }
                     break;
 
@@ -1265,9 +1272,9 @@
      */
     private void uniGetMessageNumber(String type, Object data, DCUniMPJSCallback callback) {
         String homeId = getKeyValue("homeId", getKeyValue("data", data));
-        HdlMessageLogic.getInstance().getMessageUntreatedCount(homeId, new CloudCallBeak<String>() {
+        HdlMessageLogic.getInstance().getMessageUntreatedCount(homeId, new CloudCallBeak<UnCountBean>() {
             @Override
-            public void onSuccess(String data) {
+            public void onSuccess(UnCountBean data) {
                 uniCallbackData(type, data, callback);
             }
 
@@ -1720,6 +1727,28 @@
         ).start();
     }
 
+    /**
+     * 鍒濆鍖栦綘閫嗗彉鍣�
+     *
+     * @param type     璐﹀彿
+     * @param data     uni璇锋眰鏁版嵁
+     * @param callback uni鍥炶皟
+     */
+    public void setInitializeGateway(String type, Object data, DCUniMPJSCallback callback) {
+        String mac = getKeyValue("mac", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniCallbackData(type, obj, callback);
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+            }
+        });
+    }
+
 
     /**
      * 鍙戦�乵odbus鍗忚鏁版嵁

--
Gitblit v1.8.0