Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java

@@ -222,6 +222,7 @@
    public void getUserInfo_B(CloudCallBeak<BUserInfo> cloudCallBeak) {
        String requestUrl = HttpApi.B_POST_GET_USERINFO;
        JsonObject json = new JsonObject();
        json.addProperty("userId",UserConfigManage.getInstance().getUserId());
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
@@ -318,6 +319,41 @@
                CUserInfo cUserInfo = gson.fromJson(jsonStr, CUserInfo.class);
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(cUserInfo);
                }
            }

            @Override
            public void onFailure(HDLException e) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
            }
        });


    }

    /**
     * 下载子账号头像(C端账号)
     *
     * @param childAccountId 子账号id
     * @param childId        子账号(成员)id查找子账号接口获取到的数据id
     * @param homeId         住宅id
     * @param cloudCallBeak  -
     */
    public void getHeadPortrait_C(String childAccountId, String childId, String homeId, CloudCallBeak<String> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_GET_IMAGE_URL;
        JsonObject json = new JsonObject();
        json.addProperty("childAccountId", childAccountId);
        if (TextUtils.isEmpty(childId)) {
            json.addProperty("childId", childId);
        }
        json.addProperty("homeId", homeId);
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(jsonStr);
                }
            }

@@ -667,6 +703,9 @@
            UserConfigManage.getInstance().setUserId(obj.getUserId());//用户id
            //b端和c端定义账号字段不一样
            UserConfigManage.getInstance().setAccount(TextUtils.isEmpty(obj.getAccount()) ? obj.getUserPhone() : obj.getAccount());//账号
            UserConfigManage.getInstance().setBingPhone(obj.getUserPhone());//绑定手机
            UserConfigManage.getInstance().setBingEmail(obj.getUserEmail());//绑定邮箱

            UserConfigManage.getInstance().setUserName(obj.getName());
            UserConfigManage.getInstance().setToken(obj.getAccessToken());//Token
            UserConfigManage.getInstance().setHeaderPrefix(obj.getHeaderPrefix());//认证请求头前缀(底层请求统一加)