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/internet/api/HttpApi.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
index f4a2918..b520a70 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
@@ -55,16 +55,17 @@
public static final String POST_Device_Add = "/home-wisdom/program/device/independentRegister";
//鎵归噺娣诲姞閫嗗彉鍣�
public static final String POST_Device_Add_All = "/home-wisdom/program/device/batchIndependentRegister";
- //鑾峰彇閫嗗彉鍣ㄥ垪琛�
+ //鑾峰彇(浜戠)閫嗗彉鍣ㄥ垪琛�
public static final String POST_Device_List = "/home-wisdom/app/device/inverter/list";
- //鍒犻櫎閫嗗彉鍣�
- public static final String POST_Device_Remove = "/home-wisdom/app/device/remove";
+ //鍒犲垹闄ら�嗗彉鍣ㄥ強涓嬫寕璁惧
+ public static final String POST_Device_Remove = "/home-wisdom/app/powerStation/device/delete";
//鑾峰彇涓嬫寕璁惧鍒楄〃
public static final String POST_Device_ChildDevices_List = "/home-wisdom/app/powerStation/childDevices";
//鍏ㄩ噺鏇存柊OID
public static final String POST_Device_Oid = "/home-wisdom/program/device/oid/add";
//璁惧鍩烘湰淇℃伅(oid)澧為噺娣诲姞
public static final String POST_Device_IncrAdd = "/home-wisdom/program/device/oid/incrAdd";
+ public static final String POST_Device_Rename = "/home-wisdom/app/powerStation/device/rename";
//鑾峰彇閫嗗彉鍣�(鑾峰彇璁惧杩滅▼閫氳淇℃伅)
public static final String POST_Device_RemoteInfo = "/home-wisdom/program/device/remoteInfo";
//璁惧鍩烘湰淇℃伅鍒楄〃(oid)鑾峰彇
@@ -118,9 +119,21 @@
//鑾峰彇鐢ㄦ埛璇︽儏淇℃伅
- public static final String B_POST_GET_USERINFO = "/basis-footstone/mgmt/user/oauth/getUserInfo";
+ public static final String B_POST_GET_USERINFO = "/basis-user/mgmt/user/manage/info";//"/basis-footstone/mgmt/user/oauth/getUserInfo";
//鑱旂郴鎴戜滑
public static final String B_POST_GET_UTIL_CONTACT = "/home-wisdom/app/powerStation/util/contact";
+ //鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
+ public static final String B_POST_GET_USERRIGHTTYPE = "/home-wisdom/app/powerStation/user/manage/userRightType";
+ //鑾峰彇鍛樺伐鍒楄〃
+ public static final String B_POST_GET_LISTBYPAGE = "/home-wisdom/app/powerStation/user/manage/listByPage";
+ //鑾峰彇鍛樺伐璇︽儏
+ public static final String B_POST_GET_MANAGE_INFO = "/home-wisdom/app/powerStation/user/manage/info";
+ //鍛樺伐娣诲姞锛圔绔級
+ public static final String B_POST_GET_MANAGE_CREATE = "/home-wisdom/app/powerStation/user/manage/create";
+ //鍛樺伐缂栬緫锛圔绔級
+ public static final String B_POST_GET_MANAGE_EDIT = "/home-wisdom/app/powerStation/user/manage/edit";
+ //鍛樺伐鍒犻櫎锛圔绔級
+ public static final String B_POST_GET_MANAGE_DELETE = "/home-wisdom/app/powerStation/user/manage/delete";
//閫�鍑虹櫥褰�
@@ -130,8 +143,11 @@
public static final String POST_deviceList = "/home-wisdom/app/powerStation/deviceList";
//鐢电珯鐘舵�佹瑙�(瀹夎鍟�)
public static final String POST_statusOverview = "/home-wisdom/app/powerStation/statusOverview";
+ //鑾峰彇鐢电珯浜や粯浜岀淮鐮�(瀹夎鍟�)
+ public static final String POST_getDeliveryUrlQrcode = "/home-wisdom/app/powerStation/getDeliveryUrlQrcode";
-
+ //鐢电珯鎵嬪姩浜や粯(瀹夎鍟�)
+ public static final String POST_deliverToAccount = "/home-wisdom/app/powerStation/deliverToAccount";
//endregion
@@ -159,6 +175,18 @@
public static final String C_POST_MEMBERINFO_BINDWITHACCOUNT = "/smart-footstone/member/memberInfo/bindWithAccount";
//瑙ｇ粦璁よ瘉(鎵嬫満/閭)
public static final String C_POST_MEMBERINFO_UNBINDWITHACCOUNT = "/smart-footstone/member/memberInfo/unbindWithAccount";
+ //鎴愬憳鍒楄〃
+ public static final String C_POST_MEMBER_LIST = "/home-wisdom/app/child/account/findAll";
+ //娣诲姞鎴愬憳
+ public static final String C_POST_MEMBER_ADD = "/home-wisdom/app/child/account/add";
+ //缂栬緫鎴愬憳
+ public static final String C_POST_MEMBER_EDIT = "/home-wisdom/app/child/account/update";
+ //鍒犻櫎鎴愬憳
+ public static final String C_POST_MEMBER_DELETE = "/home-wisdom/app/child/account/delete";
+ //鐢电珯鎺堟潈瀹夎鍟�
+ public static final String C_POST_HOME_UPDATEDEBUGPERM = "/home-wisdom/app/home/updateDebugPerm";
+ //涓嬭浇瀛愯处鍙峰ご鍍�
+ public static final String C_POST_HOME_GETHEADP脧ORTRAIT = "/home-wisdom/app/child/account/getHeadP脧ortrait";
//endregion
--
Gitblit v1.8.0