From 43c0a28db7e43959561036dbde0eb5cb37a7e324 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期五, 10 五月 2024 18:25:40 +0800 Subject: [PATCH] 2024年05月10日18:25:29 --- app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 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 89e5422..9c08e08 100644 --- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java +++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java @@ -78,6 +78,8 @@ 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绔�愭垜鐨勩�戞ā鍧�*********/ @@ -95,8 +97,9 @@ /*********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_WIFI_PHONE_INFO = "wifi_phone_info";//鑾峰彇褰撳墠wifi淇℃伅 + public final static String UNI_EVENT_REPLY_WIFI_SET_DEVICE = "wifi_set_device";//璁剧疆wifi缁欒澶� + public final static String UNI_EVENT_REPLY_OPEN_WIFI_SETTINGS = "open_wifi_settings";//璋冪敤鎵撳紑鎵嬫満Wifi璁剧疆鐣岄潰 //endregion //region --------銆愬師鐢熴�戜富鍔ㄥ彂閫佸埌銆愬皬绋嬪簭銆�-------- @@ -105,9 +108,10 @@ 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_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 //endregion //region --------銆愬師鐢熴�戞墦寮�銆愬皬绋嬪簭銆�-------- @@ -132,18 +136,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 = "鎴愬姛"; } @@ -155,12 +159,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