From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 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 57c071c..9bbd029 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -1,6 +1,7 @@
package com.hdl.photovoltaic.uni;
+import java.io.InputStream;
import java.io.Serializable;
/**
@@ -31,6 +32,10 @@
public final static String UNI_EVENT_REPLY_HOME_EDIT = "edit";//浣忓畢銆愮數绔欍�戠紪杈�
public final static String UNI_EVENT_REPLY_HOME_DETAILS = "details";//浣忓畢銆愮數绔欍�戣鎯�
public final static String UNI_EVENT_REPLY_HOME_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
+ public final static String UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE = "delivery_url_qrcode";//鐢电珯鐨勪氦浠樹簩缁寸爜(瀹夎鍟�)
+ public final static String UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT = "deliver_to_account";//鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
+ public final static String UNI_EVENT_REPLY_HOME_UPDATEDEBUGPERM = "update_debug_perm";//鐢电珯鎺堟潈瀹夎鍟�(C绔�)
+ public final static String UNI_EVENT_REPLY_HOME_ADD = "scan_add_home";//鎵爜娣诲姞鐢电珯(C绔�)
public final static String UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE = "close_home_details_page";//鍏抽棴璇︽儏椤�
/*********璁惧妯″潡*********/
@@ -47,8 +52,13 @@
public final static String UNI_EVENT_REPLY_DEVICE_CLEAR_DATA = "clear_data";//璁惧娓呯┖浣忓畢id
public final static String UNI_EVENT_REPLY_DEVICE_UPLOADING_DATA = "uploading_data";//璁惧涓婁紶鏁版嵁
public final static String UNI_EVENT_REPLY_DEVICE_MODBUS_SEND = "modbus_send";//modbus鍗忚
+ public final static String UNI_EVENT_REPLY_DEVICE_Link_edit_SEND = "link_property_edit";//link鍗忚灞炴�х紪杈�
+ public final static String UNI_EVENT_REPLY_DEVICE_Link_read_SEND = "link_property_read";//link鍗忚灞炴�ц鍙�
public final static String UNI_EVENT_REPLY_DEVICE_MESSAGE_NUMBER = "message_number";//娑堟伅鎬绘暟閲�
public final static String UNI_EVENT_REPLY_DEVICE_DELETE_OID = "delete_Oid";//鍒犻櫎璁惧oid
+ public final static String UNI_EVENT_REPLY_DEVICE_INITIALIZEINVERTER = "initializeInverter";//鍒濆鍖栭�嗗彉鍣�
+ public final static String UNI_EVENT_REPLY_DEVICE_REMOTEINFO = "set_device_remoteInfo";//璁剧疆璁惧杩滅▼淇℃伅edit_name
+ public final static String UNI_EVENT_REPLY_DEVICE_EDIT_NAME = "edit_name";//璁惧鍚嶇О淇敼(淇敼鏄簯绔痮id鍚嶇О锛岃澶囦娇鐢╩odbus鍗忚淇敼)
/*********OTA妯″潡*********/
@@ -76,9 +86,11 @@
public final static String UNI_EVENT_REPLY_OTHER_LOCATION_INFO = "location_info";//鑾峰彇app浣嶇疆淇℃伅
public final static String UNI_EVENT_REPLY_OTHER_UNI_LOG = "uni_log";//鏀堕泦uni鏃ュ織
public final static String UNI_EVENT_REPLY_OTHER_BACK = "back";//棣栭〉杩斿洖
+ public final static String UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT = "application_conflict";//搴旂敤鍐茬獊
+ public final static String UNI_EVENT_REPLY_OTHER_LOGOUT = "uni_logout";//閫�鍑虹櫥褰�
- /*********C绔�愭垜鐨勩�戞ā鍧�*********/
+ /*********銆愭垜鐨勩�戞ā鍧�*********/
public final static String UNI_EVENT_REPLY_MINE_MODEL = "uni_mine_model";//鎴戠殑妯″潡(澶х被)
public final static String UNI_EVENT_REPLY_MINE_USER_INFO = "get_user_info";//涓汉淇℃伅鑾峰彇锛�
public final static String UNI_EVENT_REPLY_MINE_EDIT_AVATAR = "edit_avatar";//澶村儚鏇存柊
@@ -88,13 +100,32 @@
public final static String UNI_EVENT_REPLY_MINE_USER_MANAGER = "user_manager";//鐢ㄦ埛绠＄悊
public final static String UNI_EVENT_REPLY_MINE_ABOUT = "about";//鍏充簬
public final static String UNI_EVENT_REPLY_MINE_SETTING = "setting";//璁剧疆
+ public final static String UNI_EVENT_REPLY_MEMBER_LIST = "member_list";//鎴愬憳鍒楄〃
+ public final static String UNI_EVENT_REPLY_MEMBER_ADD = "member_add";//鎴愬憳娣诲姞
+ public final static String UNI_EVENT_REPLY_MEMBER_DELETE = "member_delete";//鎴愬憳鍒犻櫎
+ public final static String UNI_EVENT_REPLY_MEMBER_EDIT = "member_edit";//鎴愬憳缂栬緫锛堝寘鍚娉ㄣ�佹潈闄愪慨鏀癸級
+ public final static String UNI_EVENT_REPLY_STAFF_LIST = "staff_list";//鍛樺伐鍒楄〃
+ public final static String UNI_EVENT_REPLY_STAFF_ADD = "staff_add";//鍛樺伐娣诲姞
+ public final static String UNI_EVENT_REPLY_STAFF_DETAIL = "staff_detail";//鍛樺伐璇︽儏鑾峰彇
+ public final static String UNI_EVENT_REPLY_STAFF_DELETE = "staff_delete";//鍛樺伐鍒犻櫎
+ public final static String UNI_EVENT_REPLY_STAFF_EDIT = "staff_edit";//鍛樺伐缂栬緫
+ public final static String UNI_EVENT_REPLY_USERRIGHTTYP = "user_right_type";//鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
+ public final static String UNI_EVENT_REPLY_DOWNLOAD_MEMBER_AVATAR = "download_member_avatar";//涓嬭浇鎴愬憳锛堝瓙璐﹀彿锛夊ご鍍�
- /*********Wifi妯″潡*********/ //鍗敠瀹氫箟
+ /*********Wifi妯″潡*********/
public final static String UNI_EVENT_REPLY_WIFI_MODEL = "uni_wifi_model";//wifi妯″潡(澶х被)
- public final static String UNI_EVENT_REPLY_WIFI_LIST = "list";//鑾峰彇wifi鍒楄〃
- public final static String UNI_EVENT_REPLY_WIFI_INFO = "info";//鑾峰彇褰撳墠wifi淇℃伅
- public final static String UNI_EVENT_REPLY_WIFI_CONNECT = "connect";//杩炴帴wifi
+ public final static String UNI_EVENT_REPLY_PHONE_WIFI_LIST = "phone_wifi_list";//鎵嬫満鑾峰彇wifi鍒楄〃
+ public final static String UNI_EVENT_REPLY_PHONE_WIFI_INFO = "phone_wifi_info";//鎵嬫満鑾峰彇褰撳墠wifi淇℃伅
+ public final static String UNI_EVENT_REPLY_PHONE_OPEN_WIFI_SETTINGS = "phone_open_wifi_settings";//璋冪敤鎵撳紑鎵嬫満Wifi璁剧疆鐣岄潰
+ public final static String UNI_EVENT_REPLY_DEVICE_WIFI_SET = "device_wifi_set";//閫嗗彉鍣╓iFi淇℃伅閰嶇疆
+ public final static String UNI_EVENT_REPLY_DEVICE_WIFI_GET = "device_wifi_get";//閫嗗彉鍣╓iFi淇℃伅鑾峰彇
+ public final static String UNI_EVENT_REPLY_DEVICE_HOTSPOT_SET = "device_hotspot_set";//閫嗗彉鍣ㄧ儹鐐归厤缃�
+ public final static String UNI_EVENT_REPLY_DEVICE_HOTSPOT_GET = "device_hotspot_get";//閫嗗彉鍣ㄧ儹鐐硅幏鍙�
+ public final static String UNI_EVENT_REPLY_DEVICE_ETHERNET_SET = "device_ethernet_set";//閫嗗彉鍣ㄤ互澶綉閰嶇疆
+ public final static String UNI_EVENT_REPLY_DEVICE_ETHERNET_GET = "device_ethernet_get";//閫嗗彉鍣ㄤ互澶綉鑾峰彇
+
+
//endregion
//region --------銆愬師鐢熴�戜富鍔ㄥ彂閫佸埌銆愬皬绋嬪簭銆�--------
@@ -103,9 +134,15 @@
public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO = "refresh_userinfo";//鍒锋柊鐢ㄦ埛淇℃伅
public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_TEMPERATURE = "temperature_format_changed";//鍒锋柊鍗曚綅娓╁害
public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER = "refresh_unread_messages_number";//鍒锋柊鏈娑堟伅鏁伴噺
+ public final static String UNI_EVENT_NOTIFICATION_MQTT_CONNECT_SUCCESS = "mqtt_connect_success";//閫氱煡mqtt杩炴帴鎴愬姛
+ public final static String UNI_EVENT_NOTIFICATION_REMOVE_VIEW = "remove_view";//閫氱煡uni绉婚櫎鐣岄潰
public final static String UNI_EVENT_NOTIFICATION_DEVICE_ADD = "add";//璁惧娣诲姞
public final static String UNI_EVENT_NOTIFICATION_DEVICE_DEL = "del";//璁惧鍒犻櫎
- public final static String UNI_EVENT_NOTIFICATION_DEVICE_OID = "oid";//璁惧銆愬寘鎷笅鎸傝澶囥�憃id鍒楄〃
+ public final static String UNI_EVENT_NOTIFICATION_DEVICE_OID = "oid";//璁惧銆愬寘鎷笅鎸傝澶囥�憃id鍒楄〃Remove interface
+ public final static String UNI_EVENT_NOTIFICATION_DEVICE_CONNECTION_STATUS = "connection_status";//閫嗗彉鍣ㄨ繛鎺ヨ矾鐢卞櫒鐘舵��
+ public final static String UNI_EVENT_NOTIFICATION_DEVICE_home_remove_refresh = "home_remove_refresh";//鐢电珯鍒犻櫎
+ public final static String UNI_EVENT_NOTIFICATION_DEVICE_home_debug_refresh = "home_debug_refresh";//鐢电珯浜屾璋冭瘯
+ public final static String UNI_EVENT_NOTIFICATION_DEVICE_home_delivery_refresh = "home_delivery_refresh";//鐢电珯浜や粯
//endregion
//region --------銆愬師鐢熴�戞墦寮�銆愬皬绋嬪簭銆�--------
@@ -115,9 +152,13 @@
public final static String UNI_EVENT_OPEN_HOME_EDIT = "pages/powerStation/powerStationEdit";//浣忓畢銆愮數绔欍�戠紪杈�
public final static String UNI_EVENT_OPEN_HOME_DETAILS = "pages/powerStationDetail/index";//浣忓畢銆愮數绔欍�戣鎯�
+
public final static String UNI_EVENT_OPEN_HOME_DETAILS_C = "pages/powerStationDetail/tabbarPage";//C绔墦寮�銆愮數绔欍�戣鎯�
public final static String UNI_EVENT_OPEN_HOME_Null_C = "pages/powerStationDetail/tabbarPage";//鏃犵數绔欐椂锛堜笉闇�瑕佷紶鍙傛暟锛�
- public final static String UNI_EVENT_OPEN_HOME_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
+ public final static String UNI_EVENT_OPEN_DEVICE_DETAILS = "pages/powerStationDetail/childPage/device/detail";//璁惧璇︽儏
+ public final static String UNI_EVENT_OPEN_MINE_MINESTAFFMANAGER = "pages/mine/mineStaffManager";//B绔墦寮�鍛樺伐绠＄悊鐣岄潰
+
+ public final static String UNI_EVENT_OPEN_DEVICESCAN = "pages/powerStation/deviceScan";//璺冲埌uni鎵簩缁寸爜鐣岄潰
/*********璁惧妯″潡*********/
//璁惧妯″潡鎵撳紑椤甸潰鍏ㄨ矾寰�
//endregion
@@ -130,18 +171,18 @@
public static class UniCallBackBaseBean implements Serializable {
private int code;//鐘舵�佺爜
- private String mes;//淇℃伅鎻忚堪
+ private String msg;//淇℃伅鎻忚堪
private String type;//鍔熻兘绫诲瀷
private Object data;//闄勫姞json鏁版嵁
- public UniCallBackBaseBean(int code, String mes) {
+ public UniCallBackBaseBean(int code, String msg) {
this.code = code;
- this.mes = mes;
+ this.msg = msg;
}
public UniCallBackBaseBean() {
this.code = 0;
- this.mes = "鎴愬姛";
+ this.msg = "鎴愬姛";
}
@@ -153,12 +194,12 @@
this.code = code;
}
- public String getMes() {
- return mes == null ? "" : mes;
+ public String getMsg() {
+ return msg == null ? "" : msg;
}
- public void setMes(String mes) {
- this.mes = mes;
+ public void setMsg(String msg) {
+ this.msg = msg;
}
public Object getData() {
--
Gitblit v1.8.0