From 830e47a67026205b75f69e061d81783aa606a237 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期五, 23 九月 2022 16:23:26 +0800
Subject: [PATCH] tcp发送之前判断是否连接
---
HDLSDK/app/src/main/res/drawable-v24/ic_launcher_foreground.xml | 30 +
HDLSDK_DEMO/.idea/gradle.xml | 3
HDLSDK/app/.gitignore | 1
HDLSDK/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp | 0
HDLSDK/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml | 5
HDLSDK/app/src/main/AndroidManifest.xml | 34 +
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java | 8
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java | 2
HDLSDK/app/src/main/res/layout/activity_main.xml | 79 ++
HDLSDK/app/src/main/res/layout/demo_item.xml | 28 +
HDLSDK/app/src/main/res/layout/activity_devices_list.xml | 14
HDLSDK/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp | 0
HDLSDK/app/src/main/java/com/hdl/hdlsdk/DemoBean.java | 28 +
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketRequest.java | 7
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java | 2
HDLSDK/app/src/main/res/layout/item_devices_list.xml | 44 +
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java | 6
HDLSDK/app/src/main/res/values/strings.xml | 3
HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/DevicesListActivity.java | 89 +++
HDLSDK_DEMO/app/build.gradle | 2
HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/FunctionBean.java | 106 +++
HDLSDK/app/src/main/res/mipmap-hdpi/ic_launcher.webp | 0
HDLSDK/app/src/main/res/mipmap-mdpi/ic_launcher.webp | 0
HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.17.aar | 0
HDLSDK/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp | 0
HDLSDK/.idea/compiler.xml | 2
HDLSDK/.idea/gradle.xml | 3
HDLSDK/app/build.gradle | 43 +
HDLSDK/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp | 0
HDLSDK/app/src/main/res/values-night/themes.xml | 16
HDLSDK/app/src/main/java/com/hdl/.DS_Store | 0
HDLSDK/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 5
HDLSDK/app/proguard-rules.pro | 21
HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/DevicesListAdapter.java | 118 ++++
HDLSDK/app/src/main/java/com/hdl/hdlsdk/DemoAdapter.java | 26
HDLSDK/app/src/main/res/values/themes.xml | 16
/dev/null | 0
HDLSDK/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp | 0
HDLSDK/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp | 0
HDLSDK/app/src/main/res/values/colors.xml | 10
HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java | 33 +
HDLSDK/app/src/main/res/mipmap-xhdpi/ic_launcher.webp | 0
HDLSDK_DEMO/.idea/compiler.xml | 2
HDLSDK/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp | 0
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 611 ++++++++++++++++++++++
HDLSDK/app/src/main/res/drawable/ic_launcher_background.xml | 170 ++++++
46 files changed, 1,557 insertions(+), 10 deletions(-)
diff --git a/HDLSDK/.idea/compiler.xml b/HDLSDK/.idea/compiler.xml
index 245a82c..7d7ec2e 100644
--- a/HDLSDK/.idea/compiler.xml
+++ b/HDLSDK/.idea/compiler.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
- <bytecodeTargetLevel target="1.8" />
+ <bytecodeTargetLevel target="11" />
</component>
</project>
\ No newline at end of file
diff --git a/HDLSDK/.idea/gradle.xml b/HDLSDK/.idea/gradle.xml
index db77076..ab2103b 100644
--- a/HDLSDK/.idea/gradle.xml
+++ b/HDLSDK/.idea/gradle.xml
@@ -4,7 +4,7 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <option name="testRunner" value="PLATFORM" />
+ <option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
@@ -17,7 +17,6 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
- <option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>
diff --git a/HDLSDK/app/.gitignore b/HDLSDK/app/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/HDLSDK/app/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/HDLSDK/app/build.gradle b/HDLSDK/app/build.gradle
new file mode 100644
index 0000000..1960e0a
--- /dev/null
+++ b/HDLSDK/app/build.gradle
@@ -0,0 +1,43 @@
+plugins {
+ id 'com.android.application'
+}
+
+android {
+ compileSdk 28
+
+ defaultConfig {
+ applicationId "com.hdl.hdlsdk"
+ minSdk 21
+ targetSdk 28
+ versionCode 1
+ versionName "1.0"
+
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+}
+
+dependencies {
+
+ implementation 'androidx.appcompat:appcompat:1.3.1'
+ implementation 'com.google.android.material:material:1.4.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+
+ testImplementation 'junit:junit:4.+'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+ implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6'
+
+ implementation project(path: ':hdl-connect')
+}
\ No newline at end of file
diff --git a/HDLSDK/app/proguard-rules.pro b/HDLSDK/app/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/HDLSDK/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/AndroidManifest.xml b/HDLSDK/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..fbb77a0
--- /dev/null
+++ b/HDLSDK/app/src/main/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.hdl.hdlsdk">
+
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+ <uses-permission
+ android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+ tools:ignore="ScopedStorage" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+ <application
+ android:name=".App"
+ android:allowBackup="true"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:roundIcon="@mipmap/ic_launcher_round"
+ android:supportsRtl="true"
+ android:theme="@style/Theme.HDLSDK">
+ <activity android:name=".device.DevicesListActivity"></activity>
+ <activity
+ android:name=".MainActivity"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ </application>
+
+</manifest>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/java/com/hdl/.DS_Store b/HDLSDK/app/src/main/java/com/hdl/.DS_Store
new file mode 100644
index 0000000..ae5aaee
--- /dev/null
+++ b/HDLSDK/app/src/main/java/com/hdl/.DS_Store
Binary files differ
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java
new file mode 100644
index 0000000..5e35853
--- /dev/null
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/App.java
@@ -0,0 +1,33 @@
+package com.hdl.hdlsdk;
+
+import android.app.Application;
+import android.util.Log;
+
+import com.hdl.sdk.common.HDLSdk;
+import com.hdl.sdk.common.event.EventListener;
+import com.hdl.sdk.common.utils.LogUtils;
+import com.hdl.sdk.connect.HDLLink;
+import com.hdl.sdk.connect.bean.LinkResponse;
+
+/**
+ * Created by Tong on 2021/10/8.
+ */
+public class App extends Application {
+
+ private String deviceStatusUpdateTopic;
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ //鍒濆鍖朣DK
+ HDLSdk.getInstance().init(this);
+ //鎺у埗SDK鏃ュ織鎵撳嵃
+ HDLSdk.getInstance().setLogEnabled(true);
+
+ }
+
+ @Override
+ public void onTerminate() {
+ super.onTerminate();
+
+ }
+}
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/DemoAdapter.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/DemoAdapter.java
new file mode 100644
index 0000000..20b0fff
--- /dev/null
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/DemoAdapter.java
@@ -0,0 +1,26 @@
+package com.hdl.hdlsdk;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+
+import java.util.List;
+
+/**
+ * Created by Tong on 2021/10/8.
+ */
+public class DemoAdapter extends BaseMultiItemQuickAdapter<DemoBean, BaseViewHolder> {
+
+ public DemoAdapter(@Nullable List<DemoBean> data) {
+ super(data);
+ addItemType(0,R.layout.demo_item);
+ }
+
+ @Override
+ protected void convert(@NonNull BaseViewHolder baseViewHolder, DemoBean demoBean) {
+ baseViewHolder.setText(R.id.tv_title,demoBean.getName());
+ }
+}
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/DemoBean.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/DemoBean.java
new file mode 100644
index 0000000..18b237e
--- /dev/null
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/DemoBean.java
@@ -0,0 +1,28 @@
+package com.hdl.hdlsdk;
+
+import com.chad.library.adapter.base.entity.MultiItemEntity;
+
+/**
+ * Created by Tong on 2021/10/8.
+ */
+public class DemoBean implements MultiItemEntity {
+
+ private String name;
+
+ public DemoBean(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public int getItemType() {
+ return 0;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
new file mode 100644
index 0000000..678a722
--- /dev/null
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -0,0 +1,611 @@
+package com.hdl.hdlsdk;
+
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.Manifest;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.listener.OnItemClickListener;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import com.hdl.hdlsdk.device.DevicesListActivity;
+import com.hdl.sdk.common.config.TopicConstant;
+import com.hdl.sdk.common.event.EventListener;
+import com.hdl.sdk.common.exception.HDLLinkException;
+import com.hdl.sdk.common.utils.IdUtils;
+import com.hdl.sdk.common.utils.IpUtils;
+import com.hdl.sdk.common.utils.LogUtils;
+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.request.AuthenticateRequest;
+import com.hdl.sdk.connect.bean.request.BroadcastRequest;
+import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
+import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
+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.config.HDLLinkConfig;
+import com.hdl.sdk.connect.socket.HDLAuthSocket;
+import com.hdl.sdk.connect.socket.HDLSocket;
+import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
+import com.hdl.sdk.connect.protocol.LinkMessageDecoder;
+import com.hdl.sdk.connect.protocol.LinkMessageEncoder;
+import com.hdl.sdk.socket.SocketOptions;
+import com.hdl.sdk.socket.codec.MessagePipeLine;
+import java.util.Base64;
+
+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;
+
+import static com.hdl.sdk.common.config.TopicConstant.GATEWAY_SEARCH_REPLY;
+import static java.util.Base64.*;
+
+public class MainActivity extends AppCompatActivity {
+
+ private static final String TAG = "MainActivity";
+ private DemoAdapter demoAdapter;
+ private RecyclerView rv;
+ private TextView tv;
+ private TextView responseTv;
+ boolean isOn;
+ private EventListener allTopicsListener;
+ private String testLightSid = "0001010D48C71B02020100010101";
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ removeAllTopicsListener();
+ }
+void init() {
+// HDLLinkConfig.getInstance().setLocalSecret("7d04c4e3c2b7d600");
+// HDLLinkConfig.getInstance().setGatewayId("1473119283609321473");
+// HDLLinkConfig.getInstance().setLocalEncrypt(true);
+}
+ @RequiresApi(api = Build.VERSION_CODES.O)
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.activity_main);
+ responseTv = findViewById(R.id.response_tv);
+ tv = findViewById(R.id.state_tv);
+ rv = findViewById(R.id.rv);
+ rv.setLayoutManager(new LinearLayoutManager(this));
+
+ init();
+ checkIfCertified();
+ initDeviceInfo();//鍒濆鍖栧熀鏈俊鎭紝闈炲父閲嶈锛岃璇佹椂瑕佺敤
+ registerAllTopicsListener();
+
+ ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
+ @Override
+ public void onActivityResult(Map<String, Boolean> result) {
+
+ }
+ });
+
+ launcher.launch(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE});
+
+ final List<DemoBean> beans = new ArrayList<>();
+ beans.add(new DemoBean("鍏ョ綉璁よ瘉"));
+ beans.add(new DemoBean("鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎"));
+ beans.add(new DemoBean("鑾峰彇鍔熻兘鍒楄〃"));
+ beans.add(new DemoBean("鍔熻兘灞炴�ц鍙�"));
+ beans.add(new DemoBean("璁惧鎺у埗"));
+ beans.add(new DemoBean("璇诲彇鐘舵��"));
+ beans.add(new DemoBean("鑾峰彇鍦烘櫙鍒楄〃"));
+ beans.add(new DemoBean("鍦烘櫙鎺у埗"));
+ beans.add(new DemoBean("璁惧鍔熻兘鍒楄〃"));
+ beans.add(new DemoBean("UDP鍙戦��"));
+ beans.add(new DemoBean("TCP鍙戦��"));
+ beans.add(new DemoBean("UDP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�"));
+ beans.add(new DemoBean("TCP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�"));
+ demoAdapter = new DemoAdapter(beans);
+ rv.setAdapter(demoAdapter);
+
+
+// final SocketOptions options = new SocketOptions();
+//
+// MessagePipeLine pipeLine = new MessagePipeLine();
+// options.setHandleMessage(pipeLine);
+// options.setEnabledHeartbeat(false);
+
+ demoAdapter.setOnItemClickListener(new OnItemClickListener() {
+ @Override
+ public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
+ switch (position) {
+ case 0:
+ //鍏ョ綉璁よ瘉
+ sendAuthenticateRequest();
+ break;
+ case 1:
+ //鎼滅储缃戝叧
+ searchGatewayBroadcast();
+ break;
+ case 2:
+ //鑾峰彇鍔熻兘鍒楄〃
+ getFunctionList();
+ break;
+ case 3:
+ //鍔熻兘灞炴�ц鍙�
+ getFunctionAttribute();
+ break;
+ case 4:
+ //璁惧鎺у埗
+ controlDecide();
+ break;
+ case 5:
+ //璇诲彇鐘舵��
+ propertyRead();
+ break;
+ case 6:
+ //鑾峰彇鍦烘櫙鍒楄〃
+ getSceneList();
+ break;
+ case 7:
+ //鑾峰彇鍦烘櫙鍒楄〃
+ controlScene();
+ break;
+ case 8:
+ //鍔熻兘鍒楄〃
+ startDevicesListActivity();
+ break;
+ case 9:
+ //UDP鍙戦��
+ udpSend();
+ break;
+ case 10:
+ //TCP鍙戦��
+ tcpSend();
+ break;
+ case 11:
+ //UDP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�
+ udpSendWithCallback();
+ break;
+ case 12:
+ //TCP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�
+ tcpSendWithCallback();
+ break;
+ }
+ }
+ });
+ }
+
+
+ public void showToast(String text) {
+ Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
+ }
+
+ /**
+ * 妫�娴嬫槸鍚﹁璇佽繃
+ */
+ void checkIfCertified() {
+ boolean isCertified = HDLLink.getInstance().checkIfCertified();
+ String mes = isCertified ? "宸茬粡璁よ瘉杩�" : "鏈璇�";
+ showToast(mes);
+ tv.setText(mes);
+ }
+
+ /**
+ * 娉ㄥ唽鎵�鏈変富棰樻暟鎹殑鐩戝惉
+ */
+ void registerAllTopicsListener() {
+ allTopicsListener = new EventListener() {
+ @Override
+ public void onMessage(Object msg) {
+ LinkResponse response = (LinkResponse) msg;
+ handleLinkResponse(response);
+ }
+ };
+ HDLLink.getInstance().registerAllTopicsListener(allTopicsListener);
+ }
+
+ /**
+ * 澶勭悊鏀跺埌鐨勪富棰�
+ *
+ * @param response
+ */
+ private void handleLinkResponse(LinkResponse response) {
+ //缃戝叧鎼滅储鍥炲
+ if (response.getTopic().contains("/user/all/custom/gateway/search_reply")) {
+ String data = response.getData();
+ if (!TextUtils.isEmpty(data)) {
+ Log.i("handleLinkResponse", "data:" + data);
+ final BaseLocalResponse<GatewaySearchBean> bean = GsonConvert.getGson().fromJson(data, new TypeToken<BaseLocalResponse<GatewaySearchBean>>() {
+ }.getType());
+ GatewaySearchBean searchBean = bean.getObjects();
+ Log.i("handleLinkResponse", "GatewaySearchBean: " + searchBean.getGatewayId());
+ }
+ } else {
+ //鍏跺畠涓婚
+
+ }
+ }
+
+ private GatewaySearchBean getGatewaySearchBean(Object msg) {
+ GatewaySearchBean searchBean = null;
+ if (msg instanceof LinkResponse) {
+ LinkResponse linkResponse = (LinkResponse) msg;
+ String data = linkResponse.getData();
+ if (!TextUtils.isEmpty(data)) {
+ final BaseLocalResponse<GatewaySearchBean> response = GsonConvert.getGson().fromJson(data, new TypeToken<BaseLocalResponse<GatewaySearchBean>>() {
+ }.getType());
+ searchBean = response.getObjects();
+ }
+ }
+ return searchBean;
+ }
+
+ /**
+ * 绉婚櫎鎵�鏈変富棰樻暟鎹殑鐩戝惉
+ */
+ void removeAllTopicsListener() {
+ HDLLink.getInstance().removeAllTopicsListener(allTopicsListener);
+ }
+
+ void initDeviceInfo()
+ {
+ AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
+ infoBean.setDeviceMAC("AA00000000000100");
+ infoBean.setIPMAC("AA00000000000100");
+ infoBean.setDeviceName("闊充箰鎾斁鍣�");//璁惧鍚嶅瓧
+ infoBean.setDeviceModel("MCLog.431");//璁惧鍨嬪彿
+ infoBean.setAccessMode("WIFI");
+ infoBean.setIPGateway("192.168.1.1");
+ infoBean.setIPAddress("192.168.1.116");
+ infoBean.setGateway_type("music.standard");
+ infoBean.setHw_version("HW2.0");
+ infoBean.setFw_version("Fw1.0");
+ infoBean.setOID("010105000000FE11");//姣忎釜璁惧oid閮借涓嶄竴鏍�
+ infoBean.setSid("110105000000FE08110100000011");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
+ HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
+ }
+
+ /**
+ * 鍏ョ綉璁よ瘉
+ */
+ void sendAuthenticateRequest() {
+ tv.setText("寮�濮嬪叆缃戣璇�...");
+ //璁よ瘉鎻愪氦鍙傛暟鍑嗗
+
+// 娴嬭瘯鏈嶅姟
+// String spkStr = "ir.module";//浜у搧spk
+// String macStr = "AA000000000000AF";//璁惧鍞竴MAC鍦板潃
+// String secret = "44b360eb74b7ba64";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+
+// 姝ｅ紡鏈嶅姟鍣�
+ String spkStr = "screen.mirror";//浜у搧spk
+ String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
+ String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+
+ String mac_key = stringToMD5(stringToMD5(macStr + secret));
+ String versionString = "HDL_V1.0.1";//
+ String time = String.valueOf(System.currentTimeMillis());
+ HDLLinkConfig.getInstance().getDeviceInfoBean().setDeviceMAC(macStr);
+
+ //1.璁剧疆璁よ瘉淇℃伅
+ AuthenticateRequest.RequestBean requestBean = new AuthenticateRequest.RequestBean();
+ requestBean.setMAC(macStr);
+ requestBean.setSupplier("WISE");
+ requestBean.setFirmwareVersion(versionString);
+ requestBean.setHardwareModel("1956F");
+ AuthenticateRequest.AuthBean authbean = new AuthenticateRequest.AuthBean();
+ authbean.setSpk(spkStr);
+ authbean.setMACKey(mac_key);
+ authbean.setRequest(requestBean);
+ //HDLLinkConfig.getInstance().getDeviceInfoBean()杩欎釜鍒濆鍖栫殑鏃跺�欒鍏堣缃ソ
+ AuthenticateRequest request = new AuthenticateRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), authbean);
+ HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() {
+ @Override
+ public void onError(HDLLinkException e) {
+ tv.setText("璁よ瘉澶辫触");
+ responseTv.setText(e.getMsg());
+ Log.i("TAG", "onError: 璁よ瘉澶辫触");
+ }
+
+ @Override
+ public void onSuccess(String msg) {
+ tv.setText("璁よ瘉鎴愬姛");
+ responseTv.setText(msg.toString());
+ }
+ });
+ }
+
+ String stringToMD5(String text) {
+ byte[] hash;
+ try {
+ hash = MessageDigest.getInstance("MD5").digest(text.getBytes("UTF-8"));
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ return null;
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ return null;
+ }
+
+ StringBuilder hex = new StringBuilder(hash.length * 2);
+ for (byte b : hash) {
+ if ((b & 0xFF) < 0x10)
+ hex.append("0");
+ hex.append(Integer.toHexString(b & 0xFF));
+ }
+
+ return hex.toString();
+ }
+
+ /**
+ * 濡傛灉宸茬粡璁よ瘉鍚庯紝鎼滅储鎸囧畾缃戝叧鏄惁鍦ㄧ嚎
+ * 骞挎挱鎼滅储璁よ瘉杩囩殑缃戝叧鏄惁鍦ㄧ嚎
+ */
+ void searchGatewayBroadcast() {
+ tv.setText("鎼滅储缃戝叧涓�...");
+ HDLLink.getInstance().searchGatewayBroadcast(new HDLAuthSocket.SearchGatewayCallBack() {
+ @Override
+ public void onError(HDLLinkException e) {
+ tv.setText("缃戝叧涓嶅湪绾�");
+ responseTv.setText(e.getMsg());
+ }
+
+ @Override
+ public void onSuccess(GatewaySearchBean gatewaySearchBean) {
+ tv.setText("缃戝叧鍦ㄧ嚎");
+ responseTv.setText("鎼滅储鎴愬姛 缃戝叧id锛�" + gatewaySearchBean.getGatewayId());
+// LogUtils.i("TAG", "onSuccess: 鎼滅储鎴愬姛锛�"+gatewaySearchBean.getGatewayId());
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鍔熻兘鍒楄〃
+ */
+ void getFunctionList() {
+ tv.setText("鑾峰彇鍔熻兘鍒楄〃涓�...");
+ responseTv.setText("");
+ HDLLink.getInstance().getFunctionList(new HDLLinkCallBack() {
+ @Override
+ public void onError(HDLLinkException error) {
+ tv.setText(error.getMsg());
+ }
+
+ @Override
+ public void onSuccess(String data) {
+ tv.setText("鑾峰彇鍔熻兘鍒楄〃鎴愬姛");
+ responseTv.setText(data);
+ }
+ });
+ }
+
+ /**
+ * 鍔熻兘灞炴�ц鍙�
+ * 鏀寔鎵归噺璇诲彇
+ */
+ void getFunctionAttribute() {
+ tv.setText("鍔熻兘灞炴�ц鍙�");
+ List<String> sids = new ArrayList<>();
+ sids.add(testLightSid);
+ HDLLink.getInstance().getFunctionAttribute(sids, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ responseTv.setText(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ /**
+ * 璇诲彇璁惧鐘舵��
+ * 鏀寔鎵归噺璇诲彇
+ */
+ void propertyRead() {
+ tv.setText("璇诲彇鐘舵�佷腑...");
+ List<String> list = new ArrayList<>();
+ list.add(testLightSid);//瑕佽鍙栬澶囩殑sid
+ HDLLink.getInstance().propertyRead(list, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String data) {
+ tv.setText("璇诲彇鎴愬姛");
+ responseTv.setText(data);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ tv.setText("璇诲彇澶辫触");
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ /**
+ * 鎺у埗澶辫触
+ * 鍥炲鍝嶅簲code涓�200 浠ｈ〃鎵ц鎴愬姛
+ */
+ void controlDecide() {
+ tv.setText("鎺у埗璁惧");
+ isOn = !isOn;
+ List<DeviceControlRequest> requestList = new ArrayList<>();
+ DeviceControlRequest request = new DeviceControlRequest();
+ request.setSid(testLightSid);
+ List<DeviceControlRequest.StatusBean> statusBeanList = new ArrayList<>();
+ DeviceControlRequest.StatusBean bean = new DeviceControlRequest.StatusBean();
+ bean.setKey("on_off");
+ bean.setValue(isOn ? "on" : "off");
+ statusBeanList.add(bean);
+ request.setStatus(statusBeanList);
+ requestList.add(request);
+ HDLLink.getInstance().propertyDown(requestList, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String data) {
+ responseTv.setText(data);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鍦烘櫙鍒楄〃
+ */
+ void getSceneList() {
+ tv.setText("璇诲彇鍦烘櫙鍒楄〃");
+ HDLLink.getInstance().getSceneList(new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ responseTv.setText(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ //鍦烘櫙鍒楄〃
+ // {"id":"8a5eaa143ce943b987b577df5a66759b","time_stamp":"1637040217235","objects":[{"sid":"04010560D2C7170A0A0100000000","name":"鍥炲妯″紡","status":"off","group":"255","delay":"0","modify_time":"1634871490"},{"sid":"04010560D2C76E0A0A0100010000","name":"绂诲妯″紡","status":"off","group":"255","delay":"0","modify_time":"1634785823"}]}
+
+ /**
+ * 鎺у埗鍦烘櫙
+ * 鎵ц鎴愬姛鐨勮瘽 鍝嶅簲code涓�200
+ */
+ void controlScene() {
+ tv.setText("鍦烘櫙鎺у埗");
+ //鎺у埗鍦烘櫙sid鍒楄〃锛屾敮鎸佹壒閲忔帶鍒�
+ List<String> sids = new ArrayList<>();
+ isOn = !isOn;
+ if (isOn) {
+ sids.add("04010560D2C7170A0A0100000000");
+ } else {
+ sids.add("04010560D2C76E0A0A0100010000");
+ }
+ HDLLink.getInstance().controlScene(sids, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ responseTv.setText(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+
+ void startDevicesListActivity() {
+ Intent intent = new Intent(this, DevicesListActivity.class);
+ startActivity(intent);
+ }
+
+ /**
+ * TCP鍙戦�� 鍙彂涓�娆★紝涓嶇洃鍚洖澶嶏紝涓嶉噸鍙�
+ */
+ private void tcpSend() {
+ tv.setText("TCP鍙戦�� 鍙彂涓�娆★紝涓嶇洃鍚洖澶嶏紝涓嶉噸鍙�");
+ String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
+ String bodyStr = getPropertyDownBodyStr();
+ HDLLink.getInstance().tcpSendMsg(propertyDownTopic, bodyStr);
+ }
+
+ /**
+ * UDP鍙彂涓�娆★紝涓嶇洃鍚洖澶嶏紝涓嶉噸鍙�
+ */
+ private void udpSend() {
+ tv.setText("UDP鍙戦�� 鍙彂涓�娆★紝涓嶇洃鍚洖澶嶏紝涓嶉噸鍙�");
+ String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
+ String bodyStr = getPropertyDownBodyStr();
+ HDLLink.getInstance().udpSendMsg(propertyDownTopic, bodyStr);
+ }
+
+ private String getPropertyDownBodyStr() {
+ isOn = !isOn;
+ List<DeviceControlRequest> requestList = new ArrayList<>();
+ DeviceControlRequest request = new DeviceControlRequest();
+ request.setSid(testLightSid);
+ List<DeviceControlRequest.StatusBean> statusBeanList = new ArrayList<>();
+ DeviceControlRequest.StatusBean bean = new DeviceControlRequest.StatusBean();
+ bean.setKey("on_off");
+ bean.setValue(isOn ? "on" : "off");
+ statusBeanList.add(bean);
+ request.setStatus(statusBeanList);
+ requestList.add(request);
+ String time = String.valueOf(System.currentTimeMillis());
+
+ final BaseLocalResponse<List<DeviceControlRequest>> data = new BaseLocalResponse<>();
+ data.setId(IdUtils.getUUId());
+ data.setTime_stamp(time);
+ data.setObjects(requestList);
+
+ return GsonConvert.getGson().toJson(data);
+ }
+
+ /**
+ * UDP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�
+ */
+ private void udpSendWithCallback() {
+ tv.setText("UDP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�");
+ String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
+ String bodyStr = getPropertyDownBodyStr();
+ HDLLink.getInstance().udpSendMsg(propertyDownTopic, bodyStr, new HDLLinkResponseCallBack() {
+ @Override
+ public void onSuccess(LinkResponse msg) {
+ Log.i("udpSendWithCallback", "udpSendWithCallback");
+ responseTv.setText(GsonConvert.getGson().toJson(msg));
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+
+ /**
+ * TCP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�
+ */
+ private void tcpSendWithCallback() {
+ tv.setText("TCP鍙戦�侊紝鐩戝惉涓婚鍥炲锛屽甫閲嶅彂甯﹀洖璋�");
+ String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
+ String bodyStr = getPropertyDownBodyStr();
+ HDLLink.getInstance().tcpSendMsg(propertyDownTopic, bodyStr, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ Log.i("tcpSendWithCallback", "tcpSendWithCallback");
+ responseTv.setText(msg);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ responseTv.setText(e.getMsg());
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/DevicesListActivity.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/DevicesListActivity.java
new file mode 100644
index 0000000..f253b34
--- /dev/null
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/DevicesListActivity.java
@@ -0,0 +1,89 @@
+package com.hdl.hdlsdk.device;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.google.gson.reflect.TypeToken;
+import com.hdl.hdlsdk.DemoAdapter;
+import com.hdl.hdlsdk.R;
+import com.hdl.sdk.common.exception.HDLLinkException;
+import com.hdl.sdk.common.utils.LogUtils;
+import com.hdl.sdk.common.utils.gson.GsonConvert;
+import com.hdl.sdk.connect.HDLLink;
+import com.hdl.sdk.connect.bean.LinkResponse;
+import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
+import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
+import com.hdl.sdk.connect.callback.HDLLinkCallBack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DevicesListActivity extends AppCompatActivity {
+
+ private static final String TAG = "DevicesListActivity";
+ private List<FunctionBean> devicesList = new ArrayList<>();
+ private DevicesListAdapter mDevicesListAdapter;
+ private RecyclerView mRecyclerView;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_devices_list);
+
+ initView();
+ initData();
+ }
+
+ @SuppressLint("WrongConstant")
+ private void initView() {
+ mRecyclerView = findViewById(R.id.device_list_rv);
+ mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+ mDevicesListAdapter = new DevicesListAdapter(this, devicesList);
+ mRecyclerView.setAdapter(mDevicesListAdapter);
+ }
+
+ private void initData() {
+ getFunctionList();
+ }
+
+ /**
+ * 鑾峰彇鍔熻兘鍒楄〃
+ */
+ void getFunctionList(){
+
+ HDLLink.getInstance().getFunctionList(new HDLLinkCallBack() {
+ @Override
+ public void onError(HDLLinkException error) {
+ Log.e(TAG,error.getMsg());
+ }
+
+ @Override
+ public void onSuccess(String data) {
+ Log.i(TAG, "鑾峰彇璁惧鍒楄〃鎴愬姛");
+ handelFunList(data);
+ }
+ });
+ }
+
+ void handelFunList(String data){
+ try {
+ final LinkResponse linkResponse = GsonConvert.getGson().fromJson(data, new TypeToken<LinkResponse>() {
+ }.getType());
+
+ final BaseLocalResponse<List<FunctionBean>> bean = GsonConvert.getGson().fromJson(linkResponse.getData(), new TypeToken<BaseLocalResponse<List<FunctionBean>>>() {
+ }.getType());
+ devicesList.clear();
+ devicesList.addAll(bean.getObjects());
+ mDevicesListAdapter.notifyDataSetChanged();
+ }catch (Exception e){
+ Log.e(TAG, "handelFunList: " + e.getMessage());
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/DevicesListAdapter.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/DevicesListAdapter.java
new file mode 100644
index 0000000..6128305
--- /dev/null
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/DevicesListAdapter.java
@@ -0,0 +1,118 @@
+package com.hdl.hdlsdk.device;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.hdl.hdlsdk.DemoBean;
+import com.hdl.hdlsdk.R;
+import com.hdl.sdk.common.config.TopicConstant;
+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.gson.GsonConvert;
+import com.hdl.sdk.connect.HDLLink;
+import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
+import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
+import com.hdl.sdk.connect.callback.HDLLinkCallBack;
+import com.hdl.sdk.connect.config.HDLLinkConfig;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DevicesListAdapter extends RecyclerView.Adapter<DevicesListAdapter.ViewHolder> {
+
+ private LayoutInflater mInflater;
+ private List<FunctionBean> mList = null;
+
+ public DevicesListAdapter(Context context, List<FunctionBean> devicesList) {
+ this.mInflater = LayoutInflater.from(context);
+ this.mList = devicesList;
+ }
+
+ /**
+ * item鏄剧ず绫诲瀷
+ *
+ * @param parent
+ * @param viewType
+ * @return
+ */
+ @Override
+ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view = mInflater.inflate(R.layout.item_devices_list, parent, false);
+ ViewHolder viewHolder = new ViewHolder(view);
+ return viewHolder;
+ }
+
+ /**
+ * 鏁版嵁鐨勭粦瀹氭樉绀�
+ *
+ * @param holder
+ * @param position
+ */
+ @Override
+ public void onBindViewHolder(ViewHolder holder, int position) {
+ holder.item_tv.setText(mList.get(position).getName());
+ holder.device_on_off_switch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
+ propertyDown(mList.get(position), isChecked);
+ }
+ });
+ }
+
+ @Override
+ public int getItemCount() {
+ return mList.size();
+ }
+
+ //鑷畾涔夌殑ViewHolder锛屾寔鏈夋瘡涓狪tem鐨勭殑鎵�鏈夌晫闈㈠厓绱�
+ public static class ViewHolder extends RecyclerView.ViewHolder {
+ public TextView item_tv;
+ public Switch device_on_off_switch;
+
+ public ViewHolder(View view) {
+ super(view);
+ item_tv = (TextView) view.findViewById(R.id.device_title_tv);
+ device_on_off_switch = view.findViewById(R.id.device_on_off_switch);
+ }
+ }
+
+ private void propertyDown(FunctionBean functionBean, Boolean isOn){
+ List<DeviceControlRequest> requestList = new ArrayList<>();
+ DeviceControlRequest request = new DeviceControlRequest();
+ request.setSid(functionBean.getSid());
+ List<DeviceControlRequest.StatusBean> statusBeanList= new ArrayList<>();
+ DeviceControlRequest.StatusBean bean = new DeviceControlRequest.StatusBean();
+ bean.setKey("on_off");
+ bean.setValue(isOn ? "on" : "off");
+ statusBeanList.add(bean);
+ request.setStatus(statusBeanList);
+ requestList.add(request);
+ String time = String.valueOf(System.currentTimeMillis());
+
+ HDLLink.getInstance().propertyDown(requestList, new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String data) {
+ Log.i("propertyDown",data);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ Log.e("propertyDown", "ERROR :"+ e.getMsg());
+ }
+ });
+
+ }
+}
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/FunctionBean.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/FunctionBean.java
new file mode 100644
index 0000000..232b657
--- /dev/null
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/device/FunctionBean.java
@@ -0,0 +1,106 @@
+package com.hdl.hdlsdk.device;
+
+import com.chad.library.adapter.base.entity.MultiItemEntity;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by jlchen on 12/7/21.
+ */
+public class FunctionBean implements Serializable {
+ private String sid;
+ private String oid;
+ private String name;
+ private String spk;
+ private String omodel;
+ private String src;
+ private String online;
+ private List<FunctionStatus> status;
+
+ public String getSid() {
+ return sid;
+ }
+
+ public void setSid(String sid) {
+ this.sid = sid;
+ }
+
+ public String getOid() {
+ return oid;
+ }
+
+ public void setOid(String oid) {
+ this.oid = oid;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSpk() {
+ return spk;
+ }
+
+ public void setSpk(String spk) {
+ this.spk = spk;
+ }
+
+ public String getOmodel() {
+ return omodel;
+ }
+
+ public void setOmodel(String omodel) {
+ this.omodel = omodel;
+ }
+
+ public String getSrc() {
+ return src;
+ }
+
+ public void setSrc(String src) {
+ this.src = src;
+ }
+
+ public String getOnline() {
+ return online;
+ }
+
+ public void setOnline(String online) {
+ this.online = online;
+ }
+
+ public List<FunctionStatus> getStatus() {
+ return status;
+ }
+
+ public void setStatus(List<FunctionStatus> status) {
+ this.status = status;
+ }
+
+ public class FunctionStatus implements Serializable {
+ private String key;
+ private String value;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+ }
+
+}
diff --git a/HDLSDK/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/HDLSDK/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..2b068d1
--- /dev/null
+++ b/HDLSDK/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:endX="85.84757"
+ android:endY="92.4963"
+ android:startX="42.9492"
+ android:startY="49.59793"
+ android:type="linear">
+ <item
+ android:color="#44000000"
+ android:offset="0.0" />
+ <item
+ android:color="#00000000"
+ android:offset="1.0" />
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:fillColor="#FFFFFF"
+ android:fillType="nonZero"
+ android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+ android:strokeWidth="1"
+ android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/res/drawable/ic_launcher_background.xml b/HDLSDK/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..07d5da9
--- /dev/null
+++ b/HDLSDK/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <path
+ android:fillColor="#3DDC84"
+ android:pathData="M0,0h108v108h-108z" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M9,0L9,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,0L19,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M29,0L29,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M39,0L39,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M49,0L49,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M59,0L59,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M69,0L69,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M79,0L79,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M89,0L89,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M99,0L99,108"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,9L108,9"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,19L108,19"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,29L108,29"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,39L108,39"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,49L108,49"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,59L108,59"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,69L108,69"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,79L108,79"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,89L108,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M0,99L108,99"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,29L89,29"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,39L89,39"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,49L89,49"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,59L89,59"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,69L89,69"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M19,79L89,79"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M29,19L29,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M39,19L39,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M49,19L49,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M59,19L59,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M69,19L69,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M79,19L79,89"
+ android:strokeWidth="0.8"
+ android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/HDLSDK/app/src/main/res/layout/activity_devices_list.xml b/HDLSDK/app/src/main/res/layout/activity_devices_list.xml
new file mode 100644
index 0000000..b7e3865
--- /dev/null
+++ b/HDLSDK/app/src/main/res/layout/activity_devices_list.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".device.DevicesListActivity">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/device_list_rv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/res/layout/activity_main.xml b/HDLSDK/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..6fa6c2b
--- /dev/null
+++ b/HDLSDK/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".MainActivity">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/scrollView"
+ app:layout_constraintHorizontal_weight="1"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <View
+ android:layout_width="1dp"
+ android:layout_height="0dp"
+ android:background="#f4f4f4"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/scrollView"
+ app:layout_constraintStart_toEndOf="@id/rv"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <androidx.core.widget.NestedScrollView
+ android:id="@+id/scrollView"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_weight="2"
+ app:layout_constraintStart_toEndOf="@id/rv"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="10dp"
+ android:text="褰撳墠鐘舵�侊細" />
+
+ <TextView
+ android:id="@+id/state_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="鏈搷浣�" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="2dp"
+ android:background="#f5f5f5" />
+
+ <TextView
+ android:paddingStart="10dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:text="鍝嶅簲锛�" />
+
+ <TextView
+ android:id="@+id/response_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp" />
+
+
+ </LinearLayout>
+ </androidx.core.widget.NestedScrollView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/res/layout/demo_item.xml b/HDLSDK/app/src/main/res/layout/demo_item.xml
new file mode 100644
index 0000000..3788542
--- /dev/null
+++ b/HDLSDK/app/src/main/res/layout/demo_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="40dp">
+
+ <TextView
+ android:id="@+id/tv_title"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:gravity="center"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <View
+ android:layout_width="0dp"
+ android:layout_height="1dp"
+ android:layout_marginStart="10dp"
+ android:layout_marginEnd="10dp"
+ android:background="#f5f5f5"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/res/layout/item_devices_list.xml b/HDLSDK/app/src/main/res/layout/item_devices_list.xml
new file mode 100644
index 0000000..07b7cf4
--- /dev/null
+++ b/HDLSDK/app/src/main/res/layout/item_devices_list.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/device_title_tv"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="@dimen/dp_10"
+ android:gravity="center|left"
+ android:text="璁惧"
+ android:textColor="@color/black"
+ android:layout_weight="1"/>
+
+ <Switch
+ android:id="@+id/device_on_off_switch"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="@dimen/dp_10"
+ />
+ </LinearLayout>
+
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginStart="10dp"
+ android:layout_marginEnd="10dp"
+ android:background="#f5f5f5"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/HDLSDK/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_launcher_background" />
+ <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/HDLSDK/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..eca70cf
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_launcher_background" />
+ <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/HDLSDK/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000..c209e78
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary files differ
diff --git a/HDLSDK/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/HDLSDK/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..b2dfe3d
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
Binary files differ
diff --git a/HDLSDK/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/HDLSDK/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000..4f0f1d6
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary files differ
diff --git a/HDLSDK/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/HDLSDK/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..62b611d
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
Binary files differ
diff --git a/HDLSDK/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/HDLSDK/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 0000000..948a307
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Binary files differ
diff --git a/HDLSDK/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/HDLSDK/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..1b9a695
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
Binary files differ
diff --git a/HDLSDK/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/HDLSDK/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 0000000..28d4b77
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Binary files differ
diff --git a/HDLSDK/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/HDLSDK/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..9287f50
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
Binary files differ
diff --git a/HDLSDK/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/HDLSDK/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 0000000..aa7d642
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Binary files differ
diff --git a/HDLSDK/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/HDLSDK/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..9126ae3
--- /dev/null
+++ b/HDLSDK/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
Binary files differ
diff --git a/HDLSDK/app/src/main/res/values-night/themes.xml b/HDLSDK/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..ab52aa6
--- /dev/null
+++ b/HDLSDK/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+ <!-- Base application theme. -->
+ <style name="Theme.HDLSDK" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+ <!-- Primary brand color. -->
+ <item name="colorPrimary">@color/purple_200</item>
+ <item name="colorPrimaryVariant">@color/purple_700</item>
+ <item name="colorOnPrimary">@color/black</item>
+ <!-- Secondary brand color. -->
+ <item name="colorSecondary">@color/teal_200</item>
+ <item name="colorSecondaryVariant">@color/teal_200</item>
+ <item name="colorOnSecondary">@color/black</item>
+ <!-- Status bar color. -->
+ <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+ <!-- Customize your theme here. -->
+ </style>
+</resources>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/res/values/colors.xml b/HDLSDK/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..f8c6127
--- /dev/null
+++ b/HDLSDK/app/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="purple_200">#FFBB86FC</color>
+ <color name="purple_500">#FF6200EE</color>
+ <color name="purple_700">#FF3700B3</color>
+ <color name="teal_200">#FF03DAC5</color>
+ <color name="teal_700">#FF018786</color>
+ <color name="black">#FF000000</color>
+ <color name="white">#FFFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/res/values/strings.xml b/HDLSDK/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..192b55f
--- /dev/null
+++ b/HDLSDK/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+ <string name="app_name">HDLSDK</string>
+</resources>
\ No newline at end of file
diff --git a/HDLSDK/app/src/main/res/values/themes.xml b/HDLSDK/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..dcf7fa1
--- /dev/null
+++ b/HDLSDK/app/src/main/res/values/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+ <!-- Base application theme. -->
+ <style name="Theme.HDLSDK" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+ <!-- Primary brand color. -->
+ <item name="colorPrimary">@color/purple_500</item>
+ <item name="colorPrimaryVariant">@color/purple_700</item>
+ <item name="colorOnPrimary">@color/white</item>
+ <!-- Secondary brand color. -->
+ <item name="colorSecondary">@color/teal_200</item>
+ <item name="colorSecondaryVariant">@color/teal_700</item>
+ <item name="colorOnSecondary">@color/black</item>
+ <!-- Status bar color. -->
+ <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+ <!-- Customize your theme here. -->
+ </style>
+</resources>
\ No newline at end of file
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
index 033c552..2463e98 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
@@ -115,6 +115,8 @@
if (udpSocketBoot == null) {
udpSocketBoot = UdpClient.init(UDP_PORT, getUdpOptions());
udpSocketBoot.bind();
+
+ LogUtils.i("鍒濆鍖朣ocket udp");
}
} catch (Exception e) {
LogUtils.e("鍒濆鍖朣ocket udp寮傚父"+e.getMessage());
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
index 9eb486c..23f1583 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
@@ -629,7 +629,7 @@
threadPool.scheduleWithFixedDelay(new Runnable() {
@Override
public void run() {
- if (sendCount.get() < 3) {
+ if (sendCount.get() < 0) {
sendCount.set(sendCount.get() + 1);
getTcp().sendMsg(data);
} else {
diff --git a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
index cf36c7d..3f45e3a 100644
--- a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
+++ b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
@@ -88,11 +88,19 @@
public void run() {
while (true) {
try {
+ if (!connected) {
+ Thread.sleep(200);
+ continue;
+ }
SocketRequest socketRequest = mMessageQueue.take();
// final String sendStr = new String(socketRequest.getData(), 0, socketRequest.getData().length);
// LogUtils.i("鍙戦�佹暟鎹細" + sendStr);
+ if (System.currentTimeMillis() - socketRequest.getTime() > 5000) {
+ continue;
+ }
final String action = socketRequest.getAction();
try {
+
client.sendMsg(socketRequest.getData());
if (!TextUtils.isEmpty(action)) {
SendListener sendListener = sendMap.get(action);
diff --git a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketRequest.java b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketRequest.java
index 924719e..956f8c9 100644
--- a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketRequest.java
+++ b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketRequest.java
@@ -11,8 +11,11 @@
private byte[] data;
+ private long time = System.currentTimeMillis();
+
public SocketRequest(byte[] data) {
this.data = data;
+
action = UUID.randomUUID().toString();
}
@@ -31,4 +34,8 @@
public void setData(byte[] data) {
this.data = data;
}
+
+ public long getTime() {
+ return time;
+ }
}
diff --git a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
index 07d368d..8a78384 100644
--- a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
+++ b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
@@ -87,7 +87,7 @@
* @return
*/
public static UdpSocketBoot init(int port, UdpSocketOptions options) {
- return init(null, port, options);
+ return init("0.0.0.0", port, options);
}
@@ -100,9 +100,11 @@
}
if (TextUtils.isEmpty(ipAddress)) {
mSocket = SocketPool.getInstance().getUdpSocket(new InetSocketAddress(port));
+ }else {
+ mSocket = SocketPool.getInstance().getUdpSocket(new InetSocketAddress(ipAddress,port));
}
mSocket.setBroadcast(true);
- mSocket.setReuseAddress(true);
+// mSocket.setReuseAddress(true);
} catch (Exception e) {
LogUtils.e("鍒濆鍖朣ocket 澶辫触锛�" + e.getMessage());
diff --git a/HDLSDK_DEMO/.idea/compiler.xml b/HDLSDK_DEMO/.idea/compiler.xml
index 7d7ec2e..245a82c 100644
--- a/HDLSDK_DEMO/.idea/compiler.xml
+++ b/HDLSDK_DEMO/.idea/compiler.xml
@@ -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>
\ No newline at end of file
diff --git a/HDLSDK_DEMO/.idea/gradle.xml b/HDLSDK_DEMO/.idea/gradle.xml
index 7e69409..3123843 100644
--- a/HDLSDK_DEMO/.idea/gradle.xml
+++ b/HDLSDK_DEMO/.idea/gradle.xml
@@ -4,7 +4,7 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <option name="testRunner" value="PLATFORM" />
+ <option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
@@ -17,7 +17,6 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
- <option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>
diff --git a/HDLSDK_DEMO/app/build.gradle b/HDLSDK_DEMO/app/build.gradle
index 90a84f6..29c810f 100644
--- a/HDLSDK_DEMO/app/build.gradle
+++ b/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.0.16.aar')
+ implementation files('libs\\com.hdl.sdk-v1.0.17.aar')
}
\ No newline at end of file
diff --git a/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.16.aar b/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.16.aar
deleted file mode 100644
index edc95ce..0000000
--- a/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.16.aar
+++ /dev/null
Binary files differ
diff --git a/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.17.aar b/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.17.aar
new file mode 100644
index 0000000..c6367f9
--- /dev/null
+++ b/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.17.aar
Binary files differ
--
Gitblit v1.8.0