From 2e80ba72598546c8f80ab50d2395e70e0d9e66a0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 24 六月 2020 15:15:13 +0800
Subject: [PATCH] 2020-06-24 1.修改添加场景方法，需要指定回路号
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java
index 538b2d3..cb5db34 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java
@@ -20,6 +20,7 @@
import com.hdl.sdk.hdl_core.HDLDeviceManger.Bean.DevicesData;
import com.hdl.sdk.hdl_core.HDLDeviceManger.Core.HDLCommand;
import com.hdl.sdk.hdl_core.HDLDeviceManger.Core.HDLDeviceManager;
+import com.hdl.sdk.hdl_core.HDLDeviceManger.Core.HDLSDK;
import com.hdl.sdk.hdl_core.HDLDeviceManger.Core.HandleSearch;
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.BgmInfoEvent;
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.DevicesInfoEvent;
@@ -42,6 +43,7 @@
private Button btn, btn2;
private Button btn_get_all,btn_on_all, btn_off_all,btn_getlocal,btn_getlocal_add;
+ private Button btn_setting;
private TextView tv;
private EditText editText;
private List<DevicesData> devicesDatas;
@@ -56,7 +58,17 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
NetWorkUtil.setIsGetWifiBroadCast(true);
- HDLCommand.init(this);
+ HDLSDK.init(this);
+ //鎺у埗BUS璁惧妯″紡
+ HDLSDK.startHomeMode(this);
+
+// //鎺у埗RCU璁惧妯″紡
+// HDLSDK.startRcuMode(this,"192.168.10.111");
+
+//
+// HDLCommand.init(this);
+// HDLCommand.startHomeMode(this);
+
// /**閰嶇疆鏄惁寮�鍚疭DK鎵撳嵃鏃ュ織锛岄粯璁や负鎵撳紑*/
// HDLCommand.setHDLLogOpen(false);//
@@ -81,6 +93,7 @@
btn_getlocal_add = findViewById(R.id.btn_getlocal_add);
+ btn_setting = findViewById(R.id.btn_setting);
tv = findViewById(R.id.tv);
editText = findViewById(R.id.edt);
editText.setText("172.168.188.100");
@@ -167,10 +180,17 @@
btn_getlocal_add.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(AddDevicesManuallyActivity.class);
+ startActivity(AddDevicesActivity.class);
}
});
+
+ btn_setting.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(SettingActivity.class);
+ }
+ });
}
public void startActivity(Class<?> clazz) {
--
Gitblit v1.8.0