From 071a8328823a2861f93ce556a4da3e4119cab1a3 Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期四, 19 九月 2024 16:24:28 +0800
Subject: [PATCH] 完成金茂定制功能
---
app/src/main/res/layout/activity_ctrl_curtain.xml | 61 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/app/src/main/res/layout/activity_ctrl_curtain.xml b/app/src/main/res/layout/activity_ctrl_curtain.xml
index 5c8b8fb..0e505e1 100644
--- a/app/src/main/res/layout/activity_ctrl_curtain.xml
+++ b/app/src/main/res/layout/activity_ctrl_curtain.xml
@@ -8,33 +8,32 @@
<include
android:id="@+id/hdl_top_bar_layout"
- layout="@layout/hdl_toolbar_top_view_b"/>
+ layout="@layout/hdl_toolbar_top_view_b" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginRight="20dp"
- android:layout_marginLeft="20dp"
android:layout_below="@+id/hdl_top_bar_layout"
+ android:layout_marginLeft="20dp"
+ android:layout_marginRight="20dp"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="40dp"
- android:text="绐楀笜绫绘ā鍧�"
android:gravity="center|left"
- android:textSize="@dimen/ts_24"
+ android:text="绐楀笜绫绘ā鍧�"
android:textColor="@color/black"
- />
+ android:textSize="@dimen/ts_24" />
<TextView
android:id="@+id/curtainText1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
- android:textSize="@dimen/ts_20"
- android:text="杩欎釜鎸夐挳鍋氱獥甯樻ā鍧楃殑婕旂ず" />
+ android:text="杩欎釜鎸夐挳鍋氱獥甯樻ā鍧楃殑婕旂ず"
+ android:textSize="@dimen/ts_20" />
<Button
android:id="@+id/curtainbtn"
@@ -46,8 +45,8 @@
android:id="@+id/curtainText2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/ts_20"
- android:text="杩欎釜鎸夐挳鍋氱獥甯樼數鏈虹殑婕旂ず銆傚紑鍚堝笜鐢垫満锛屽嵎甯樼數鏈虹被浼�" />
+ android:text="杩欎釜鎸夐挳鍋氱獥甯樼數鏈虹殑婕旂ず銆傚紑鍚堝笜鐢垫満锛屽嵎甯樼數鏈虹被浼�"
+ android:textSize="@dimen/ts_20" />
<LinearLayout
android:layout_width="wrap_content"
@@ -55,29 +54,59 @@
android:orientation="horizontal">
<Button
- android:id="@+id/curtainbtn2"
+ android:id="@+id/curtain_openbtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="绐楀笜寮�" />
<Button
- android:id="@+id/curtainbtn3"
+ android:id="@+id/curtain_closebtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="绐楀笜鍏�" />
<Button
- android:id="@+id/curtainbtn4"
+ android:id="@+id/curtain_stopbtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="绐楀笜鍋�" />
+ </LinearLayout>
- <Button
- android:id="@+id/curtainbtn5"
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <EditText
+ android:id="@+id/et_curtain_precent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="绐楀笜寮�鍒�50%" />
+ android:hint="璇疯緭鍏ラ渶瑕佹帶鍒剁殑绐楀笜鐧惧垎姣�"
+ android:text="50" />
+ <Button
+ android:id="@+id/curtain_precentbtn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="绐楀笜鐧惧垎姣旀帶鍒�" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <Button
+ android:id="@+id/curtain_upbtn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="涓婄偣鍔�" />
+
+ <Button
+ android:id="@+id/curtain_downbtn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="涓嬬偣鍔�" />
</LinearLayout>
</LinearLayout>
--
Gitblit v1.8.0