From a6c0ac0f20d1d91fbe1fe591a6a9ca46f82399f5 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 23 二月 2024 16:37:16 +0800
Subject: [PATCH] 使用新的依赖库的名称

---
 settings.gradle                                                                              |    4 
 HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/device/bean/ProductInfo.java                   |    9 +
 HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/utils/HDLFileUtils.java                        |    2 
 HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/utils/HDLExceptionSubmitUtils.java             |   21 ++++
 HDLLinkPMSdk/build.gradle                                                                    |    2 
 HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/HDLLinkPMUser.java                        |   84 ++++++++++++++--
 HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/project/HDLLinkPMProject.java                  |    7 +
 HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/project/controller/HDLPMProjectController.java |   28 +++++
 HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/core/api/HDLCloudProjectApi.java               |    4 
 HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java       |   75 +++++++++++++++
 app/build.gradle                                                                             |    5 
 11 files changed, 220 insertions(+), 21 deletions(-)

diff --git a/HDLLinkPMSdk/build.gradle b/HDLLinkPMSdk/build.gradle
index 98ee80d..d378eef 100644
--- a/HDLLinkPMSdk/build.gradle
+++ b/HDLLinkPMSdk/build.gradle
@@ -39,6 +39,6 @@
     //缃戠粶璇锋眰搴�
     implementation 'com.alibaba:fastjson:1.2.66'
     api 'com.hdl.hdlhttp:hxhttp:1.0.4'
-    api project(path: ':HDLLog')
+    api 'com.hdl.android:log:1.0.0'
 
 }
\ No newline at end of file
diff --git a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/core/api/HDLCloudProjectApi.java b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/core/api/HDLCloudProjectApi.java
index 946f159..abc8349 100644
--- a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/core/api/HDLCloudProjectApi.java
+++ b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/core/api/HDLCloudProjectApi.java
@@ -71,6 +71,10 @@
      */
     public static final String POST_HOUSE_SECURITY_FULL_UPDATE = "/home-wisdom/program/security/sync";
     /**
+     * 缇ゆ帶鍏ㄩ噺鏇存柊
+     */
+    public static final String POST_HOUSE_GROUPCONTROL_FULL_UPDATE = "/home-wisdom/program/device/groupcontrol/syncData";
+    /**
      * 鏇存敼浣忓畢鍚嶇О
      */
     public static final String POST_HOUSENAME_UPDATE = "/home-wisdom/program/home/updateName";
diff --git a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/device/bean/ProductInfo.java b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/device/bean/ProductInfo.java
index e9e9a4f..5c1fd7c 100644
--- a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/device/bean/ProductInfo.java
+++ b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/device/bean/ProductInfo.java
@@ -37,4 +37,13 @@
     public void setProductModel(@NonNull String productModel) {
         this.productModel = productModel;
     }
+
+    public ProductInfo() {
+    }
+
+    public ProductInfo(String productName, String productModel, String imageUrl) {
+        this.productName = productName;
+        this.productModel = productModel;
+        this.imageUrl = imageUrl;
+    }
 }
\ No newline at end of file
diff --git a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/project/HDLLinkPMProject.java b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/project/HDLLinkPMProject.java
index 66b19bd..be995c9 100644
--- a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/project/HDLLinkPMProject.java
+++ b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/project/HDLLinkPMProject.java
@@ -367,7 +367,12 @@
     public void fullUpdateSecuritysListInfo(String homeId,String gatewayId ,JsonArray data ,IDefaultCallBack callBack) {
         HDLPMProjectController.getInstance().fullUpdateSecuritysListInfo(homeId, gatewayId, data, callBack);
     }
+    public void fullUpdateGroupControlListInfo(String homeId,String gatewayId ,JsonArray data ,IDefaultCallBack callBack) {
+        HDLPMProjectController.getInstance().fullUpdateSecuritysListInfo(homeId, gatewayId, data, callBack);
+    }
 
-
+    public void fullAddGroupControlList(String homeId,String gatewayId ,JsonArray data ,IDefaultCallBack callBack) {
+        HDLPMProjectController.getInstance().fullAddGroupControlList(homeId, gatewayId, data, callBack);
+    }
 
 }
diff --git a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/project/controller/HDLPMProjectController.java b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/project/controller/HDLPMProjectController.java
index a697fa3..43dbbc8 100644
--- a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/project/controller/HDLPMProjectController.java
+++ b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/project/controller/HDLPMProjectController.java
@@ -908,6 +908,34 @@
                     }
                 });
     }
