From 38e4e60bb1fce4d2a8fe95adba35ec06d868412a Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期二, 31 十二月 2024 16:42:14 +0800
Subject: [PATCH] 代码同步
---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 30 ++++++++++++++++--------------
1 files changed, 16 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 571b025..678a722 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -35,6 +35,7 @@
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.BroadcastRequest;
import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
@@ -86,6 +87,7 @@
@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);
@@ -94,7 +96,7 @@
init();
checkIfCertified();
- initDeviceInfo();
+ initDeviceInfo();//鍒濆鍖栧熀鏈俊鎭紝闈炲父閲嶈锛岃璇佹椂瑕佺敤
registerAllTopicsListener();
ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
@@ -266,18 +268,18 @@
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.101");
+ 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);
}
@@ -288,15 +290,15 @@
tv.setText("寮�濮嬪叆缃戣璇�...");
//璁よ瘉鎻愪氦鍙傛暟鍑嗗
- //娴嬭瘯鏈嶅姟
- String spkStr = "ir.module";//浜у搧spk
- String macStr = "AA000000000000AF";//璁惧鍞竴MAC鍦板潃
- String secret = "44b360eb74b7ba64";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+// 娴嬭瘯鏈嶅姟
+// 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 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";//
--
Gitblit v1.8.0