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 | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 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 7083d8c..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";//鍏抽棴璇︽儏椤� /*********璁惧妯″潡*********/ @@ -101,9 +106,11 @@ 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_USERRIGHTTYPe = "user_right_type";//鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤 + 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妯″潡*********/ @@ -133,6 +140,9 @@ public final static String UNI_EVENT_NOTIFICATION_DEVICE_DEL = "del";//璁惧鍒犻櫎 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 --------銆愬師鐢熴�戞墦寮�銆愬皬绋嬪簭銆�-------- @@ -146,7 +156,9 @@ 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_DEVICE_DETAILS = "pages/powerStationDetail/childPage/device/detail";//璁惧璇︽儏 - public final static String UNI_EVENT_OPEN_HOME_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄� + 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 -- Gitblit v1.8.0