Merge branch 'androidx' of http://172.16.1.23:6688/r/~cjl/HDLSDK_A_Android ...

hxb

2023-09-18 1b31fc28fb80025345246f93f10507a15412cc75

Merge branch 'androidx' of http://172.16.1.23:6688/r/~cjl/HDLSDK_A_Android into androidx

 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())) {

                    //需要解密

@@ -196,7 +197,7 @@
                String bodyString = new String(body, "utf-8");

                response.setData(bodyString);

                LogUtils.i("接收到数据:" + response.getTopic() + "\r\n" + response.getData());

                


                //非正常数据，返回

                if (!((bodyString.startsWith("{") && bodyString.endsWith("}"))

                        || (bodyString.startsWith("[") && bodyString.endsWith("]")))) {


 HDLSDK/settings.gradle

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

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