From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/internet/api/TopicApi.java | 172 ++++++++++++++++-----------------------------------------
1 files changed, 49 insertions(+), 123 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/api/TopicApi.java b/app/src/main/java/com/hdl/photovoltaic/internet/api/TopicApi.java
index 4b47422..58ea8ae 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/api/TopicApi.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/api/TopicApi.java
@@ -1,6 +1,40 @@
package com.hdl.photovoltaic.internet.api;
public class TopicApi {
+
+
+ /*
+ *閫嗗彉鍣ㄧ儹鐐归厤缃�
+ * */
+ public static final String DELETING_GATEWAY_HOTSPOT_EDIT = "/user/%s/custom/hotspot/edit";
+ /*
+ *閫嗗彉鍣ㄧ儹鐐硅幏鍙�
+ * */
+ public static final String DELETING_GATEWAY_HOTSPOT_GET = "/user/%s/custom/hotspot/get";
+
+
+ /*
+ *閫嗗彉鍣╳if閰嶇疆
+ * */
+ public static final String DELETING_GATEWAY_WIFI_EDIT = "/user/%s/custom/wifi/edit";
+ /*
+ *閫嗗彉鍣╳ifi鑾峰彇
+ * */
+ public static final String DELETING_GATEWAY_WIFI_GET = "/user/%s/custom/wifi/get";
+
+ /*
+ *閫嗗彉鍣╳ifi鐘舵�侀�氱煡
+ * */
+ public static final String DELETING_GATEWAY_WIFI_NOTIFY = "/user/%s/custom/wifi/notify";
+ /*
+ *閫嗗彉鍣ㄤ互澶綉閰嶇疆
+ * */
+ public static final String DELETING_GATEWAY_ETHERNET_EDIT = "/user/%s/custom/ethernet/edit";
+ /*
+ *閫嗗彉鍣ㄤ互澶綉鑾峰彇
+ * */
+ public static final String DELETING_GATEWAY_ETHERNET_GET = "/user/%s/custom/ethernet/get";
+
/*
*閫氱煡鍒犻櫎骞堕��缃戝瓙璁惧鎷撴墤鍏崇郴
*鍒犻櫎浠庣綉鍏�
@@ -32,45 +66,25 @@
* 鍐欒繙绋嬩俊鎭殑锛屼緥濡傛湇鍔″櫒鍦板潃銆丠omeId銆佸瘑閽ヤ箣绫�
* 涓庢湇鍔″櫒鐩稿叧鐨�
* */
- public static final String GATEWAY_SEND_REMOTE_EDIT = "/user/%s/custom/gateway/remote/edit";
+ public static final String SET_GATEWAY_REMOTE_EDIT = "/user/%s/custom/gateway/remote/edit";
/*
* 缃戝叧鎭㈠鍑哄満璁剧疆鍛戒护
* */
public static final String GATEWAY_INITIALIZE_REMOTE = "/user/%s/custom/gateway/initialize";
public static final String GATEWAY_FIND_REMOTE = "/base/%s/thing/service/mmv_device_find/down";
+ //缃戝叧鏃堕棿璇诲彇
+ public static final String GET_GATEWAY_TIME = "/user/%s/custom/gateway/time/get";
+ //缃戝叧鏃堕棿淇敼
+ public static final String SET_GATEWAY_TIME_EDIT = "/user/%s/custom/gateway/time/edit";
- /**
- * 绾㈠瀹濈殑瀹氫綅
- */
- public static final String IR_FIND_REMOTE = "/base/%s/thing/service/irDeviceFind/down";
- /**
- * 绾㈠瀹濊瘯鐮�
- */
- public static final String IR_CODE_TEST = "/base/%s/thing/service/irCodeTest/down";
- /**
- * 绾㈠瀹濋仴鎺у櫒娣诲姞
- */
- public static final String IR_DEVICE_ADD = "/base/%s/thing/service/irDeviceAdd/down";
- /**
- * 绾㈠瀹濋仴鎺у櫒鍒楄〃鑾峰彇
- */
- public static final String IR_DEVICE_LIST = "/base/%s/thing/service/irDeviceListGet/down";
- /**
- * 绾㈠瀹濊嚜瀛︾爜
- */
- public static final String IR_CODE_STUDY = "/base/%s/thing/service/irCodeStudy/down";
- /**
- * 绾㈠瀹濊嚜瀛︾爜鍒犻櫎
- */
- public static final String IR_CODE_REMOVE = "/base/%s/thing/service/irCodeRemove/down";
-
-
+ //鏈湴鍗囩骇鍖呮帹閫�(鍛婅瘔缃戝叧涓嬭浇鍗囩骇鍖呭湴鍧�绛変俊鎭�)
+ public static final String SET_GATEWAY_UPGRADE_INFO = "/base/%s/ota/device/upgrade/down";
/*
* 缃戝叧缂栬緫鍛戒护
* 涓庢湇鍔″櫒鏃犲叧鐨�
* */
- public static final String GATEWAY_SEND_EDIT = "/user/%s/custom/gateway/edit";
+ public static final String SET_GATEWAY_EDIT = "/user/%s/custom/gateway/edit";
/**
* 璁剧疆缃戝叧鍏ョ綉妯″紡
@@ -100,11 +114,11 @@
*/
public static final String GATEWAY_SEARCH_REPLY = "/user/all/custom/gateway/search_reply";
- //缃戝叧璇︾粏淇℃伅鑾峰彇s=gw_id
- public static final String GATEWAY_INFO = "/user/%s/custom/gateway/get";
+ //缃戝叧璇︾粏淇℃伅
+ public static final String GET_GATEWAY_INFO = "/user/%s/custom/gateway/get";
//鑾峰彇鐗╃悊璁惧鍒楄〃
- public static final String GET_DEVICE_LIST = "/user/%s/custom/device/list/get";
+ public static final String GET_GATEWAY_OID_LIST = "/user/%s/custom/device/list/get";
//鑾峰彇鐗╃悊璁惧鍒楄〃鍝嶅簲
public static final String GET_DEVICE_LIST_REPLY = "/user/%s/custom/device/list/get_reply";
@@ -152,98 +166,6 @@
//鏇存敼缃戝叧澶囨敞鍚�
public static final String GATEWAY_RENAME = "/user/%s/custom/gateway/edit";
- //8.1鑾峰彇鍦烘櫙鍒楄〃
- public static final String SCENE_LIST_GET = "/user/%s/custom/scene/list/get";
-
- //8.2鑾峰彇鍦烘櫙
- public static final String SCENE_GET = "/user/%s/custom/scene/get";
-
- //8.3鎵ц鍦烘櫙
- public static final String SCENE_CONTROL = "/user/%s/custom/scene/execute";
-
- //8.4鍦烘櫙澧炲姞
- public static final String CREATE_SCENE = "/user/%s/custom/scene/add";
-
- //8.5鍦烘櫙缂栬緫
- public static final String SCENE_EDIT = "/user/%s/custom/scene/edit";
-
- //8.6鍦烘櫙鍒犻櫎
- public static final String SCENE_DELETE = "/user/%s/custom/scene/delete";
-
- //9.1 鎴块棿淇℃伅鍒楄〃鑾峰彇
- public static final String ROOM_LIST_GET = "/user/%s/custom/room/list/get";
-
- //9.2 鎴块棿淇℃伅娣诲姞锛堝閲忥級
- public static final String ROOM_ADD = "/user/%s/custom/room/add";
-
- //9.2.1 鎴块棿淇℃伅娣诲姞锛堝叏閲忥級
- public static final String ROOM_COVER_ADD = "/user/%s/custom/room/cover/add";
-
- //9.3 鎴块棿淇℃伅缂栬緫
- public static final String ROOM_EDIT = "/user/%s/custom/room/edit";
-
- //9.4 鎴块棿淇℃伅鍒犻櫎
- public static final String ROOM_DELETE = "/user/%s/custom/room/delete";
-
- //9.5 鎴块棿缁戝畾鍏崇郴鍒楄〃鑾峰彇
- public static final String ROOM_BIND_LIST_GET = "/user/%s/custom/room/bind/list/get";
-
- //9.6 鎴块棿缁戝畾鍏崇郴娣诲姞锛堝閲忥級
- public static final String ROOM_BIND_ADD = "/user/%s/custom/room/bind/add";
-
- //9.6.1 鎴块棿缁戝畾鍏崇郴娣诲姞(鍏ㄩ噺)
- public static final String ROOM_BIND_COVER_ADD = "/user/%s/custom/room/bind/cover/add";
-
- //9.7 鎴块棿缁戝畾鍏崇郴鍒犻櫎
- public static final String ROOM_BIND_DELETE = "/user/%s/custom/room/bind/delete";
-
- //10.1 鑷姩鍖栧垪琛ㄨ幏鍙�
- public static final String LOGIC_LIST_GET = "/user/%s/custom/logic/list/get";
-
- //10.2 鑷姩鍖栨墜鍔ㄦ墽琛�
- public static final String LOGIC_execute = "/user/%s/custom/logic/execute";
-
- //10.3 鑷姩鍖栬幏鍙� 鍒楄〃涓�娆℃�ц鍏�
- public static final String LOGIC_GET = "/user/%s/custom/logic/get";
-
- //10.4 鑷姩鍖栨柊澧�/缂栬緫
- public static final String LOGIC_EDIT = "/user/%s/custom/logic/edit";
-
- //10.5 鑷姩鍖栧垹闄�
- public static final String LOGIC_DELETE = "/user/%s/custom/logic/delete";
-
- //10.6 鑷姩鍖栧惎鐢ㄧ鐢�
- public static final String LOGIC_ENABLE_EDIT = "/user/%s/custom/logic/enable/edit";
-
- //10.7 鑷姩鍖栫姸鎬佷笂鎶� 鎵ц缁撴灉銆佹湰鍦板惎鐢ㄧ鐢ㄧ姸鎬佷笂鎶�
- public static final String LOGIC_STATUS_UP = "/user/%s/custom/logic/status/up";
-
- //11.1 瀹夐槻鍒楄〃鑾峰彇
- public static final String SECURITY_LIST_GET = "/user/%s/custom/security/list/get";
-
- //11.2 瀹夐槻鑾峰彇
- public static final String SECURITY_GET = "/user/%s/custom/security/get";
-
- //11.3 瀹夐槻鏂板/缂栬緫
- public static final String SECURITY_EDIT = "/user/%s/custom/security/edit";
-
- //11.4 瀹夐槻鍒犻櫎
- public static final String SECURITY_DELETE = "/user/%s/custom/security/delete";
-
- //11.5 甯冮槻璁剧疆
- public static final String SECURITY_STATUS_SET = "/user/%s/custom/security/status/set";
-
- //11.6 瀹夐槻闃插尯鐘舵�佽鍙�
- public static final String SECURITY_STATUS_GET = "/user/%s/custom/security/status/get";
-
- //11.7 瀹夐槻闃插尯鎶ヨ鐘舵�佷笂鎶�
- public static final String SECURITY_STATUS_UP = "/user/%s/custom/security/status/up";
-
- //11.8 瀹夐槻Bypass璇诲彇
- public static final String SECURITY_BYPASS_GET = "/user/%s/custom/security/bypass/get";
-
- //11.9 瀹夐槻Bypass璁剧疆
- public static final String SECURITY_BYPASS_SET = "/user/%s/custom/security/bypass/set";
/**
* 璁惧杩炴帴TCP涔嬪墠骞挎挱
@@ -309,4 +231,8 @@
public static final String NATIVE_MODBUS_DOWN_SLAVE = "/user/%s/custom/native/inverter/down/slaveoid/%s";
public static final String NATIVE_MODBUS_DOWN_SLAVE_REPLY = "/user/%s/custom/native/inverter/down_reply/slaveoid/%s";
+
+ public static final String DELETING_GATEWAY_password_verifiy= "/user/%s/custom/native/inverter/password_verifiy";
+
+
}
--
Gitblit v1.8.0