HDLSDK/.idea/gradle.xml

@@ -11,11 +11,11 @@
        <option name="modules">

          <set>

            <option value="$PROJECT_DIR$" />

            <option value="$PROJECT_DIR$/app" />

            <option value="$PROJECT_DIR$/com.hdl.sdk" />

            <option value="$PROJECT_DIR$/hdl-connect" />

          </set>

        </option>

        <option name="resolveModulePerSourceSet" value="false" />

      </GradleProjectSettings>

    </option>

  </component>


 HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java

@@ -41,6 +41,7 @@
import com.hdl.sdk.connect.bean.request.ListSidRequest;
import com.hdl.sdk.connect.bean.request.ListUploadRequest;
import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
import com.hdl.sdk.connect.bean.response.DeviceInfoResponse;
import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
import com.hdl.sdk.connect.bean.response.UpdateInfo;
import com.hdl.sdk.connect.callback.HDLLinkCallBack;
@@ -71,12 +72,6 @@
    private EventListener allTopicsListener;
    private String testLightSid = "02010131D9C03D01020300010107";
    private String secret = "";

    @Override
    protected void onDestroy() {
        super.onDestroy();
        removeAllTopicsListener();
    }

    void applyDeviceSecret() {
        tv.setText("开始申请设备密钥...");
@@ -877,4 +872,10 @@
        return versionName;
    }

    @Override
    protected void onDestroy() {
        super.onDestroy();
        removeAllTopicsListener();
    }

}

 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java

@@ -172,6 +172,7 @@
                }

                LinkResponse response = new LinkResponse();

                response.setSource_ipAddress(ipaddress);

                Log.d("panlili", "----->source_ipAddress= " + ipaddress);

                response.setTopic(topic);

                if (HDLLinkConfig.getInstance().ifNeedEncrypt(response.getTopic())) {

                    //需要解密

@@ -207,29 +208,30 @@
                    HDLAuthSocket.getInstance().UploadGatewayInfo(new HDLLinkCallBack() {

                        @Override

                        public void onSuccess(String msg) {

                            LogUtils.i("UploadGatewayInfo onSucceed");

//                            LogUtils.i("UploadGatewayInfo onSucceed");

                        }



                        @Override

                        public void onError(HDLLinkException e) {

                            LogUtils.i("UploadGatewayInfo onError");

//                            LogUtils.i("UploadGatewayInfo onError");

                        }

                    });

                }

                else if (response.getTopic().equals(updateLocalSecret) || response.getTopic().equals(TopicConstant.LINK_BROADCAST)) {

                } else if (response.getTopic().equals(updateLocalSecret) || response.getTopic().equals(TopicConstant.LINK_BROADCAST)) {

                    try {

                        DeviceInfoResponse deviceInfoResponse = GsonConvert.getGson().fromJson(response.getData(), new TypeToken<DeviceInfoResponse>() {

                        }.getType());



                        if (!TextUtils.isEmpty(deviceInfoResponse.getObjects().getLocalSecret())) {

                            byte[] baseBytes = Base64.decode(deviceInfoResponse.getObjects().getLocalSecret(), Base64.NO_WRAP);

                            String mackey = "";

                            if (!TextUtils.isEmpty(SPUtils.getString("auth_mackey_key", ""))) {

                                mackey = SPUtils.getString("auth_mackey_key", "");

                                byte[] bodyBytes = AesUtil.aesDecrypt(baseBytes, mackey.substring(mackey.length() - 16));

                                String localSecret = new String(bodyBytes, "utf-8");

                                Log.d("panlili", "更新密钥----->localSecret= " + localSecret);

                                HDLLinkConfig.getInstance().setLocalSecret(localSecret);

                        if (deviceInfoResponse != null && deviceInfoResponse.getObjects() != null) {

                            if (!TextUtils.isEmpty(deviceInfoResponse.getObjects().getLocalSecret())) {

                                byte[] baseBytes = Base64.decode(deviceInfoResponse.getObjects().getLocalSecret(), Base64.NO_WRAP);

                                String mackey = "";

                                if (!TextUtils.isEmpty(SPUtils.getString("auth_mackey_key", ""))) {

                                    mackey = SPUtils.getString("auth_mackey_key", "");

                                    byte[] bodyBytes = AesUtil.aesDecrypt(baseBytes, mackey.substring(mackey.length() - 16));

                                    String localSecret = new String(bodyBytes, "utf-8");

                                    Log.d("panlili", "更新密钥----->localSecret= " + localSecret);

                                    HDLLinkConfig.getInstance().setLocalSecret(localSecret);

                                }

                            }

                        }

                    } catch (Exception e) {

@@ -239,23 +241,25 @@
                    try {

                        DeviceDeleteResponse deviceDeleteResponse = GsonConvert.getGson().fromJson(response.getData(), new TypeToken<DeviceDeleteResponse>() {

                        }.getType());

                        HDLSocket.getInstance().deleteNetwork(deviceDeleteResponse.getObjects().get(0).getOID(), new HDLLinkCallBack() {

                            @Override

                            public void onSuccess(String msg) {

                                LogUtils.i("deleteNetwork onSucceed");

                                if (HDLLink.getInstance().listener != null) {

                                    HDLLink.getInstance().listener.onSuccess(msg);

                        if (deviceDeleteResponse != null && deviceDeleteResponse.getObjects() != null) {

                            HDLSocket.getInstance().deleteNetwork(deviceDeleteResponse.getObjects().get(0).getOID(), new HDLLinkCallBack() {

                                @Override

                                public void onSuccess(String msg) {

                                    LogUtils.i("deleteNetwork onSucceed");

                                    if (HDLLink.getInstance().listener != null) {

                                        HDLLink.getInstance().listener.onSuccess(msg);

                                    }

                                }

                            }



                            @Override

                            public void onError(HDLLinkException e) {

                                LogUtils.i("deleteNetwork onError");

                                if (HDLLink.getInstance().listener != null) {

                                    HDLLink.getInstance().listener.onFailure();

                                @Override

                                public void onError(HDLLinkException e) {

                                    LogUtils.i("deleteNetwork onError");

                                    if (HDLLink.getInstance().listener != null) {

                                        HDLLink.getInstance().listener.onFailure();

                                    }

                                }

                            }

                        });

                            });

                        }

                    } catch (Exception e) {

                        LogUtils.i("LinkMessageDecoder.java:deleteNetwork----->e= " + e.getMessage());

                    }


 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java

@@ -229,14 +229,14 @@
            public void onSucceed(Object msg) {
                if (callBack == null) return;
                callBack.onSuccess("上报成功");
                LogUtils.i("UploadGatewayInfo onSucceed = " + msg);
//                LogUtils.i("UploadGatewayInfo onSucceed = " + msg);
            }

            @Override
            public void onFailure() {
                if (callBack == null) return;
                callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UPLOAD_GATEWAYINFO_FAILURE_ERROR));
                LogUtils.i("UploadGatewayInfo onFailure");
//                LogUtils.i("UploadGatewayInfo onFailure");
            }
        });


 HDLSDK/settings.gradle

@@ -1,5 +1,5 @@

include ':app'
//include ':app'
//include ':hdl-socket'
include ':hdl-connect'
//include ':hdl-common'