From f10bd384ab2c5e459b9bf20766970615e429b4ec Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 16 十一月 2023 16:53:22 +0800
Subject: [PATCH] 备份一下代码

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java |  230 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 162 insertions(+), 68 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index 037b4bf..27b5ee8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -8,33 +8,35 @@
 import com.google.gson.reflect.TypeToken;
 import com.hdl.hdlhttp.HxHttp;
 import com.hdl.linkpm.sdk.core.api.HDLCloudHomeApi;
+import com.hdl.linkpm.sdk.core.callback.IDefaultCallBack;
 import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.linkpm.sdk.core.response.HDLResponse;
-import com.hdl.linkpm.sdk.device.bean.FunctionInfoBean;
+import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
+import com.hdl.linkpm.sdk.device.bean.GatewayCloudBean;
+import com.hdl.linkpm.sdk.ota.HDLLinkPMOta;
+import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
+import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
+import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
+import com.hdl.linkpm.sdk.ota.bean.DownloadUrlBean;
+import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
+import com.hdl.linkpm.sdk.project.HDLLinkPMProject;
 import com.hdl.linkpm.sdk.utils.HDLExceptionSubmitUtils;
-import com.hdl.photovoltaic.bean.HttpResponsePack;
-import com.hdl.photovoltaic.bean.LocalResponse;
 import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.internet.HttpClient;
 import com.hdl.photovoltaic.internet.TcpClient;
 import com.hdl.photovoltaic.internet.api.HttpApi;
 import com.hdl.photovoltaic.internet.api.TopicApi;
-import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.listener.LinkCallBack;
 import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean;
 import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
 import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
-import com.hdl.photovoltaic.ui.bean.InverterDeviceBean;
+import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
 import com.hdl.photovoltaic.ui.bean.OidBean;
-import com.hdl.photovoltaic.uni.HDLUniMP;
-import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
-import com.hdl.sdk.link.common.exception.HDLLinkCode;
 import com.hdl.sdk.link.common.exception.HDLLinkException;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
-import com.hdl.sdk.link.core.bean.request.BaseLocalRequest;
 import com.hdl.sdk.link.core.bean.response.BaseLocalResponse;
 import com.hdl.sdk.link.core.callback.GatewayCallBack;
 import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
@@ -42,11 +44,14 @@
 import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
 import com.hdl.sdk.link.gateway.type.GatewayMasterType;
 
+import org.json.JSONException;
+
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.dcloud.feature.unimp.DCUniMPJSCallback;
 import io.reactivex.rxjava3.disposables.Disposable;
 
 
@@ -85,8 +90,8 @@
                 if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
                     continue;
                 }
-                if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue)
-                        && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+                //鐢╤omeId绛涢�夊綋鍓嶄綇瀹呯殑閫嗗彉鍣ㄥ垪琛�
+                if (gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
                     newList.add(gatewayBean);
                 }
             }
@@ -94,6 +99,59 @@
         return newList;
     }
 
+    /**
+     * 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
+     */
+    public GatewayBean getCurrentHomeMainGateway() {
+        List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
+        if (list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                GatewayBean gatewayBean = list.get(i);
+                if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
+                    continue;
+                }
+                if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+                    //鎵惧埌杩斿洖
+                    return gatewayBean;
+                }
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠(鍖呮嫭:sid锛宱id)
+     *
+     * @param mac 璁惧mac
+     */
+    public void uploadDataToCloud(String mac, CloudCallBeak<Boolean> callBeak) {
+        getInverterOidList(mac, new LinkCallBack<List<OidBean>>() {
+            @Override
+            public void onSuccess(List<OidBean> obj) {
+                if (obj == null) {
+                    return;
+                }
+                fullUpdateOid(obj, new CloudCallBeak<Boolean>() {
+                    @Override
+                    public void onSuccess(Boolean obj) {
+
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+
+                    }
+                });
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+
+            }
+        });
+
+    }
 
     /**
      * 娣诲姞閫嗗彉鍣ㄥ埌浜戠涓�
@@ -123,30 +181,7 @@
                 if (cloudCallBeak != null) {
                     cloudCallBeak.onSuccess(true);
                     //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
-                    getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
-                        @Override
-                        public void onSuccess(List<OidBean> obj) {
-                            if (obj == null) {
-                                return;
-                            }
-                            fullUpdateOid(obj, new CloudCallBeak<Boolean>() {
-                                @Override
-                                public void onSuccess(Boolean obj) {
-
-                                }
-
-                                @Override
-                                public void onFailure(HDLException e) {
-
-                                }
-                            });
-                        }
-
-                        @Override
-                        public void onError(HDLLinkException e) {
-
-                        }
-                    });
+                    uploadDataToCloud(mac, null);
                 }
             }
 
@@ -198,7 +233,7 @@
 
 
     /**
-     * 鍒犻櫎閫嗗彉鍣�
+     * 鍒犻櫎浜戠涓婇�嗗彉鍣�
      *
      * @param deviceId      璁惧id
      * @param cloudCallBeak 鍥炶皟
@@ -360,13 +395,25 @@
      * @param mac          璁惧mac
      * @param linkCallBack 鍥炶皟update
      */
