From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev
---
app/src/main/res/layout/general_line.xml | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/app/src/main/res/layout/general_line.xml b/app/src/main/res/layout/general_line.xml
index 6488e4a..e943c23 100644
--- a/app/src/main/res/layout/general_line.xml
+++ b/app/src/main/res/layout/general_line.xml
@@ -24,29 +24,6 @@
/>
- <LinearLayout
- android:id="@+id/sll_ll_rl_right_icon_ll"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/dp_13">
- <!--鏍囧噯鍥炬爣-->
- <ImageView
- android:id="@+id/sll_ll_rl_right_next_iv"
- android:layout_width="@dimen/dp_16"
- android:layout_height="@dimen/dp_16"
- android:src="@drawable/next" />
- <!--鐗规畩鍥炬爣-->
- <ImageView
- android:id="@+id/sll_ll_rl_right_switch_iv"
- android:layout_width="@dimen/dp_57"
- android:layout_height="@dimen/dp_31"
- android:src="@drawable/switch_on_off"
- android:visibility="gone" />
-
-
- </LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
@@ -82,6 +59,30 @@
android:visibility="gone" />
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/sll_ll_rl_right_icon_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_13">
+ <!--鏍囧噯鍥炬爣-->
+ <ImageView
+ android:id="@+id/sll_ll_rl_right_next_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/next" />
+ <!--鐗规畩鍥炬爣-->
+ <ImageView
+ android:id="@+id/sll_ll_rl_right_switch_iv"
+ android:layout_width="@dimen/dp_57"
+ android:layout_height="@dimen/dp_31"
+ android:src="@drawable/switch_on_off"
+ android:visibility="gone" />
+
+
+ </LinearLayout>
+
<!--搴曢儴鐨勭嚎,榛樿闅愯棌-->
<View
android:id="@+id/line_v"
--
Gitblit v1.8.0