|
@@ -55,6 +55,11 @@
|
|
|
/>
|
|
/>
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
|
|
+ <ScrollView
|
|
|
|
|
+ android:layout_width="match_parent"
|
|
|
|
|
+ android:layout_height="0dp"
|
|
|
|
|
+ android:layout_weight="1"
|
|
|
|
|
+ android:fillViewport="true">
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
@@ -341,36 +346,32 @@
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="match_parent"
|
|
|
|
|
- android:orientation="vertical"
|
|
|
|
|
- android:background="@drawable/background_style_test"
|
|
|
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
android:layout_marginTop="5dp"
|
|
android:layout_marginTop="5dp"
|
|
|
|
|
+ android:background="@drawable/background_style_test"
|
|
|
|
|
+ android:orientation="vertical"
|
|
|
android:paddingHorizontal="10dp"
|
|
android:paddingHorizontal="10dp"
|
|
|
- android:paddingVertical="5dp"
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ android:paddingVertical="5dp">
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ android:layout_height="wrap_content">
|
|
|
|
|
|
|
|
<ImageView
|
|
<ImageView
|
|
|
android:layout_width="32dp"
|
|
android:layout_width="32dp"
|
|
|
android:layout_height="32dp"
|
|
android:layout_height="32dp"
|
|
|
android:layout_gravity="center"
|
|
android:layout_gravity="center"
|
|
|
android:layout_marginRight="5dp"
|
|
android:layout_marginRight="5dp"
|
|
|
- android:src="@drawable/fmac1control2"
|
|
|
|
|
- />
|
|
|
|
|
|
|
+ android:src="@drawable/fmac1control2" />
|
|
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
|
android:layout_width="@dimen/user_const_size_120dp"
|
|
android:layout_width="@dimen/user_const_size_120dp"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_gravity="center"
|
|
android:layout_gravity="center"
|
|
|
android:text="@string/user_const_string_07"
|
|
android:text="@string/user_const_string_07"
|
|
|
- android:textSize="20sp"
|
|
|
|
|
- android:textStyle="bold"
|
|
|
|
|
android:textColor="#14A478"
|
|
android:textColor="#14A478"
|
|
|
- />
|
|
|
|
|
|
|
+ android:textSize="20sp"
|
|
|
|
|
+ android:textStyle="bold" />
|
|
|
|
|
|
|
|
<Switch
|
|
<Switch
|
|
|
android:id="@+id/FMac1ModeCtrlSw2"
|
|
android:id="@+id/FMac1ModeCtrlSw2"
|
|
@@ -382,23 +383,21 @@
|
|
|
android:textOff="关"
|
|
android:textOff="关"
|
|
|
android:textOn="开"
|
|
android:textOn="开"
|
|
|
android:thumb="@drawable/thumb_style_1"
|
|
android:thumb="@drawable/thumb_style_1"
|
|
|
- android:track="@drawable/track_style_1"
|
|
|
|
|
- />
|
|
|
|
|
|
|
+ android:track="@drawable/track_style_1" />
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
- android:orientation="vertical"
|
|
|
|
|
-
|
|
|
|
|
android:divider="@drawable/divider_space_hor_10dp"
|
|
android:divider="@drawable/divider_space_hor_10dp"
|
|
|
|
|
+
|
|
|
|
|
+ android:orientation="vertical"
|
|
|
android:showDividers="middle">
|
|
android:showDividers="middle">
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ android:layout_height="wrap_content">
|
|
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
|
android:id="@+id/FMac1TemperatureInfoTv1"
|
|
android:id="@+id/FMac1TemperatureInfoTv1"
|
|
@@ -406,7 +405,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_gravity="center"
|
|
android:layout_gravity="center"
|
|
|
android:text="@string/user_const_string_08"
|
|
android:text="@string/user_const_string_08"
|
|
|
- android:textSize="20sp"/>
|
|
|
|
|
|
|
+ android:textSize="20sp" />
|
|
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
|
android:id="@+id/FMac1SeekBar04ValueTv"
|
|
android:id="@+id/FMac1SeekBar04ValueTv"
|
|
@@ -415,8 +414,7 @@
|
|
|
android:layout_gravity="center"
|
|
android:layout_gravity="center"
|
|
|
android:gravity="center"
|
|
android:gravity="center"
|
|
|
android:text="50~70"
|
|
android:text="50~70"
|
|
|
- android:textSize="20sp"
|
|
|
|
|
- />
|
|
|
|
|
|
|
+ android:textSize="20sp" />
|
|
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
|
android:id="@+id/FMac1TemperatureInfoTv2"
|
|
android:id="@+id/FMac1TemperatureInfoTv2"
|
|
@@ -430,19 +428,17 @@
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ android:layout_height="wrap_content">
|
|
|
|
|
|
|
|
<SeekBar
|
|
<SeekBar
|
|
|
android:id="@+id/FMac1SeekBar04"
|
|
android:id="@+id/FMac1SeekBar04"
|
|
|
android:layout_width="0dp"
|
|
android:layout_width="0dp"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_weight="1"
|
|
|
|
|
- android:layout_marginVertical="5dp"
|
|
|
|
|
android:layout_gravity="center"
|
|
android:layout_gravity="center"
|
|
|
|
|
+ android:layout_marginVertical="5dp"
|
|
|
|
|
+ android:layout_weight="1"
|
|
|
android:max="70"
|
|
android:max="70"
|
|
|
- android:min="50"
|
|
|
|
|
- />
|
|
|
|
|
|
|
+ android:min="50" />
|
|
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
|
android:id="@+id/FMac1SeekBar04ValueSetTv"
|
|
android:id="@+id/FMac1SeekBar04ValueSetTv"
|
|
@@ -450,8 +446,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_gravity="center"
|
|
android:layout_gravity="center"
|
|
|
android:text="50"
|
|
android:text="50"
|
|
|
- android:textSize="16sp"
|
|
|
|
|
- />
|
|
|
|
|
|
|
+ android:textSize="16sp" />
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
@@ -460,9 +455,9 @@
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
- android:orientation="vertical"
|
|
|
|
|
-
|
|
|
|
|
android:divider="@drawable/divider_space_hor_10dp"
|
|
android:divider="@drawable/divider_space_hor_10dp"
|
|
|
|
|
+
|
|
|
|
|
+ android:orientation="vertical"
|
|
|
android:showDividers="middle">
|
|
android:showDividers="middle">
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
@@ -475,7 +470,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_gravity="center"
|
|
android:layout_gravity="center"
|
|
|
android:text="@string/user_const_string_09"
|
|
android:text="@string/user_const_string_09"
|
|
|
- android:textSize="20sp"/>
|
|
|
|
|
|
|
+ android:textSize="20sp" />
|
|
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
|
android:id="@+id/FMac1SeekBar05ValueTv"
|
|
android:id="@+id/FMac1SeekBar05ValueTv"
|
|
@@ -484,8 +479,7 @@
|
|
|
android:layout_gravity="center"
|
|
android:layout_gravity="center"
|
|
|
android:gravity="center"
|
|
android:gravity="center"
|
|
|
android:text="0~20"
|
|
android:text="0~20"
|
|
|
- android:textSize="20sp"
|
|
|
|
|
- />
|
|
|
|
|
|
|
+ android:textSize="20sp" />
|
|
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
|
android:id="@+id/FMac1TemperatureInfoTv4"
|
|
android:id="@+id/FMac1TemperatureInfoTv4"
|
|
@@ -493,25 +487,23 @@
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_gravity="center"
|
|
android:layout_gravity="center"
|
|
|
android:text="℃"
|
|
android:text="℃"
|
|
|
- android:textSize="20sp"/>
|
|
|
|
|
|
|
+ android:textSize="20sp" />
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ android:layout_height="wrap_content">
|
|
|
|
|
|
|
|
<SeekBar
|
|
<SeekBar
|
|
|
android:id="@+id/FMac1SeekBar05"
|
|
android:id="@+id/FMac1SeekBar05"
|
|
|
android:layout_width="0dp"
|
|
android:layout_width="0dp"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_weight="1"
|
|
|
|
|
android:layout_gravity="center"
|
|
android:layout_gravity="center"
|
|
|
android:layout_marginVertical="5dp"
|
|
android:layout_marginVertical="5dp"
|
|
|
|
|
+ android:layout_weight="1"
|
|
|
android:max="20"
|
|
android:max="20"
|
|
|
- android:min="0"
|
|
|
|
|
- />
|
|
|
|
|
|
|
+ android:min="0" />
|
|
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
|
android:id="@+id/FMac1SeekBar05ValueSetTv"
|
|
android:id="@+id/FMac1SeekBar05ValueSetTv"
|
|
@@ -527,32 +519,49 @@
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ android:layout_height="wrap_content">
|
|
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
|
android:id="@+id/FMac1TemperatureErrInfoTv"
|
|
android:id="@+id/FMac1TemperatureErrInfoTv"
|
|
|
android:layout_width="0dp"
|
|
android:layout_width="0dp"
|
|
|
android:layout_height="match_parent"
|
|
android:layout_height="match_parent"
|
|
|
android:layout_weight="1"
|
|
android:layout_weight="1"
|
|
|
- android:gravity="center_vertical"
|
|
|
|
|
- />
|
|
|
|
|
|
|
+ android:gravity="center_vertical" />
|
|
|
|
|
|
|
|
<Button
|
|
<Button
|
|
|
android:id="@+id/FMac1ParaSetBtn3"
|
|
android:id="@+id/FMac1ParaSetBtn3"
|
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="45dp"
|
|
android:layout_height="45dp"
|
|
|
android:layout_gravity="end"
|
|
android:layout_gravity="end"
|
|
|
- android:text="设置"
|
|
|
|
|
android:backgroundTint="#00A54B"
|
|
android:backgroundTint="#00A54B"
|
|
|
- />
|
|
|
|
|
|
|
+ android:text="设置" />
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
|
|
+ <LinearLayout
|
|
|
|
|
+ android:layout_width="match_parent"
|
|
|
|
|
+ android:layout_height="wrap_content"
|
|
|
|
|
+ android:layout_marginTop="10dp"
|
|
|
|
|
+ android:layout_marginHorizontal="10dp"
|
|
|
|
|
+ android:background="@drawable/background_style_test"
|
|
|
|
|
+ android:padding="10dp">
|
|
|
|
|
+
|
|
|
|
|
+ <Button
|
|
|
|
|
+ android:id="@+id/FMac1ResetPara2DefaultBtn"
|
|
|
|
|
+ android:layout_width="match_parent"
|
|
|
|
|
+ android:layout_height="50dp"
|
|
|
|
|
+ android:text="一键恢复所有参数到默认出厂设置"
|
|
|
|
|
+ android:textColor="#FFFFFF"
|
|
|
|
|
+ android:textStyle="bold"
|
|
|
|
|
+ android:backgroundTint="#D32F2F"/>
|
|
|
|
|
+ </LinearLayout>
|
|
|
|
|
+
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
|
|
+ </ScrollView>
|
|
|
|
|
+
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<!-- 右侧布局开始 -->
|
|
<!-- 右侧布局开始 -->
|