From bd80ca98ffb4f483ca2eba47051281fa69e790ac Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 14 八月 2023 10:24:25 +0800
Subject: [PATCH] 代码同步

---
 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index 3106d1a..cef39cc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -28,7 +28,8 @@
     public final static String UNI_EVENT_REPLY_Home_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
     /*********璁惧妯″潡*********/
     public final static String UNI_EVENT_REPLY_DEVICE_MODEL = "uni_device_model";//璁惧妯″潡(澶х被)
-    public final static String UNI_EVENT_REPLY_DEVICE_LIST = "list";//閫嗗彉鍣ㄨ澶囧垪琛�
+    public final static String UNI_EVENT_REPLY_DEVICE_NET_LIST = "net_list";//閫嗗彉鍣ㄧ綉缁滆澶囧垪琛�
+    public final static String UNI_EVENT_REPLY_DEVICE_LIST = "list";//閫嗗彉鍣ㄦ湰鍦拌澶囧垪琛�
     public final static String UNI_EVENT_REPLY_DEVICE_CHILD_LIST = "child_list";//閫嗗彉鍣ㄣ�愪笅鎸傘�戣澶囧垪琛�
     public final static String UNI_EVENT_REPLY_DEVICE_ADD = "add";//璁惧娣诲姞
     public final static String UNI_EVENT_REPLY_DEVICE_DEL = "del";//璁惧鍒犻櫎
@@ -69,27 +70,27 @@
      */
     public static class UniCallBackBaseBean implements Serializable {
 
-        private String code;//鐘舵�佺爜
+        private int code;//鐘舵�佺爜
         private String mes;//淇℃伅鎻忚堪
         private String type;//鍔熻兘绫诲瀷
         private Object data;//闄勫姞json鏁版嵁
 
-        public UniCallBackBaseBean(String code, String mes) {
+        public UniCallBackBaseBean(int code, String mes) {
             this.code = code;
             this.mes = mes;
         }
 
         public UniCallBackBaseBean() {
-            this.code = "0";
+            this.code = 0;
             this.mes = "鎴愬姛";
         }
 
 
-        public String getCode() {
-            return code == null ? "" : code;
+        public int getCode() {
+            return code;
         }
 
-        public void setCode(String code) {
+        public void setCode(int code) {
             this.code = code;
         }
 

--
Gitblit v1.8.0