From a3f9e5ce8dce3d86a60a79b85ce44424a612c6fa Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期五, 13 五月 2022 14:06:45 +0800
Subject: [PATCH] 提交jar版本
---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 140 ++++++++++++++++++++++++----------------------
1 files changed, 72 insertions(+), 68 deletions(-)
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
index be2a3d5..f4a4071 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -10,7 +10,6 @@
import androidx.recyclerview.widget.RecyclerView;
import android.Manifest;
-import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
@@ -21,45 +20,30 @@
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.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 com.hdl.sdk.socket.SocketBoot;
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 {
@@ -70,29 +54,31 @@
private TextView responseTv;
boolean isOn;
private EventListener allTopicsListener;
- private String testLightSid = "0001010D48C71B02020100010101";
+ private String testLightSid = "1493092497588469761";
@Override
protected void onDestroy() {
super.onDestroy();
removeAllTopicsListener();
}
-void init() {
-// HDLLinkConfig.getInstance().setLocalSecret("7d04c4e3c2b7d600");
-// HDLLinkConfig.getInstance().setGatewayId("1473119283609321473");
-// HDLLinkConfig.getInstance().setLocalEncrypt(true);
-}
+
+ void init() {
+ HDLLinkConfig.getInstance().setLocalSecret("e186beeb7974998e");
+ HDLLinkConfig.getInstance().setGatewayId("1519863101509361666");
+ }
+
@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();
+// init();
checkIfCertified();
initDeviceInfo();//鍒濆鍖栧熀鏈俊鎭紝闈炲父閲嶈锛岃璇佹椂瑕佺敤
registerAllTopicsListener();
@@ -168,7 +154,7 @@
break;
case 8:
//鍔熻兘鍒楄〃
- startDevicesListActivity();
+// startDevicesListActivity();
break;
case 9:
//UDP鍙戦��
@@ -204,6 +190,7 @@
String mes = isCertified ? "宸茬粡璁よ瘉杩�" : "鏈璇�";
showToast(mes);
tv.setText(mes);
+
}
/**
@@ -263,22 +250,23 @@
HDLLink.getInstance().removeAllTopicsListener(allTopicsListener);
}
- void initDeviceInfo()
- {
+ void initDeviceInfo() {
AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
- infoBean.setDeviceMAC("AA000000000000AF");
- infoBean.setIPMAC("AA000000000000AF");
+ 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.102");
+ infoBean.setIPAddress("192.168.1.116");
infoBean.setGateway_type("music.standard");
infoBean.setHw_version("HW2.0");
infoBean.setFw_version("Fw1.0");
- infoBean.setOID("010105000000FE10");//姣忎釜璁惧oid閮借涓嶄竴鏍�
- infoBean.setSid("110105000000FE08110100000000");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
+ infoBean.setOID("010105000000FE11");//姣忎釜璁惧oid閮借涓嶄竴鏍�
+ infoBean.setSid("110105000000FE08110100000011");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
+
+
}
/**
@@ -295,8 +283,8 @@
// 姝ｅ紡鏈嶅姟鍣�
String spkStr = "screen.mirror";//浜у搧spk
- String macStr = "AA000000000000AC";//璁惧鍞竴MAC鍦板潃
- String secret = "ee62124c151b737c";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+ String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
+ String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
String mac_key = stringToMD5(stringToMD5(macStr + secret));
String versionString = "HDL_V1.0.1";//
@@ -318,15 +306,16 @@
HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() {
@Override
public void onError(HDLLinkException e) {
- tv.setText("璁よ瘉澶辫触");
- responseTv.setText(e.getMsg());
- Log.i("TAG", "onError: 璁よ瘉澶辫触");
+// tv.setText("璁よ瘉澶辫触");
+// responseTv.setText(e.getMsg());
+ Log.i("TAG", "onError: 璁よ瘉澶辫触" + e.getMsg());
}
@Override
public void onSuccess(String msg) {
- tv.setText("璁よ瘉鎴愬姛");
- responseTv.setText(msg.toString());
+// tv.setText("璁よ瘉鎴愬姛");
+// responseTv.setText(msg.toString());
+ Log.i("TAG", "onSuccess: 璁よ瘉鎴愬姛" + msg.toString());
}
});
}
@@ -362,15 +351,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());
}
});
}
@@ -384,13 +374,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());
}
});
}
@@ -406,12 +398,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());
}
});
}
@@ -427,20 +421,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() {
@@ -459,12 +455,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());
}
});
}
@@ -477,12 +475,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());
}
});
}
@@ -507,21 +507,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鍙戦�� 鍙彂涓�娆★紝涓嶇洃鍚洖澶嶏紝涓嶉噸鍙�
@@ -575,13 +577,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());
}
});
}
@@ -596,13 +599,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