|
@@ -40,14 +40,14 @@
|
|
android:layout_marginBottom="5px"
|
|
android:layout_marginBottom="5px"
|
|
android:text="白昼设置"
|
|
android:text="白昼设置"
|
|
android:textColor="#000000"
|
|
android:textColor="#000000"
|
|
- android:textSize="14px" />
|
|
|
|
|
|
+ android:textSize="16px" />
|
|
|
|
|
|
<com.wdkl.ncs.android.lib.widget.DoubleSlideSeekBar
|
|
<com.wdkl.ncs.android.lib.widget.DoubleSlideSeekBar
|
|
android:id="@+id/doubleslide_withoutrule"
|
|
android:id="@+id/doubleslide_withoutrule"
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginLeft="-10px"
|
|
android:layout_marginLeft="-10px"
|
|
- android:layout_marginRight="30px"
|
|
|
|
|
|
+ android:layout_marginRight="10px"
|
|
custom:lineHeight="5dp"
|
|
custom:lineHeight="5dp"
|
|
custom:textSizes="16px"
|
|
custom:textSizes="16px"
|
|
custom:textColors="#e40627"
|
|
custom:textColors="#e40627"
|
|
@@ -55,12 +55,11 @@
|
|
custom:outColor="#ace208"
|
|
custom:outColor="#ace208"
|
|
custom:imageLow="@drawable/imgv_slide"
|
|
custom:imageLow="@drawable/imgv_slide"
|
|
custom:imageBig="@drawable/imgv_slide"
|
|
custom:imageBig="@drawable/imgv_slide"
|
|
- custom:imagewidth="30dp"
|
|
|
|
- custom:imageheight="30dp"
|
|
|
|
|
|
+ custom:imagewidth="20dp"
|
|
|
|
+ custom:imageheight="20dp"
|
|
custom:hasRule="false"
|
|
custom:hasRule="false"
|
|
custom:bigValue="49"
|
|
custom:bigValue="49"
|
|
- custom:smallValue="0"
|
|
|
|
- />
|
|
|
|
|
|
+ custom:smallValue="0" />
|
|
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
@@ -141,7 +140,7 @@
|
|
android:paddingLeft="6px">
|
|
android:paddingLeft="6px">
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
- android:layout_width="wrap_content"
|
|
|
|
|
|
+ android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="5px"
|
|
android:layout_marginTop="5px"
|
|
android:layout_marginBottom="15px"
|
|
android:layout_marginBottom="15px"
|
|
@@ -652,7 +651,7 @@
|
|
android:layout_gravity="center_vertical"
|
|
android:layout_gravity="center_vertical"
|
|
android:text="通话模式:"
|
|
android:text="通话模式:"
|
|
android:textColor="#000000"
|
|
android:textColor="#000000"
|
|
- android:textSize="16px" />
|
|
|
|
|
|
+ android:textSize="14px" />
|
|
|
|
|
|
<RadioGroup
|
|
<RadioGroup
|
|
android:id="@+id/talk_mode_radiogrp"
|
|
android:id="@+id/talk_mode_radiogrp"
|
|
@@ -664,14 +663,14 @@
|
|
android:id="@+id/single_pass_mode_radiobt"
|
|
android:id="@+id/single_pass_mode_radiobt"
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:text="单通模式"
|
|
|
|
|
|
+ android:text="单通"
|
|
android:textSize="14px" />
|
|
android:textSize="14px" />
|
|
|
|
|
|
<RadioButton
|
|
<RadioButton
|
|
android:id="@+id/two_way_mode_radiobt"
|
|
android:id="@+id/two_way_mode_radiobt"
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
- android:text="双通模式"
|
|
|
|
|
|
+ android:text="双通"
|
|
android:textSize="14px" />
|
|
android:textSize="14px" />
|
|
</RadioGroup>
|
|
</RadioGroup>
|
|
|
|
|
|
@@ -1313,15 +1312,17 @@
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
- android:layout_width="wrap_content"
|
|
|
|
|
|
+ android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="10dp"
|
|
android:layout_marginTop="10dp"
|
|
- android:layout_marginBottom="20dp">
|
|
|
|
|
|
+ android:layout_marginBottom="10dp"
|
|
|
|
+ android:gravity="center">
|
|
|
|
|
|
<TextView
|
|
<TextView
|
|
android:id="@+id/software_and_information_tv"
|
|
android:id="@+id/software_and_information_tv"
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
|
+ android:padding="4dp"
|
|
android:text=""
|
|
android:text=""
|
|
android:textColor="#000000"
|
|
android:textColor="#000000"
|
|
android:textSize="14px" />
|
|
android:textSize="14px" />
|