HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -78,12 +78,12 @@ responseTv.setText(""); // //正式服务器 String appKey = "i8hR07jzrIS";//appkey String appSecret = "BmnJ8RWTtaVEBk24zPPF4UMwfYu0lAWU";//appsecret // String appKey = "i8hR07jzrIS";//appkey // String appSecret = "BmnJ8RWTtaVEBk24zPPF4UMwfYu0lAWU";//appsecret //测试服务器 // String appKey ="FcRyUJlLJFF"; // String appSecret = "wz8wn75ABidx8vXcFGUotqhwFkTaYvvJ"; String appKey ="FcRyUJlLJFF"; String appSecret = "wz8wn75ABidx8vXcFGUotqhwFkTaYvvJ"; // String appKey = "L2OZliZRxHc"; // String appSecret = "aCIWSvJDOukXfx3kivsKW11x9xdR3IbV"; @@ -481,6 +481,7 @@ void searchGatewayBroadcast() { tv.setText("搜索网关中..."); responseTv.setText(""); HDLLinkConfig.getInstance().getGatewayId(); HDLLink.getInstance().searchGatewayBroadcast(new HDLAuthSocket.SearchGatewayCallBack() { @Override public void onError(HDLLinkException e) { HDLSDK/com.hdl.sdk/build.gradle
@@ -8,8 +8,8 @@ defaultConfig { minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion versionCode 118 versionName "1.1.8" versionCode 119 versionName "1.1.9" } buildTypes { debug { HDLSDK/hdl-connect/build.gradle
@@ -8,8 +8,8 @@ defaultConfig { minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion versionCode 6 versionName "1.1.8" versionCode 7 versionName "1.1.9" consumerProguardFiles "consumer-rules.pro" } HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java
@@ -35,7 +35,7 @@ public String getVersion() { try { PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0); String versionName = packageInfo.versionName; // 版本名称（字符串） String versionName = packageInfo.versionName; // 版本名称（字符串） return versionName; } catch (Exception e) { LogUtils.e("获取版本失败:" + e.getMessage()); HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/HdlCloudApi.java
@@ -7,10 +7,10 @@ public class HdlCloudApi { //正式环境 public static final String BASE_CHINA_URL = "https://china-gateway.hdlcontrol.com"; // public static final String BASE_CHINA_URL = "https://china-gateway.hdlcontrol.com"; //测试环境 // public static final String BASE_CHINA_URL = "https://test-gz.hdlcontrol.com"; public static final String BASE_CHINA_URL = "https://test-gz.hdlcontrol.com"; //申请设备密钥(根据设备MAC) public static final String APPLY_DEVICE_SECRET = "/smart-open/third/device/authByMac"; HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
@@ -1,16 +1,12 @@ package com.hdl.sdk.connect.socket; import static com.hdl.sdk.connect.config.HDLLinkConfig.AUTHENTICATE_IS_DEVICEINFO_KEY; import android.os.Build; import android.text.TextUtils; import android.util.Log; import androidx.annotation.RequiresApi; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import com.hdl.sdk.common.HDLSdk; import com.hdl.sdk.common.config.TopicConstant; import com.hdl.sdk.common.event.EventDispatcher; import com.hdl.sdk.common.event.EventListener; @@ -18,34 +14,29 @@ import com.hdl.sdk.common.exception.HDLLinkException; import com.hdl.sdk.common.utils.IdUtils; import com.hdl.sdk.common.utils.LogUtils; import com.hdl.sdk.common.utils.SPUtils; import com.hdl.sdk.common.utils.ThreadToolUtils; import com.hdl.sdk.common.utils.gson.GsonConvert; import com.hdl.sdk.connect.HDLLink; import com.hdl.sdk.connect.bean.LinkRequest; import com.hdl.sdk.connect.bean.LinkResponse; import com.hdl.sdk.connect.bean.LoginRequest; import com.hdl.sdk.connect.bean.request.AuthenticateRequest; import com.hdl.sdk.connect.bean.request.BroadcastRequest; import com.hdl.sdk.connect.bean.request.DeviceAuthRequest; import com.hdl.sdk.connect.bean.request.GatewayInfoRequest; import com.hdl.sdk.connect.bean.request.DeviceControlRequest; import com.hdl.sdk.connect.bean.request.FunctionAttributeRequest; import com.hdl.sdk.connect.bean.request.ListOidRequest; import com.hdl.sdk.connect.bean.request.ListOidRequest2; import com.hdl.sdk.connect.bean.request.ListSidRequest; import com.hdl.sdk.connect.bean.request.ListUploadRequest; import com.hdl.sdk.connect.bean.response.AuthenticateResponse; import com.hdl.sdk.connect.bean.request.PropertyReadRequest; import com.hdl.sdk.connect.bean.response.BaseLocalCodeResponse; import com.hdl.sdk.connect.bean.response.BaseLocalResponse; import com.hdl.sdk.connect.bean.request.DeviceControlRequest; import com.hdl.sdk.connect.bean.request.FunctionAttributeRequest; import com.hdl.sdk.connect.bean.LinkRequest; import com.hdl.sdk.connect.bean.LinkResponse; import com.hdl.sdk.connect.bean.request.PropertyReadRequest; import com.hdl.sdk.connect.bean.response.DeviceInfoResponse; import com.hdl.sdk.connect.callback.HDLLinkCallBack; import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack; import com.hdl.sdk.connect.config.HDLLinkConfig; import com.hdl.sdk.connect.protocol.LinkMessageDecoder; import com.hdl.sdk.connect.protocol.LinkMessageEncoder; import com.hdl.sdk.connect.utils.AesUtil; import com.hdl.sdk.socket.SocketBoot; import com.hdl.sdk.socket.SocketOptions; import com.hdl.sdk.socket.client.IHeartbeat; @@ -55,7 +46,6 @@ import com.hdl.sdk.socket.listener.SendListener; import java.util.ArrayList; import java.util.Base64; import java.util.List; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -110,9 +100,12 @@ while (true) { try { Thread.sleep(5000); // LogUtils.i("checkIfCertified=" + HDLLink.getInstance().checkIfCertified() + " getTcp().connected=" + getTcp().connected); try { if (!HDLLink.getInstance().checkIfCertified() || (!TextUtils.isEmpty(getTcpIp()) && getTcp().connected)) { if (!HDLLink.getInstance().checkIfCertified()) { continue; } if (!TextUtils.isEmpty(getTcpIp()) && getTcp().connected) { continue; } } catch (Exception e) { @@ -473,8 +466,8 @@ } } public synchronized SocketBoot getTcp() throws RuntimeException { String gatewayIpAddress=getTcpIp(); public synchronized SocketBoot getTcp() throws RuntimeException { String gatewayIpAddress = getTcpIp(); if (TextUtils.isEmpty(gatewayIpAddress)) { LogUtils.e("请搜索网关"); throw new RuntimeException("请搜索网关"); @@ -664,7 +657,7 @@ data.setTime_stamp(time); //2023.10.18修改，上报oid列表增加parentOid if (request!=null && !TextUtils.isEmpty(HDLLinkConfig.getInstance().getParentOid())) { if (request != null && !TextUtils.isEmpty(HDLLinkConfig.getInstance().getParentOid())) { request.setParentOid(HDLLinkConfig.getInstance().getParentOid()); }
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="CompilerConfiguration"> <bytecodeTargetLevel target="11" /> <bytecodeTargetLevel target="1.8" /> </component> </project> HDLSDK_DEMO/.idea/gradle.xml
@@ -4,10 +4,8 @@ <component name="GradleSettings"> <option name="linkedExternalProjectsSettings"> <GradleProjectSettings> <option name="testRunner" value="GRADLE" /> <option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="gradleJvm" value="1.8" /> <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" /> <option name="modules"> <set> <option value="$PROJECT_DIR$" /> @@ -17,7 +15,7 @@ <option value="$PROJECT_DIR$/hdl-socket" /> </set> </option> <option name="resolveModulePerSourceSet" value="false" /> <option name="resolveExternalAnnotations" value="false" /> </GradleProjectSettings> </option> </component> HDLSDK_DEMO/.idea/misc.xml
@@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="DesignSurface"> <option name="filePathToZoomLevelMap"> <map> <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/activity_devices_list.xml" value="0.3536458333333333" /> <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/activity_main.xml" value="0.3538301198540907" /> <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/item_devices_list.xml" value="0.3536458333333333" /> <entry key="..\:/job/me/Android/HDLSDK/app/src/main/res/layout/activity_main.xml" value="0.1" /> <entry key="..\:/job/me/Android/HDLSDK/app/src/main/res/layout/demo_item.xml" value="0.28958333333333336" /> </map> </option> </component> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> <option name="id" value="Android" /> </component> <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="DesignSurface"> <option name="filePathToZoomLevelMap"> <map> <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/activity_devices_list.xml" value="0.3536458333333333" /> <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/activity_main.xml" value="0.3538301198540907" /> <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/item_devices_list.xml" value="0.3536458333333333" /> <entry key="..\:/job/me/Android/HDLSDK/app/src/main/res/layout/activity_main.xml" value="0.1" /> <entry key="..\:/job/me/Android/HDLSDK/app/src/main/res/layout/demo_item.xml" value="0.28958333333333336" /> </map> </option> </component> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> <option name="id" value="Android" /> </component> </project> HDLSDK_DEMO/app/build.gradle
@@ -38,12 +38,6 @@ androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6' <<<<<<< HEAD implementation 'com.google.code.gson:gson:2.8.8' implementation files('libs\\com.hdl.sdk-v1.0.16.aar') ======= // implementation 'com.google.code.gson:gson:2.8.8' >>>>>>> not_androidx // implementation project(path: ':hdl-connect') implementation files('libs\\com.hdl.sdk-v1.1.3.aar') implementation files('libs\\com.hdl.sdk-v1.1.9.aar') } HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.16.aarBinary files differ
HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.1.9.aarBinary files differ
HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -52,6 +52,8 @@ import java.util.List; import java.util.Map; import retrofit2.http.HEAD; public class MainActivity extends AppCompatActivity { private static final String TAG = "MainActivity"; @@ -74,32 +76,21 @@ void initDeviceInfo() { AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean(); <<<<<<< HEAD infoBean.setDeviceMAC("AA00000000000100"); infoBean.setIPMAC("AA00000000000100"); ======= infoBean.setDeviceMAC("f2c5d8bad48f"); infoBean.setIPMAC("f2c5d8bad48f"); >>>>>>> not_androidx infoBean.setDeviceName("音乐播放器");//设备名字 infoBean.setDeviceModel("MCLog.431");//设备型号 infoBean.setAccessMode("WIFI"); infoBean.setIPGateway("192.168.1.1"); <<<<<<< HEAD infoBean.setIPAddress("192.168.1.116"); infoBean.setGateway_type("music.standard"); ======= infoBean.setIPAddress("192.168.1.103"); infoBean.setGateway_type("screen.touch"); >>>>>>> not_androidx infoBean.setHw_version("HW2.0"); infoBean.setFw_version("Fw1.0"); infoBean.setOID("010105000000FE11");//每个设备oid都要不一样 infoBean.setSid("110105000000FE08110100000011");//每个设备的sid都要不一样 <<<<<<< HEAD ======= infoBean.setSupplier("JINMAOYUN"); >>>>>>> not_androidx HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean); } @@ -159,16 +150,10 @@ // String secret = "44b360eb74b7ba64";//通过spk和mac提交云端认证后分配的secret // 正式服务器 <<<<<<< HEAD String spkStr = "screen.mirror";//产品spk String macStr = "AA00000000000100";//设备唯一MAC地址 String secret = "e186beeb7974998e";//通过spk和mac提交云端认证后分配的secret ======= String spkStr = "screen.touch";//产品spk // String macStr = "AA00000000000100";//设备唯一MAC地址 String macStr = editText.getText().toString();//设备唯一MAC地址 // String secret = "e186beeb7974998e";//通过spk和mac提交云端认证后分配的secret >>>>>>> not_androidx // String secret = "e186beeb7974998e";//通过spk和mac提交云端认证后分配的 String mac_key = stringToMD5(stringToMD5(macStr + secret)); String versionString = "HDL_V1.0.1";//
