From b1072a799774a18b19856d10c9ecfdda96a8b48d Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期五, 15 九月 2023 09:44:38 +0800
Subject: [PATCH] 代码同步
---
HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 8a9300d..bc5e1a0 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
@@ -74,19 +74,32 @@
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);
}
@@ -146,10 +159,16 @@
// 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 mac_key = stringToMD5(stringToMD5(macStr + secret));
String versionString = "HDL_V1.0.1";//
--
Gitblit v1.8.0