-    public void getGatewayTime(String mac, LinkCallBack<Boolean> linkCallBack) {
+    public void getGatewayTime(String mac, LinkCallBack<DeviceTimeBean> linkCallBack) {
         String requestUrl = TopicApi.GET_GATEWAY_TIME;
         TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
             @Override
-            public void onSuccess(String msg) {
+            public void onSuccess(String json) {
+
+                if (TextUtils.isEmpty(json)) {
+                    if (linkCallBack != null) {
+                        linkCallBack.onSuccess(new DeviceTimeBean());
+                    }
+                    return;
+                }
+
+                Gson gson = new Gson();
+                Type typeOfT = new TypeToken<BaseLocalResponse<DeviceTimeBean>>() {
+                }.getType();
+                BaseLocalResponse<DeviceTimeBean> baseLocalResponse = gson.fromJson(json, typeOfT);
                 if (linkCallBack != null) {
-                    linkCallBack.onSuccess(true);
+                    linkCallBack.onSuccess(baseLocalResponse.getObjects());
                 }
             }
 
@@ -384,17 +431,16 @@
      * 缃戝叧鏃堕棿淇敼
      *
      * @param mac          璁惧mac
+     * @param date         鏃ユ湡
+     * @param time         鏃堕棿
      * @param linkCallBack 鍥炶皟update
      */
-    public void editGatewayTime(String mac, JsonObject jsonObject, LinkCallBack<Boolean> linkCallBack) {
+    public void editGatewayTime(String mac, String date, String time, LinkCallBack<Boolean> linkCallBack) {
         String requestUrl = TopicApi.SET_GATEWAY_TIME_EDIT;
-//        JsonObject json = new JsonObject();
-//        json.addProperty("master", "true");
-//        "objects": {
-//            "date": "2020-08-15",
-//                    "time": "17:25:20"
-//        }
-        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, jsonObject, "", new HDLLinkCallBack() {
+        JsonObject json = new JsonObject();
+        json.addProperty("date", date);// "2020-08-15"
+        json.addProperty("time", time);//"17:25:20"
+        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
             @Override
             public void onSuccess(String msg) {
                 if (linkCallBack != null) {
@@ -475,12 +521,12 @@
     }
 
     /**
-     * 鑾峰彇缃戝叧oid鍒楄〃
+     * 鑾峰彇閫嗗彉鍣╫id鍒楄〃
      *
      * @param mac          缃戝叧mac
      * @param linkCallBack 鍥炶皟
      */
-    public void getGatewayOidList(String mac, LinkCallBack<List<OidBean>> linkCallBack) {
+    public void getInverterOidList(String mac, LinkCallBack<List<OidBean>> linkCallBack) {
         String requestUrl = TopicApi.GET_GATEWAY_OID_LIST;
         TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
             @Override
@@ -526,13 +572,13 @@
         HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
             @Override
             public void onSuccess(List<GatewayBean> gatewayBeanList) {
-                //灞�鍩熺綉鎯呭喌
+                //灞�鍩熺綉鏈�2绉嶆儏鍐�(1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�2:鏈夊眬鍩熺綉锛屾病鏈夊缃�);
                 HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
                     @Override
                     public void onSuccess(List<CloudInverterDeviceBean> list) {
+                        ///鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
                         if (list == null || list.size() == 0) {
-//                            //浜戠娌℃湁缁戝畾閫嗗彉鍣�,浠ユ湰鍦颁负涓�;
-//                            HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+                            //浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
                             if (cloudCallBeak != null) {
                                 cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
                             }
@@ -542,11 +588,14 @@
                         AtomicInteger atomicInteger = new AtomicInteger(0);
                         for (int i = 0; i < list.size(); i++) {
                             CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+                            //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
                             getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
                                 @Override
                                 public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
                                     atomicInteger.set(atomicInteger.get() + 1);
+                                    //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
                                     refreshGatewayCacheData(true, cloudInverterDeviceBean, deviceRemoteInfo);
+                                    //鏈�鍚庝竴鏉℃墠鍋氬垹闄ら�嗗彉鍣ㄩ�昏緫澶勭悊
                                     if (atomicInteger.get() == list.size()) {
                                         //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
                                         List<String> removeSidList = new ArrayList<>();
@@ -563,7 +612,7 @@
                                         }
                                         for (int i = 0; i < removeSidList.size(); i++) {
                                             //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
-                                            removeInverter(removeSidList.get(i));
+                                            removeLocalInverter(removeSidList.get(i));
                                         }
                                         if (cloudCallBeak != null) {
                                             cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
@@ -574,7 +623,7 @@
                                 @Override
                                 public void onFailure(HDLException e) {
                                     atomicInteger.set(atomicInteger.get() + 1);
-                                    //鏈夊彲鑳芥渶鍚庝竴鏉℃槸澶辫触鐨�
+                                    //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鍦ㄨ繖閲屽仛鍒犻櫎閫嗗彉鍣ㄩ�昏緫澶勭悊
                                     if (atomicInteger.get() == list.size()) {
                                         //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
                                         List<String> removeSidList = new ArrayList<>();
@@ -591,7 +640,7 @@
                                         }
                                         for (int i = 0; i < removeSidList.size(); i++) {
                                             //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
-                                            removeInverter(removeSidList.get(i));
+                                            removeLocalInverter(removeSidList.get(i));
                                         }
                                         if (cloudCallBeak != null) {
                                             cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
@@ -607,8 +656,10 @@
 
                     @Override
                     public void onFailure(HDLException e) {
+                        ///鎯呭喌2:鏈夊眬鍩熺綉锛屾病鏈夊缃�;
+                        //鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
                         if (cloudCallBeak != null) {
-                            cloudCallBeak.onFailure(e);
+                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
                         }
                     }
                 });
@@ -616,27 +667,32 @@
 
             @Override
             public void onError(HDLLinkException e) {
-                //澶栫綉鎯呭喌
+                //澶栫綉鍙湁1鎯呭喌(鏈湴鎼滅储閫嗗彉鍣ㄥ垪琛ㄥけ璐ヤ簡)
                 HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
                     @Override
                     public void onSuccess(List<CloudInverterDeviceBean> list) {
-                        //浜戠娌℃湁,娓呯┖鏈湴閫嗗彉鍣ㄥ垪琛�
+                        //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
                         HDLLinkLocalGateway.getInstance().getGatewayList().clear();
                         if (list == null || list.size() == 0) {
                             if (cloudCallBeak != null) {
-                                cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                                //浜戠涔熸病鏈夐�嗗彉鍣ㄥ垪琛�,杩斿洖绌哄垪琛ㄥ洖鍘�
+                                cloudCallBeak.onSuccess(new ArrayList<>());
                             }
                             return;
                         }
                         //璁板綍鏉℃暟
                         AtomicInteger atomicInteger = new AtomicInteger(0);
+
                         for (int i = 0; i < list.size(); i++) {
                             CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+                            //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
                             getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
                                 @Override
                                 public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
                                     atomicInteger.set(atomicInteger.get() + 1);
+                                    //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
                                     refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo);
+                                    //鍒版渶鍚庝竴鏉★紝鎵嶆湁鍥炶皟
                                     if (atomicInteger.get() == list.size()) {
                                         if (cloudCallBeak != null) {
                                             cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
@@ -647,6 +703,7 @@
                                 @Override
                                 public void onFailure(HDLException e) {
                                     atomicInteger.set(atomicInteger.get() + 1);
+                                    //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鏈夊洖璋�
                                     if (atomicInteger.get() == list.size()) {
                                         if (cloudCallBeak != null) {
                                             cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
@@ -678,7 +735,6 @@
      * @param spk           spk
      * @param mac           璁惧mac
      * @param cloudCallBeak 鍥炶皟
-     * @return -
      */
     public void getDeviceRemoteInfo(String homeId, String spk, String mac, CloudCallBeak<DeviceRemoteInfo> cloudCallBeak) {
         String requestUrl = HttpApi.POST_Device_RemoteInfo;
@@ -712,15 +768,49 @@
     }
 
     /**
-     * 鍒犻櫎鏈湴閫嗗彉鍣�
+     * 鍒犻櫎鏈湴缂撳瓨閫嗗彉鍣�
      *
      * @param sid 璁惧sid
      */
-    private void removeInverter(String sid) {
+    private void removeLocalInverter(String sid) {
         GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(sid);
         if (gatewayBean != null) {
             HDLLinkLocalGateway.getInstance().getGatewayList().remove(gatewayBean);
         }
+    }
+
+    /**
+     * 娓呯┖閫嗗彉鍣ㄤ綇瀹卛d
+     *
+     * @param mac mac
+     */
+    public void clearInverterHomeId(String mac, LinkCallBack<Boolean> callBeak) {
+        String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
+        JsonObject json = new JsonObject();
+        json.addProperty("homeId", "");
+        json.addProperty("server_addr", "");
+        TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() {
+            @Override
+            public void onSuccess(String msg) {
+                GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
+                if (gatewayBean != null) {
+                    if (!TextUtils.isEmpty(UserConfigManage.getInstance().getLocalSecret())) {
+                        gatewayBean.setLocalEncrypt(true);
+                    }
+                }
+                if (callBeak != null) {
+                    callBeak.onSuccess(true);
+                }
+
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                if (callBeak != null) {
+                    callBeak.onError(e);
+                }
+            }
+        });
     }
 
     /**
@@ -734,16 +824,17 @@
         HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
     }
 
+
     /**
      * 鍒锋柊閫嗗彉鍣ㄧ紦瀛樹俊鎭�(鍖呮嫭璁剧疆mqtt绉橀挜锛�
      * 娉�:
-     * 1:鏈湴瀛樺湪鏇存柊淇℃伅鍗冲彲;
-     * 2:浜戠鏈夋湰鍦颁笉瀛樺湪,鍒欒櫄鎷熶竴涓�嗗彉鍣ㄥ璞℃坊鍔犲湪鏈湴;
+     * 1:鏈湴瀛樺湪,鏇存柊淇℃伅鍗冲彲;
+     * 2:鏈湴涓嶅瓨鍦�,鍒欒櫄鎷熶竴涓�嗗彉鍣ㄥ璞℃坊鍔犲湪鏈湴;
      *
      * @param deviceRemoteInfo        璁惧杩滅▼閫氳淇℃伅
      * @param cloudInverterDeviceBean 閫嗗彉鍣�
      */
-    private static void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo) {
+    private void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo) {
         //鏈湴鏌ユ壘閫嗗彉鍣�
         GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(cloudInverterDeviceBean.getOsn());
         if (gatewayBean == null) {
@@ -755,7 +846,7 @@
         if (deviceRemoteInfo != null) {
             gatewayBean.setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜
             gatewayBean.setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
-            //鐢ㄤ箣鍓嶇殑搴�,搴曞眰mqtt璁㈤槄锛屽姞瑙e瘑浼氱敤鍒拌鍙傛暟;
+            //todo 璁剧疆鍒般�愬簱銆戦噷闈�,搴曞眰mqtt璁㈤槄锛屽姞瑙e瘑浼氱敤鍒拌鍙傛暟;
             HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜搴�
             HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
 
@@ -769,19 +860,22 @@
         gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//璁惧鍚嶇О
         gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//璁剧疆spk
         gatewayBean.setLocalEncrypt(true);
-        gatewayBean.setMaster(GatewayMasterType.MasterTrue);
+        gatewayBean.setMaster(GatewayMasterType.MasterTrue);//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼)
         gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
         gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
         gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
         gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�
         gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
         gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
+        gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+        gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
+
 
     }
 
 
     /**
-     * 鑾峰彇缃戝叧spk鍒楄〃
+     * 鑾峰彇缃戝叧鏀寔spk鍒楄〃
      *
      * @return -
      */

--
Gitblit v1.8.0