From c35181696815dcd3014892cd7ddfed62016431f0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 16 十一月 2021 15:19:27 +0800
Subject: [PATCH] 2021-11-16 更新
---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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 2a652c1..4927419 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -181,12 +181,13 @@
*/
void sendAuthenticateRequest(){
tv.setText("寮�濮嬪叆缃戣璇�...");
+ //璁よ瘉鎻愪氦鍙傛暟鍑嗗
- String macStr = "AA000000000000BB";
- String secret = "87ae414b7a853f65";
+ String spkStr = "ir.module";//浜у搧spk
+ String macStr = "AA000000000000BB";//璁惧鍞竴MAC鍦板潃
+ String secret = "87ae414b7a853f65";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
String mac_key = stringToMD5(stringToMD5(macStr + secret));
-
- String versionString = "HDL_V1.0.1";
+ String versionString = "HDL_V1.0.1";//
String time = String.valueOf(System.currentTimeMillis());
//1.璁剧疆璁よ瘉淇℃伅
@@ -196,7 +197,7 @@
requestBean.setFirmwareVersion(versionString);
requestBean.setHardwareModel("1956F");
AuthenticateRequest.AuthBean authbean = new AuthenticateRequest.AuthBean();
- authbean.setSpk("ir.module");
+ authbean.setSpk(spkStr);
authbean.setMACKey(mac_key);
authbean.setRequest(requestBean);
@@ -204,11 +205,11 @@
AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
infoBean.setDeviceMAC(macStr);
infoBean.setIPMAC(macStr);
- infoBean.setDeviceName("HDL闈㈡澘");
- infoBean.setDeviceModel("HDL");
+ infoBean.setDeviceName("HDL璁惧");//璁惧鍚嶅瓧
+ infoBean.setDeviceModel("HDL");//
infoBean.setAccessMode("WIFI");
+ infoBean.setIPGateway("192.168.10.1");
infoBean.setIPAddress(IpUtils.getIP(this));
-
infoBean.setOID("010105000000FE08");
infoBean.setSid("010105000000FE08110100000000");
@@ -216,16 +217,12 @@
AuthenticateRequest.VersionBean[] versionBeans = new AuthenticateRequest.VersionBean[]{new AuthenticateRequest.VersionBean("FW", versionString), new AuthenticateRequest.VersionBean("HW", "1956F")};
infoBean.setVersions(versionBeans);
AuthenticateRequest request = new AuthenticateRequest(IdUtils.getUUId(), time, infoBean, authbean);
-
- String ip = IpUtils.getBroadcastAddress();
-// ip = "192.168.10.102";
-
HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() {
@Override
public void onError(HDLLinkException e) {
tv.setText("璁よ瘉澶辫触");
responseTv.setText(e.getMsg());
-// Log.i("TAG", "onError: 璁よ瘉澶辫触");
+ Log.i("TAG", "onError: 璁よ瘉澶辫触");
}
@Override
@@ -285,7 +282,6 @@
tv.setText("鑾峰彇鍔熻兘鍒楄〃涓�...");
responseTv.setText("");
HDLSocket.getInstance().getFunctionList(new HDLLinkCallBack() {
-
@Override
public void onError(HDLLinkException error) {
tv.setText(error.getMsg());
--
Gitblit v1.8.0