From 6139d9d4b4d42d43039fc5cec7c064d9cc20725b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 19 十月 2023 17:10:37 +0800
Subject: [PATCH] 2023年10月19日17:10:30

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 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 def2843..9014c74 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -14,6 +14,7 @@
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.listener.LinkCallBack;
+import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
 import com.hdl.photovoltaic.ui.bean.OidBean;
 import com.hdl.photovoltaic.uni.HDLUniMP;
 import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
@@ -114,8 +115,8 @@
                     //娣诲姞閫嗗彉鍣ㄥ埌浜戠
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
                         this.uniAddInverterDeviceToCloud(data, callback);
-
                     }
+                    break;
                     //鍒犻櫎浜戠閫嗗彉鍣�
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_DEL: {
                         this.uniDelInverterDevice(data, callback);
@@ -133,7 +134,6 @@
                     break;
                     case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
                         sendModBus(data, callback);
-
                     }
                     break;
                     //鑾峰彇oid鍒楄〃
@@ -253,13 +253,13 @@
 
             @Override
             public void onError(HDLLinkException e) {
-                uniCallbackData(null, -100, e.getMessage(), callback);
+                uniCallbackData(null, e.getCode(), e.getMessage(), callback);
             }
         });
     }
 
     /**
-     * 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠
+     * 閫嗗彉鍣ㄣ�愪笂浼犳暟鎹�戝埌浜戠
      *
      * @param data     uni鏁版嵁
      * @param callback uni鍥炶皟
@@ -277,7 +277,19 @@
      */
     private void uniEditInverterTime(Object data, DCUniMPJSCallback callback) {
         String mac = getKeyValue("mac", getKeyValue("data", data));
-        HdlDeviceLogic.getInstance().editGatewayTime(mac, new JsonObject(), null);
+        String date = getKeyValue("date", getKeyValue("data", data));
+        String time = getKeyValue("time", getKeyValue("data", data));
+        HdlDeviceLogic.getInstance().editGatewayTime(mac, date, time, new LinkCallBack<Boolean>() {
+            @Override
+            public void onSuccess(Boolean obj) {
+                uniCallbackData(true, callback);
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+            }
+        });
     }
 
     /**
@@ -288,15 +300,17 @@
      */
     private void uniGetInverterTime(Object data, DCUniMPJSCallback callback) {
         String mac = getKeyValue("mac", getKeyValue("data", data));
-        HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<Boolean>() {
+        HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<DeviceTimeBean>() {
             @Override
-            public void onSuccess(Boolean obj) {
-
+            public void onSuccess(DeviceTimeBean deviceTimeBean) {
+                if (callback != null) {
+                    uniCallbackData(deviceTimeBean, callback);
+                }
             }
 
             @Override
             public void onError(HDLLinkException e) {
-
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
             }
         });
     }
@@ -319,7 +333,7 @@
 
             @Override
             public void onError(HDLLinkException e) {
-                uniCallbackData(null, -2, e.getMsg(), callback);
+                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
             }
         });
     }
@@ -356,27 +370,27 @@
 
                                     @Override
                                     public void onFailure(HDLException e) {
-                                        uniCallbackData(null, -100, e.getMessage(), callback);
+                                        uniCallbackData(null, e.getCode(), e.getMessage(), callback);
                                     }
                                 });
                     }
 
                     @Override
                     public void onError(HDLLinkException e) {
-                        uniCallbackData(null, -100, e.getMessage(), callback);
+                        uniCallbackData(null, e.getCode(), e.getMessage(), callback);
                     }
                 });
             }
 
             @Override
             public void onError(HDLLinkException e) {
-                uniCallbackData(null, -100, e.getMessage(), callback);
+                uniCallbackData(null, e.getCode(), e.getMessage(), callback);
             }
         });
     }
 
     /**
-     * 閫嗗彉鍣ㄦ坊鍔犲埌浜戠涓�
+     * 鍒犻櫎浜戠涓婇�嗗彉鍣�
      *
      * @param data     uni鏁版嵁
      * @param callback uni鍥炶皟
@@ -391,7 +405,7 @@
 
             @Override
             public void onFailure(HDLException e) {
-                uniCallbackData(null, -100, e.getMessage(), callback);
+                uniCallbackData(null, e.getCode(), e.getMessage(), callback);
             }
         });
     }
@@ -412,7 +426,7 @@
             @Override
             public void onError(HDLLinkException e) {
                 //鍙戦�佸け璐�
-                uniCallbackData(null, e.getCode(), "", callback);
+                uniCallbackData(null, e.getCode(), e.getMessage(), callback);
             }
         });
 
@@ -440,7 +454,7 @@
             @Override
             public void onFailure(HDLException e) {
                 if (callback != null) {
-                    uniCallbackData(null, -2, e.getMessage(), callback);
+                    uniCallbackData(null, e.getCode(), e.getMessage(), callback);
                 }
             }
         });

--
Gitblit v1.8.0