+    public Disposable fullAddGroupControlList(String homeId, String gatewayId, JsonArray data, IDefaultCallBack callBack) {
+        JsonObject json = new JsonObject();
+        json.addProperty("homeId", homeId);
+        json.addProperty("gatewayId", gatewayId);
+        json.add("infos", data);
+        String requestUrl = HDLCloudProjectApi.getRequestUrl(HDLCloudProjectApi.POST_HOUSE_GROUPCONTROL_FULL_UPDATE);
+        return HxHttp.builder()
+                .url(requestUrl)
+                .raw(json.toString())
+                .build()
+                .executePost()
+                .subscribeWith(new HDLResponse<String>() {
+                    @Override
+                    public void onResponse(String response) {
+                        if (callBack != null) {
+                            callBack.onSuccess();
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        HDLExceptionSubmitUtils.submit(requestUrl, json, e);
+                        if (callBack != null) {
+                            callBack.onFailure(e);
+                        }
+                    }
+                });
+    }
 
     public Disposable updateHouseName(String homeId, String homeName, IDefaultCallBack callBack) {
         JsonObject json = new JsonObject();
diff --git a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/HDLLinkPMUser.java b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/HDLLinkPMUser.java
index 176c3fa..a26af67 100644
--- a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/HDLLinkPMUser.java
+++ b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/HDLLinkPMUser.java
@@ -113,15 +113,15 @@
     /**
      * 淇濆瓨鏋佸厜鎺ㄩ�佺粦瀹氫箣鍚庣殑id
      */
-    public void saveHDLJpushId(String pushId) {
+    public void saveHDLJpushId(String  pushId) {
         HDLSDKSPUtils.put(HDLLINK_PUSHID_KEY, pushId);
     }
 
     /**
-     * 鑾峰彇鏋佸厜鎺ㄩ�佺粦瀹氫箣鍚庣殑id
+     *  鑾峰彇鏋佸厜鎺ㄩ�佺粦瀹氫箣鍚庣殑id
      */
     public String getHDLJpushId() {
-        return HDLSDKSPUtils.getString(HDLLINK_PUSHID_KEY);
+       return HDLSDKSPUtils.getString(HDLLINK_PUSHID_KEY);
     }
 
     /**
@@ -190,8 +190,7 @@
 
     /**
      * 閫氱煡閫�鍑洪噸鏂扮櫥褰�
-     *
-     * @param type: 0:姝e父閫�鍑�   1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
+     * @param type:  0:姝e父閫�鍑�   1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
      */
     private void notificationRelogin(int type) {
         if (mOnReloginListener != null) {
@@ -201,14 +200,72 @@
 
     /**
      * 閫�鍑虹櫥褰�
-     *
-     * @param type: 0:姝e父閫�鍑�   1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
+     * @param type:  0:姝e父閫�鍑�   1锛氭瀬鍏夋帹閫佸己鍒堕��鍑�
      */
     public void logout(int type) {
         //1.娓呯┖鐧诲綍鐘舵��
         removeAll();
         //2.鍙戝嚭閲嶆柊鐧诲綍閫氱煡
         notificationRelogin(type);
+    }
+
+    /****************************璇锋眰鎺ュ彛****************************/
+    /**
+     * 鑾峰彇璐﹀彿鎵�鍦ㄥ尯鍩�
+     *
+     * @param account  璐﹀彿
+     * @param callBack 缁撴灉鍥炶皟
+     */
+    public void regionByAccount(String account, IRegionByAccountCallBack callBack) {
+        HDLPMUserController.getInstance().regionByAccount(account, new IRegionByAccountCallBack() {
+            @Override
+            public void onSuccess(HDLUserRegionBean regionBean) {
+                if (regionBean != null) {
+                    //鏌ヨ鎴愬姛璁板綍涓�娆�
+                    setUserRegionUrl(regionBean.getRegionUrl());
+                    if (callBack != null) {
+                        callBack.onSuccess(regionBean);
+                    }
+                } else {
+                    if (callBack != null) {
+                        callBack.onFailure(HDLException.getErrorWithCode(HDLErrorCode.HDL_DATA_PARSING_ERROR));
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException error) {
+                if (callBack != null) {
+                    callBack.onFailure(error);
+                }
+            }
+        });
+    }
+
+    /**
+     * 閫氳繃璐﹀彿鍜屽瘑鐮佺櫥褰�
+     *
+     * @param account  璐﹀彿
+     * @param loginPwd 瀵嗙爜
+     * @param callBack 缁撴灉鍥炶皟
+     */
+    public void loginByPassword(String account, String loginPwd, ILoginCallBack callBack) {
+        HDLPMUserController.getInstance().loginByPassword(account, loginPwd, new ILoginCallBack() {
+            @Override
+            public void onSuccess(HDLLoginBean loginBean) {
+                loginSuccess(loginBean);
+                if (callBack != null) {
+                    callBack.onSuccess(loginBean);
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException error) {
+                if (callBack != null) {
+                    callBack.onFailure(error);
+                }
+            }
+        });
     }
 
     /****************************璇锋眰鎺ュ彛****************************/
@@ -244,6 +301,7 @@
             }
         });
     }
+
 
     /**
      * 閫氳繃璐﹀彿鍜屽瘑鐮佺櫥褰�
@@ -385,7 +443,7 @@
     /**
      * 涓婁紶鐢ㄦ埛澶村儚
      *
-     * @param file     鍥剧墖鏂囦欢
+     * @param file 鍥剧墖鏂囦欢
      * @param callBack
      * @return
      */
@@ -409,19 +467,19 @@
     /**
      * 灏忕▼搴弚gt鐗堟湰妫�娴嬫洿鏂�
      *
-     * @param appCode    app缂栫爜
-     * @param wgtVersion 灏忕▼搴弚gt鐗堟湰鍙�
-     * @param callBack   濡傛灉onSuccess 鍥炶皟鐨刡ean涓虹┖锛屼唬琛ㄥ綋鍓嶇増鏈凡缁忔槸鏈�鏂扮増鏈紝娌℃湁鏂扮増鏈�
+     * @param appCode  app缂栫爜
+     * @param wgtVersion  灏忕▼搴弚gt鐗堟湰鍙�
+     * @param callBack 濡傛灉onSuccess 鍥炶皟鐨刡ean涓虹┖锛屼唬琛ㄥ綋鍓嶇増鏈凡缁忔槸鏈�鏂扮増鏈紝娌℃湁鏂扮増鏈�
      * @return
      */
     public void checkWgtVersion(String appCode, String wgtVersion, IResponseCallBack<NewVersionBean> callBack) {
-        HDLPMUserController.getInstance().checkAppVersion(appCode, wgtVersion, "wgt", callBack);
+        HDLPMUserController.getInstance().checkAppVersion(appCode, wgtVersion,"wgt", callBack);
     }
 
     /**
      * 鑾峰彇mqtt
      */
-    public void getMqttInfo(String attachClientId, String homeType, String deviceUuid, IResponseCallBack<MqttInfo> listener) {
+    public void getMqttInfo(String attachClientId, String homeType, String deviceUuid, IResponseCallBack<MqttInfo>listener) {
         HDLPMUserController.getInstance().getMqttInfo(attachClientId, homeType, deviceUuid, listener);
     }
 
diff --git a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java
index 145edb3..b5502d4 100644
--- a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java
+++ b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/user/controller/HDLPMUserController.java
@@ -58,6 +58,80 @@
      *
      * @param account
      * @param callBack
+     * @return https://nearest.hdlchina.com/smart-footstone/region/regionByUserAccount
+     */
+    public Disposable regionByAccount(String account, IRegionByAccountCallBack callBack) {
+        String requestUrl = HDLLinkPMSdk.getInitUrl() + HDLCloudUserApi.POST_RegionByAccount;
+        return HxHttp.builder()
+                .url(requestUrl)
+                .params("account", account)
+                .build()
+                .post()
+                .subscribeWith(new HDLResponse<HDLUserRegionBean>() {
+                    @Override
+                    public void onResponse(HDLUserRegionBean response) {
+                        if (callBack != null) {
+                            callBack.onSuccess(response);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        HDLExceptionSubmitUtils.submit(requestUrl, account, e);
+                        if (callBack != null) {
+                            callBack.onFailure(e);
+                        }
+                    }
+                });
+
+    }
+
+    /**
+     * 鐧诲綍
+     * 閫氳繃璐﹀彿鍜屽瘑鐮�
+     *
+     * @param account  鎵嬫満鎴栬�呴偖绠�
+     * @param loginPwd 瀵嗙爜
+     * @param callBack
+     * @return
+     */
+    public Disposable loginByPassword(String account, String loginPwd, ILoginCallBack callBack) {
+        String requestUrl = HDLCloudUserApi.getRequestUrl(HDLCloudUserApi.POST_LOGIN);
+        JsonObject json = new JsonObject();
+        json.addProperty("account", account);
+        json.addProperty("loginPwd", loginPwd);
+//        json.addProperty("platform", "APP");
+        json.addProperty("grantType", "password");
+
+        return HxHttp.builder()
+                .url(requestUrl)
+                .raw(json.toString())
+                .build()
+                .post()
+                .subscribeWith(new HDLResponse<HDLLoginBean>() {
+                    @Override
+                    public void onResponse(HDLLoginBean response) {
+                        if (callBack != null) {
+                            callBack.onSuccess(response);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        HDLExceptionSubmitUtils.submit(requestUrl, json, e);
+                        if (callBack != null) {
+                            callBack.onFailure(e);
+                        }
+                    }
+                });
+
+    }
+
+    /**
+     * 鑾峰彇璐﹀彿鎵�鍦ㄥ尯鍩�
+     *
+     * @param account
+     * @param callBack
      * @return https://nearest.hdlcontrol.com/smart-footstone/region/regionByUserAccount
      */
     public Disposable regionByAccount(boolean isBooleanB, String account, IRegionByAccountCallBack callBack) {
@@ -138,6 +212,7 @@
 
     }
 
+
     /**
      * 鐧诲綍
      * 閫氳繃楠岃瘉鐮�
diff --git a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/utils/HDLExceptionSubmitUtils.java b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/utils/HDLExceptionSubmitUtils.java
index 5916b66..9793b65 100644
--- a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/utils/HDLExceptionSubmitUtils.java
+++ b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/utils/HDLExceptionSubmitUtils.java
@@ -1,5 +1,9 @@
 package com.hdl.linkpm.sdk.utils;
 
+import android.text.TextUtils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.google.gson.JsonObject;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.linkpm.sdk.core.exception.HDLLinkCopyException;
@@ -37,7 +41,22 @@
 
     public static void submit(String requestUrl, Object json, HDLLinkCopyException e) {
         try {
-            LogUtil.log(requestUrl, "code:" + e.getCode() + "--msg:" + e.getMsg() + "--params锛�" + HDLGsonUtils.toJson(json), null, Level.high);
+            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(json));
+            String utfStr = "";
+            if (jsonObject != null) {
+                try {
+                    byte[] data = jsonObject.getBytes("data");
+                    utfStr = new String(data);
+                } catch (Exception e1) {
+
+                }
+            }
+            if (!TextUtils.isEmpty(utfStr)) {
+                LogUtil.log(requestUrl, "code:" + e.getCode() + "--msg:" + e.getMsg() + "--params锛�" + HDLGsonUtils.toJson(json) + "--utf-8锛�" + utfStr, null, Level.high);
+            } else {
+                LogUtil.log(requestUrl, "code:" + e.getCode() + "--msg:" + e.getMsg() + "--params锛�" + HDLGsonUtils.toJson(json), null, Level.high);
+
+            }
         } catch (Exception e1) {
 
         }
diff --git a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/utils/HDLFileUtils.java b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/utils/HDLFileUtils.java
index 3b25f42..09e2ed4 100644
--- a/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/utils/HDLFileUtils.java
+++ b/HDLLinkPMSdk/src/main/java/com/hdl/linkpm/sdk/utils/HDLFileUtils.java
@@ -283,7 +283,7 @@
             delAllFile(folderPath); // 鍒犻櫎瀹岄噷闈㈡墍鏈夊唴瀹�
             String filePath = folderPath;
             filePath = filePath.toString();
-            java.io.File myFilePath = new java.io.File(filePath);
+            File myFilePath = new File(filePath);
             myFilePath.delete(); // 鍒犻櫎绌烘枃浠跺す
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/app/build.gradle b/app/build.gradle
index 016ef7e..66199e4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -123,8 +123,9 @@
     //浜岀淮鐮佸簱
     implementation project(path: ':third-zxing')
     //Link鏈湴搴�
-    implementation project(path: ':HDLLinkPMSdk')
-    implementation 'com.hdl.android.link.local.sdk:localsdk:1.0.0'
+//    implementation project(path: ':HDLLinkPMSdk')
+    implementation 'com.hdl.android:pmsdk:1.0.1'
+    implementation 'com.hdl.android:debugsdk:1.0.1'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/settings.gradle b/settings.gradle
index 39f477e..eba0b6c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,6 @@
 include ':app'
 include ':third-zxing'
 //include ':HDLLinkLocalSdk'
-include ':HDLLinkPMSdk'
-include ':HDLLog'
+//include ':HDLLinkPMSdk'
+//include ':HDLLog'
 include ':countrypicker'

--
Gitblit v1.8.0