HDLSDK/.idea/gradle.xml
@@ -11,7 +11,6 @@ <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> HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -41,21 +41,15 @@ import com.hdl.sdk.connect.bean.request.ListUploadRequest; import com.hdl.sdk.connect.bean.response.BaseLocalResponse; import com.hdl.sdk.connect.bean.response.GatewaySearchBean; import com.hdl.sdk.connect.bean.response.UpdateInfo; import com.hdl.sdk.connect.callback.HDLLinkCallBack; import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack; import com.hdl.sdk.connect.cloud.CallBackListener; import com.hdl.sdk.connect.cloud.CheckAppVersionListener; import com.hdl.sdk.connect.cloud.HDLException; import com.hdl.sdk.connect.config.HDLLinkConfig; import com.hdl.sdk.connect.socket.HDLAuthSocket; import com.hdl.sdk.connect.utils.AesUtil; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Base64; import java.util.List; import java.util.Map; @@ -88,7 +82,7 @@ infoBean.setAccessMode("WIFI"); infoBean.setIPGateway("192.168.1.1"); infoBean.setIPAddress("192.168.1.103"); infoBean.setGateway_type("screen.touch"); infoBean.setGateway_type("screen.touch");//spk infoBean.setHw_version("HW2.0"); infoBean.setFw_version("Fw1.0"); infoBean.setOID("010105000000FE11");//每个设备oid都要不一样 @@ -97,7 +91,7 @@ HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean); } void applyDeviceSecret() { /*void applyDeviceSecret() { tv.setText("开始申请设备密钥..."); responseTv.setText(""); @@ -163,7 +157,7 @@ } }); } }*/ /** * 入网认证 @@ -313,7 +307,7 @@ switch (position) { case 0: //申请设备密钥 applyDeviceSecret(); // applyDeviceSecret(); break; case 1: //入网认证 @@ -377,7 +371,7 @@ break; case 16: //检测更新 checkAppVersion(); // checkAppVersion(); break; } } HDLSDK/com.hdl.sdk/build.gradle
@@ -27,10 +27,8 @@ implementation fileTree(include: ['*.jar'], dir: 'libs') embed 'com.hdl.hdlhttp:hxhttp:1.0.4' // api 'androidx.appcompat:appcompat:1.3.1' // api 'com.google.android.material:material:1.4.0' embed 'com.google.code.gson:gson:2.8.8' /*embed 'com.hdl.hdlhttp:hxhttp:1.0.4' embed 'com.squareup.okhttp3:okhttp:4.9.1' embed 'com.squareup.okhttp3:logging-interceptor:4.9.1' @@ -41,15 +39,12 @@ embed 'com.squareup.retrofit2:adapter-rxjava3:2.9.0' embed 'io.reactivex.rxjava3:rxandroid:3.0.0' embed 'io.reactivex.rxjava3:rxjava:3.1.1' embed 'com.google.code.gson:gson:2.8.8' embed 'com.trello.rxlifecycle4:rxlifecycle:4.0.2' embed 'com.trello.rxlifecycle4:rxlifecycle-android:4.0.2' embed 'com.trello.rxlifecycle4:rxlifecycle-android-lifecycle:4.0.2' embed 'org.reactivestreams:reactive-streams:1.0.3' // embed(name: 'hxhttp_1.0.4_230201',ext: 'aar') embed 'org.reactivestreams:reactive-streams:1.0.3'*/ embed project(path: ':hdl-connect', configuration: 'default')
@@ -14,6 +14,6 @@ # AndroidX package structure to make it clearer which packages are bundled with the # Android operating system, and which are packaged with your app"s APK # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true android.useAndroidX=false ### Automatically convert third-party libraries to use AndroidX android.enableJetifier=true android.enableJetifier=false HDLSDK/hdl-connect/build.gradle
@@ -29,9 +29,8 @@ dependencies { // implementation fileTree(include: ['*.jar'], dir: 'libs') api 'com.hdl.hdlhttp:hxhttp:1.0.4' api 'com.squareup.okhttp3:logging-interceptor:4.9.1' // embed(name: 'hxhttp_1.0.4_230201',ext: 'aar') // api 'com.hdl.hdlhttp:hxhttp:1.0.4' // api 'com.squareup.okhttp3:logging-interceptor:4.9.1' api 'com.google.code.gson:gson:2.8.8' } HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
@@ -1,34 +1,19 @@ package com.hdl.sdk.connect; import android.content.Context; import com.hdl.hdlhttp.HxHttpConfig; import com.hdl.sdk.common.event.DeleteNetworkListener; import com.hdl.sdk.common.event.EventDispatcher; import com.hdl.sdk.common.event.EventListener; import com.hdl.sdk.common.utils.LogUtils; import com.hdl.sdk.common.utils.ThreadToolUtils; import com.hdl.sdk.connect.bean.request.DeviceAuthRequest; import com.hdl.sdk.connect.bean.request.AuthenticateRequest; import com.hdl.sdk.connect.bean.request.DeviceControlRequest; import com.hdl.sdk.connect.bean.request.ListUploadRequest; import com.hdl.sdk.connect.callback.HDLLinkCallBack; import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack; import com.hdl.sdk.connect.cloud.CallBackListener; import com.hdl.sdk.connect.cloud.CheckAppVersionListener; import com.hdl.sdk.connect.cloud.HdlCloudApi; import com.hdl.sdk.connect.cloud.HdlCloudController; import com.hdl.sdk.connect.cloud.interceptor.EncryptInterceptor; import com.hdl.sdk.connect.cloud.interceptor.SmartHeaderInterceptor; import com.hdl.sdk.connect.config.HDLLinkConfig; import com.hdl.sdk.common.event.EventDispatcher; import com.hdl.sdk.common.event.EventListener; import com.hdl.sdk.connect.bean.request.AuthenticateRequest; import com.hdl.sdk.connect.socket.HDLAuthSocket; import com.hdl.sdk.connect.socket.HDLSocket; import java.util.List; import java.util.concurrent.TimeUnit; import io.reactivex.rxjava3.disposables.Disposable; import okhttp3.logging.HttpLoggingInterceptor; /** * Created by jlchen on 11/15/21. @@ -162,7 +147,7 @@ * @param spk 设备spk * @param callBack 结果回调 */ public void applyDeviceSecret(Context context, String appKey, String appSecret, String supplier, String mac, String spk, CallBackListener callBack) { /*public void applyDeviceSecret(Context context, String appKey, String appSecret, String supplier, String mac, String spk, CallBackListener callBack) { LogUtils.i("申请设备密钥"); HxHttpConfig.getInstance().init(context, HdlCloudApi.BASE_CHINA_URL) .addInterceptor( @@ -180,7 +165,7 @@ HdlCloudController.applyDeviceSecret(supplier, mac, spk, callBack); } */ /** * 检测更新 * @@ -190,7 +175,7 @@ * @param appCode appCode * @param listener 结果回调 */ public void checkAppVersion(Context context, String appKey, String appSecret, String versionCode, String appCode, CheckAppVersionListener listener) { /*public void checkAppVersion(Context context, String appKey, String appSecret, String versionCode, String appCode, CheckAppVersionListener listener) { LogUtils.i("检测更新"); HxHttpConfig.getInstance().init(context, HdlCloudApi.BASE_CHINA_URL) .addInterceptor( @@ -207,7 +192,7 @@ .addInterceptor(httpLoggingInterceptor).ignoreSSL(); HdlCloudController.checkAppVersion(versionCode, appCode, listener); } }*/ /** * 通知删除并退网子设备 HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/BaseCallBack.java
File was deleted HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/CallBackListener.java
File was deleted HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/CheckAppVersionListener.java
File was deleted HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/GsonUtils.java
File was deleted HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/HDLException.java
File was deleted HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/HDLResponse.java
File was deleted HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/HdlCloudController.java
@@ -1,17 +1,12 @@ package com.hdl.sdk.connect.cloud; import com.hdl.hdlhttp.HxHttp; import com.hdl.sdk.connect.bean.response.UpdateInfo; import io.reactivex.rxjava3.disposables.Disposable; /** * Created by panlili on 2023/1/30 * description: */ public class HdlCloudController { public static Disposable applyDeviceSecret(String supplier, String mac, String spk, CallBackListener callBack) { /*public static Disposable applyDeviceSecret(String supplier, String mac, String spk, CallBackListener callBack) { return HxHttp.builder() .url(HdlCloudApi.BASE_CHINA_URL + HdlCloudApi.APPLY_DEVICE_SECRET) .params("supplier", supplier) @@ -34,14 +29,14 @@ } } }); } }*/ /** * 检查app是否更新 * * @return */ public static Disposable checkAppVersion(String versionCode, String appCode, CheckAppVersionListener listener) { /*public static Disposable checkAppVersion(String versionCode, String appCode, CheckAppVersionListener listener) { return HxHttp.builder() .url(HdlCloudApi.BASE_CHINA_URL + HdlCloudApi.CHECK_APP_VERSION_URL) .params("version", versionCode) @@ -60,6 +55,6 @@ listener.onError(e); } }); } }*/ } HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/interceptor/EncryptInterceptor.java
File was deleted HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/interceptor/SmartHeader.java
File was deleted HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/interceptor/SmartHeaderInterceptor.java
File was deleted HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java
@@ -5,7 +5,6 @@ import android.text.TextUtils; import android.util.Log; import androidx.annotation.RequiresApi; import com.google.gson.reflect.TypeToken; import com.hdl.sdk.common.config.TopicConstant; @@ -32,7 +31,6 @@ import android.util.Base64; import kotlin.ParameterName; /** * Created by Tong on 2021/9/22. @@ -131,7 +129,7 @@ } @RequiresApi(api = Build.VERSION_CODES.O) // @RequiresApi(api = Build.VERSION_CODES.O) @Override protected synchronized LinkResponse decoder(Object msg, String ipaddress) throws Exception { if (msg instanceof byte[]) { HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
@@ -1,16 +1,10 @@ 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,33 +12,28 @@ 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.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; @@ -54,7 +43,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; @@ -125,7 +113,7 @@ } BroadcastRequest request = new BroadcastRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), "200"); HDLAuthSocket.getInstance().udpSendMsg(TopicConstant.BROADCAST, GsonConvert.getGson().toJson(request), true, new HDLLinkResponseCallBack() { @RequiresApi(api = Build.VERSION_CODES.O) // @RequiresApi(api = Build.VERSION_CODES.O) @Override public void onSuccess(LinkResponse msg) { String data = msg.getData(); HDLSDK/settings.gradle
@@ -1,5 +1,5 @@ include ':app' //include ':app' //include ':hdl-socket' include ':hdl-connect' //include ':hdl-common' HDLSDK_DEMO/app/build.gradle
@@ -40,5 +40,5 @@ implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6' // implementation 'com.google.code.gson:gson:2.8.8' // implementation project(path: ':hdl-connect') implementation files('libs\\com.hdl.sdk-v1.1.3.aar') implementation files('libs\\com.hdl.sdk-v1.1.4.aar') } HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.1.3.aarBinary files differ
HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.1.4.aarBinary files differ
HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -40,8 +40,6 @@ import com.hdl.sdk.connect.bean.response.GatewaySearchBean; import com.hdl.sdk.connect.callback.HDLLinkCallBack; import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack; import com.hdl.sdk.connect.cloud.CallBackListener; import com.hdl.sdk.connect.cloud.HDLException; import com.hdl.sdk.connect.config.HDLLinkConfig; import com.hdl.sdk.connect.socket.HDLAuthSocket; @@ -90,7 +88,7 @@ HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean); } void applyDeviceSecret() { /*void applyDeviceSecret() { tv.setText("开始申请设备密钥..."); responseTv.setText(""); @@ -130,7 +128,7 @@ } }); } }*/ /** * 入网认证 @@ -279,7 +277,7 @@ switch (position) { case 0: //申请设备密钥 applyDeviceSecret(); // applyDeviceSecret(); break; case 1: //入网认证
