From a3f9e5ce8dce3d86a60a79b85ce44424a612c6fa Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期五, 13 五月 2022 14:06:45 +0800
Subject: [PATCH] 提交jar版本
---
HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 244 ++++++++++++++++++++++++++----------------------
1 files changed, 132 insertions(+), 112 deletions(-)
diff --git a/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
index ab7d315..862e9fe 100644
--- a/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -4,12 +4,13 @@
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;
@@ -19,32 +20,22 @@
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.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.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.io.UnsupportedEncodingException;
import java.security.MessageDigest;
@@ -52,8 +43,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
-import static com.hdl.sdk.common.config.TopicConstant.GATEWAY_SEARCH_REPLY;
public class MainActivity extends AppCompatActivity {
@@ -64,7 +53,7 @@
private TextView responseTv;
boolean isOn;
private EventListener allTopicsListener;
- private String testLightSid = "0001010D48C71B02020100010101";
+ private String testLightSid = "1493092497588469761";
@Override
protected void onDestroy() {
@@ -72,86 +61,26 @@
removeAllTopicsListener();
}
- void initDeviceInfo()
- {
- AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
- infoBean.setDeviceMAC("AA000000000000AF");
- infoBean.setIPMAC("AA000000000000AF");
- infoBean.setDeviceName("闊充箰鎾斁鍣�");//璁惧鍚嶅瓧
- infoBean.setDeviceModel("MCLog.431");//璁惧鍨嬪彿
- infoBean.setAccessMode("WIFI");
- infoBean.setIPGateway("192.168.1.1");
- infoBean.setIPAddress("192.168.1.102");
- infoBean.setGateway_type("music.standard");
- infoBean.setHw_version("HW2.0");
- infoBean.setFw_version("Fw1.0");
- infoBean.setOID("010105000000FE10");//姣忎釜璁惧oid閮借涓嶄竴鏍�
- infoBean.setSid("110105000000FE08110100000000");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
- HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
+ void init() {
+ HDLLinkConfig.getInstance().setLocalSecret("e186beeb7974998e");
+ HDLLinkConfig.getInstance().setGatewayId("1519863101509361666");
+// HDLLinkConfig.getInstance().setLocalEncrypt(true);
}
- /**
- * 鍏ョ綉璁よ瘉
- */
- 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 = "AA000000000000AC";//璁惧鍞竴MAC鍦板潃
- String secret = "ee62124c151b737c";//閫氳繃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());
- }
- });
- }
-
-
+ @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();//鍒濆鍖�
+ initDeviceInfo();//鍒濆鍖栧熀鏈俊鎭紝闈炲父閲嶈锛岃璇佹椂瑕佺敤
registerAllTopicsListener();
ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
@@ -225,7 +154,7 @@
break;
case 8:
//鍔熻兘鍒楄〃
- startDevicesListActivity();
+// startDevicesListActivity();
break;
case 9:
//UDP鍙戦��
@@ -271,6 +200,7 @@
@Override
public void onMessage(Object msg) {
LinkResponse response = (LinkResponse) msg;
+ handleLinkResponse(response);
}
};
HDLLink.getInstance().registerAllTopicsListener(allTopicsListener);
@@ -319,7 +249,82 @@
HDLLink.getInstance().removeAllTopicsListener(allTopicsListener);
}
+ void initDeviceInfo() {
+ AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
+// infoBean.setDeviceMAC("AA00000000000100");
+// infoBean.setIPMAC("AA00000000000100");
+ infoBean.setDeviceMAC("BB000000000000BF");
+ infoBean.setIPMAC("BB000000000000BF");
+ infoBean.setDeviceName("闊充箰鎾斁鍣�");//璁惧鍚嶅瓧
+ infoBean.setDeviceModel("MCLog.431");//璁惧鍨嬪彿
+ infoBean.setAccessMode("WIFI");
+// infoBean.setIPGateway("192.168.1.1");
+// infoBean.setIPAddress("192.168.1.116");
+
+ infoBean.setIPGateway("192.168.3.1");
+ infoBean.setIPAddress("192.168.3.126");
+ infoBean.setGateway_type("music.standard");
+ infoBean.setHw_version("HW2.0");
+ infoBean.setFw_version("Fw1.0");
+// infoBean.setOID("010105000000FE11");//姣忎釜璁惧oid閮借涓嶄竴鏍�
+// infoBean.setSid("110105000000FE08110100000011");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
+
+ infoBean.setOID("010105010101FE07");//姣忎釜璁惧oid閮借涓嶄竴鏍�
+ infoBean.setSid("010105010101FE02020100040101");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
+ HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
+ }
+
+ /**
+ * 鍏ョ綉璁よ瘉
+ */
+ void sendAuthenticateRequest() {
+ tv.setText("寮�濮嬪叆缃戣璇�...");
+ //璁よ瘉鎻愪氦鍙傛暟鍑嗗
+
+// 娴嬭瘯鏈嶅姟
+ String spkStr = "ir.module";//浜у搧spk
+ String macStr = "BB000000000000BF";//璁惧鍞竴MAC鍦板潃
+ String secret = "d70f8872ddd6fe6a";//閫氳繃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: 璁よ瘉澶辫触" + e.getMsg());
+ }
+
+ @Override
+ public void onSuccess(String msg) {
+// tv.setText("璁よ瘉鎴愬姛");
+// responseTv.setText(msg.toString());
+ Log.i("TAG", "onSuccess: 璁よ瘉鎴愬姛" + msg.toString());
+ }
+ });
+ }
String stringToMD5(String text) {
byte[] hash;
@@ -352,15 +357,16 @@
HDLLink.getInstance().searchGatewayBroadcast(new HDLAuthSocket.SearchGatewayCallBack() {
@Override
public void onError(HDLLinkException e) {
- tv.setText("缃戝叧涓嶅湪绾�");
- responseTv.setText(e.getMsg());
+// tv.setText("缃戝叧涓嶅湪绾�");
+// responseTv.setText(e.getMsg());
+ Log.i("TAG", "缃戝叧涓嶅湪绾�" + e.getMsg());
}
@Override
public void onSuccess(GatewaySearchBean gatewaySearchBean) {
- tv.setText("缃戝叧鍦ㄧ嚎");
- responseTv.setText("鎼滅储鎴愬姛 缃戝叧id锛�" + gatewaySearchBean.getGatewayId());
-// LogUtils.i("TAG", "onSuccess: 鎼滅储鎴愬姛锛�"+gatewaySearchBean.getGatewayId());
+// tv.setText("缃戝叧鍦ㄧ嚎");
+// responseTv.setText("鎼滅储鎴愬姛 缃戝叧id锛�" + gatewaySearchBean.getGatewayId());
+ Log.i("TAG", "onSuccess: 鎼滅储鎴愬姛锛�"+gatewaySearchBean.getGatewayId());
}
});
}
@@ -374,13 +380,15 @@
HDLLink.getInstance().getFunctionList(new HDLLinkCallBack() {
@Override
public void onError(HDLLinkException error) {
- tv.setText(error.getMsg());
+// tv.setText(error.getMsg());
+ Log.i("TAG", "onError 鑾峰彇鍔熻兘鍒楄〃澶辫触" + error.getMsg());
}
@Override
public void onSuccess(String data) {
- tv.setText("鑾峰彇鍔熻兘鍒楄〃鎴愬姛");
- responseTv.setText(data);
+// tv.setText("鑾峰彇鍔熻兘鍒楄〃鎴愬姛");
+// responseTv.setText(data);
+ Log.i("TAG", "onSuccess 鑾峰彇鍔熻兘鍒楄〃鎴愬姛" + data.toString());
}
});
}
@@ -396,12 +404,14 @@
HDLLink.getInstance().getFunctionAttribute(sids, new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
- responseTv.setText(msg);
+// responseTv.setText(msg);
+ Log.i("TAG", "onSuccess 鍔熻兘灞炴�ц鍙栨垚鍔�" + msg.toString());
}
@Override
public void onError(HDLLinkException e) {
- responseTv.setText(e.getMsg());
+// responseTv.setText(e.getMsg());
+ Log.i("TAG", "onError 鑾峰彇鍔熻兘鍒楄〃澶辫触" + e.getMsg());
}
});
}
@@ -417,20 +427,22 @@
HDLLink.getInstance().propertyRead(list, new HDLLinkCallBack() {
@Override
public void onSuccess(String data) {
- tv.setText("璇诲彇鎴愬姛");
- responseTv.setText(data);
+// tv.setText("璇诲彇鎴愬姛");
+// responseTv.setText(data);
+ Log.i("TAG", "onSuccess 璇诲彇璁惧鐘舵�佹垚鍔�" + data.toString());
}
@Override
public void onError(HDLLinkException e) {
- tv.setText("璇诲彇澶辫触");
- responseTv.setText(e.getMsg());
+// tv.setText("璇诲彇澶辫触");
+// responseTv.setText(e.getMsg());
+ Log.i("TAG", "onError 璇诲彇璁惧鐘舵�佸け璐�" + e.getMsg());
}
});
}
/**
- * 鎺у埗澶辫触
+ * 鎺у埗璁惧
* 鍥炲鍝嶅簲code涓�200 浠ｈ〃鎵ц鎴愬姛
*/
void controlDecide() {
@@ -449,12 +461,14 @@
HDLLink.getInstance().propertyDown(requestList, new HDLLinkCallBack() {
@Override
public void onSuccess(String data) {
- responseTv.setText(data);
+// responseTv.setText(data);
+ Log.i("TAG", "onSuccess 鎺у埗璁惧鎴愬姛" + data.toString());
}
@Override
public void onError(HDLLinkException e) {
- responseTv.setText(e.getMsg());
+// responseTv.setText(e.getMsg());
+ Log.i("TAG", "onError 鎺у埗璁惧澶辫触" + e.getMsg());
}
});
}
@@ -467,12 +481,14 @@
HDLLink.getInstance().getSceneList(new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
- responseTv.setText(msg);
+// responseTv.setText(msg);
+ Log.i("TAG", "onSuccess 鑾峰彇鍦烘櫙鍒楄〃鎴愬姛" + msg.toString());
}
@Override
public void onError(HDLLinkException e) {
- responseTv.setText(e.getMsg());
+// responseTv.setText(e.getMsg());
+ Log.i("TAG", "onError 鑾峰彇鍦烘櫙鍒楄〃澶辫触" + e.getMsg());
}
});
}
@@ -497,21 +513,23 @@
HDLLink.getInstance().controlScene(sids, new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
- responseTv.setText(msg);
+// responseTv.setText(msg);
+ Log.i("TAG", "onSuccess 鍦烘櫙鎺у埗鎴愬姛" + msg.toString());
}
@Override
public void onError(HDLLinkException e) {
- responseTv.setText(e.getMsg());
+// responseTv.setText(e.getMsg());
+ Log.i("TAG", "onError 鍦烘櫙鎺у埗澶辫触" + e.getMsg());
}
});
}
- void startDevicesListActivity() {
+/* void startDevicesListActivity() {
Intent intent = new Intent(this, DevicesListActivity.class);
startActivity(intent);
- }
+ }*/
/**
* TCP鍙戦�� 鍙彂涓�娆★紝涓嶇洃鍚洖澶嶏紝涓嶉噸鍙�
@@ -565,13 +583,14 @@
HDLLink.getInstance().udpSendMsg(propertyDownTopic, bodyStr, new HDLLinkResponseCallBack() {
@Override
public void onSuccess(LinkResponse msg) {
- Log.i("udpSendWithCallback", "udpSendWithCallback");
- responseTv.setText(GsonConvert.getGson().toJson(msg));
+ Log.i("TAG", "onSuccess UDP鍙戦�佹垚鍔�" + GsonConvert.getGson().toJson(msg));
+// responseTv.setText(GsonConvert.getGson().toJson(msg));
}
@Override
public void onError(HDLLinkException e) {
- responseTv.setText(e.getMsg());
+// responseTv.setText(e.getMsg());
+ Log.i("TAG", "onError UDP鍙戦�佸け璐�" + e.getMsg());
}
});
}
@@ -586,13 +605,14 @@
HDLLink.getInstance().tcpSendMsg(propertyDownTopic, bodyStr, new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
- Log.i("tcpSendWithCallback", "tcpSendWithCallback");
- responseTv.setText(msg);
+ Log.i("TAG", "onSuccess TCP鍙戦�佹垚鍔�" + msg);
+// responseTv.setText(msg);
}
@Override
public void onError(HDLLinkException e) {
- responseTv.setText(e.getMsg());
+// responseTv.setText(e.getMsg());
+ Log.i("TAG", "onError TCP鍙戦�佸け璐�");
}
});
}
--
Gitblit v1.8.0