From b1569b789eef12cf5d4252620ca7e7d2d9c8b93a Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期四, 14 十一月 2024 14:26:03 +0800
Subject: [PATCH] sdk重连优化
---
HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 25 +++++--------------------
1 files changed, 5 insertions(+), 20 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 bc5e1a0..20780bf 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
@@ -52,6 +52,8 @@
import java.util.List;
import java.util.Map;
+import retrofit2.http.HEAD;
+
public class MainActivity extends AppCompatActivity {
private static final String TAG = "MainActivity";
@@ -74,32 +76,21 @@
void initDeviceInfo() {
AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
-<<<<<<< HEAD
- infoBean.setDeviceMAC("AA00000000000100");
- infoBean.setIPMAC("AA00000000000100");
-=======
+
infoBean.setDeviceMAC("f2c5d8bad48f");
infoBean.setIPMAC("f2c5d8bad48f");
->>>>>>> not_androidx
+
infoBean.setDeviceName("闊充箰鎾斁鍣�");//璁惧鍚嶅瓧
infoBean.setDeviceModel("MCLog.431");//璁惧鍨嬪彿
infoBean.setAccessMode("WIFI");
infoBean.setIPGateway("192.168.1.1");
-<<<<<<< HEAD
- infoBean.setIPAddress("192.168.1.116");
- infoBean.setGateway_type("music.standard");
-=======
infoBean.setIPAddress("192.168.1.103");
infoBean.setGateway_type("screen.touch");
->>>>>>> not_androidx
infoBean.setHw_version("HW2.0");
infoBean.setFw_version("Fw1.0");
infoBean.setOID("010105000000FE11");//姣忎釜璁惧oid閮借涓嶄竴鏍�
infoBean.setSid("110105000000FE08110100000011");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
-<<<<<<< HEAD
-=======
infoBean.setSupplier("JINMAOYUN");
->>>>>>> not_androidx
HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
}
@@ -159,16 +150,10 @@
// String secret = "44b360eb74b7ba64";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
// 姝ｅ紡鏈嶅姟鍣�
-<<<<<<< HEAD
- String spkStr = "screen.mirror";//浜у搧spk
- String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
- String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
-=======
String spkStr = "screen.touch";//浜у搧spk
// String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
String macStr = editText.getText().toString();//璁惧鍞竴MAC鍦板潃
-// String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
->>>>>>> not_androidx
+// String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑
String mac_key = stringToMD5(stringToMD5(macStr + secret));
String versionString = "HDL_V1.0.1";//
--
Gitblit v1.8.0