From fd78a0c0e444b83f40a9225c98adceb87bbda329 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 18 一月 2020 15:10:34 +0800
Subject: [PATCH] 2020-1-18 1.修复RCU混合调光混合开关 类模块，使用物理回路问题。
---
app/src/main/res/layout/activity_main.xml | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a66db05..18c4b53 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,7 +14,7 @@
android:id="@+id/version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="hdl_lib_v1.5.9.20190710_beta"
+ android:text="@string/app_version"
/>
<LinearLayout
android:layout_width="wrap_content"
@@ -25,24 +25,59 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鎼滅储瀹跺眳璁惧" />
+ <Button
+ android:id="@+id/btn_getlocal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍔犺浇鏈湴璁惧" />
+ <Button
+ android:id="@+id/btn_getlocal_add"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="娣诲姞鏁版嵁" />
+
+ <Button
+ android:id="@+id/btn_get_all"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:text="鑾峰彇鎵�鏈夌┖璋�" />
+ <Button
+ android:id="@+id/btn_on_all"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:text="寮�鍚墍鏈夌┖璋�" />
+
+ <Button
+ android:id="@+id/btn_off_all"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:text="鍏抽棴鎵�鏈夌┖璋�" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:focusable="true"
+
+ android:focusableInTouchMode="true">
<EditText
android:id="@+id/edt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:visibility="gone"
android:hint="鑻ヤ娇鐢ㄩ厭搴楁悳绱紝璇疯緭鍏ラ厭搴梚p鍦板潃" />
<Button
android:id="@+id/get"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:visibility="gone"
android:text="鎼滅储閰掑簵璁惧" />
</LinearLayout>
--
Gitblit v1.8.0