@@ -1,7 +1,7 @@ | |||||
<?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||
<project version="4"> | <project version="4"> | ||||
<component name="ExternalStorageConfigurationManager" enabled="true" /> | <component name="ExternalStorageConfigurationManager" enabled="true" /> | ||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK"> | |||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK"> | |||||
<output url="file://$PROJECT_DIR$/build/classes" /> | <output url="file://$PROJECT_DIR$/build/classes" /> | ||||
</component> | </component> | ||||
<component name="ProjectType"> | <component name="ProjectType"> | ||||
@@ -38,25 +38,32 @@ | |||||
android:exported="false" /> | android:exported="false" /> | ||||
<activity | <activity | ||||
android:name=".view.from.ygczrz_activity" | android:name=".view.from.ygczrz_activity" | ||||
android:exported="false" /> | |||||
android:exported="false" | |||||
android:windowSoftInputMode="adjustPan|stateHidden"/> | |||||
<activity | <activity | ||||
android:name=".view.from.ddyjrz_activity" | android:name=".view.from.ddyjrz_activity" | ||||
android:exported="false" /> | |||||
android:exported="false" | |||||
android:windowSoftInputMode="adjustPan|stateHidden"/> | |||||
<activity | <activity | ||||
android:name=".view.from.yfcl_activity" | android:name=".view.from.yfcl_activity" | ||||
android:exported="false" /> | |||||
android:exported="false" | |||||
android:windowSoftInputMode="adjustPan|stateHidden"/> | |||||
<activity | <activity | ||||
android:name=".view.from.zdqx_activity" | android:name=".view.from.zdqx_activity" | ||||
android:exported="false" /> | |||||
android:exported="false" | |||||
android:windowSoftInputMode="adjustPan|stateHidden"/> | |||||
<activity | <activity | ||||
android:name=".view.from.lsjy_activity" | android:name=".view.from.lsjy_activity" | ||||
android:exported="false" /> | |||||
android:exported="false" | |||||
android:windowSoftInputMode="adjustPan|stateHidden"/> | |||||
<activity | <activity | ||||
android:name=".view.from.dzcjy_activity" | android:name=".view.from.dzcjy_activity" | ||||
android:exported="false" /> | |||||
android:exported="false" | |||||
android:windowSoftInputMode="adjustPan|stateHidden"/> | |||||
<activity | <activity | ||||
android:name=".view.from.lcsz_activity" | android:name=".view.from.lcsz_activity" | ||||
android:exported="false" /> | |||||
android:exported="false" | |||||
android:windowSoftInputMode="adjustPan|stateHidden"/> | |||||
<activity | <activity | ||||
android:name=".view.fragment.SystemCapabilitiesFragment" | android:name=".view.fragment.SystemCapabilitiesFragment" | ||||
android:exported="false" /> | android:exported="false" /> | ||||
@@ -95,7 +95,7 @@ public class SystemSetFragment extends Fragment implements View.OnClickListener | |||||
ShowFragment(Systemparameter); | ShowFragment(Systemparameter); | ||||
break; | break; | ||||
case R.id.lcparameter://料倉設置 | case R.id.lcparameter://料倉設置 | ||||
ShowFragment(lcparameter); | |||||
// ShowFragment(lcparameter); | |||||
break; | break; | ||||
} | } | ||||
} | } | ||||
@@ -85,7 +85,8 @@ | |||||
android:inputType="textPassword" | android:inputType="textPassword" | ||||
android:theme="@style/MyEditText" | android:theme="@style/MyEditText" | ||||
android:padding="5dip" | android:padding="5dip" | ||||
android:textSize="16sp" /> | |||||
android:textSize="16sp" | |||||
/> | |||||
</LinearLayout> | </LinearLayout> | ||||
<Button | <Button | ||||
@@ -102,12 +103,13 @@ | |||||
</LinearLayout> | </LinearLayout> | ||||
</RelativeLayout> | </RelativeLayout> | ||||
<LinearLayout | <LinearLayout | ||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | android:layout_height="match_parent" | ||||
android:layout_centerInParent="true" | android:layout_centerInParent="true" | ||||
android:background="@mipmap/bg_milk" | |||||
android:alpha="0.2"> | |||||
android:alpha="0.2" | |||||
android:background="@mipmap/bg_milk"> | |||||
</LinearLayout> | </LinearLayout> |
@@ -96,6 +96,7 @@ | |||||
android:background="@drawable/qs_switch" | android:background="@drawable/qs_switch" | ||||
android:text="清零去皮模式/零点校准模式" | android:text="清零去皮模式/零点校准模式" | ||||
android:layout_margin="5dp" | android:layout_margin="5dp" | ||||
android:focusable="true" | |||||
/> | /> | ||||
<LinearLayout | <LinearLayout | ||||
android:layout_width="wrap_content" | android:layout_width="wrap_content" | ||||
@@ -116,6 +117,7 @@ | |||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent" | android:backgroundTint="@color/colorAccent" | ||||
android:theme="@style/MyEditText_num" | |||||
android:layout_margin="5dp"/> | android:layout_margin="5dp"/> | ||||
<Button | <Button | ||||
android:id="@+id/mwSave_button" | android:id="@+id/mwSave_button" | ||||
@@ -186,6 +188,7 @@ | |||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent" | android:backgroundTint="@color/colorAccent" | ||||
android:theme="@style/MyEditText_num" | |||||
android:layout_margin="5dp"/> | android:layout_margin="5dp"/> | ||||
<Button | <Button | ||||
android:id="@+id/owSave_button" | android:id="@+id/owSave_button" | ||||
@@ -75,7 +75,7 @@ | |||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -97,7 +97,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -125,7 +125,7 @@ | |||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -147,7 +147,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -175,7 +175,7 @@ | |||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -197,7 +197,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -225,7 +225,7 @@ | |||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -247,7 +247,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -275,7 +275,7 @@ | |||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -297,7 +297,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -322,6 +322,7 @@ | |||||
android:layout_centerHorizontal="true" | android:layout_centerHorizontal="true" | ||||
android:background="@drawable/bt_circular" | android:background="@drawable/bt_circular" | ||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:focusable="true" | |||||
android:text="开始 | android:text="开始 | ||||
校准" | 校准" | ||||
android:textSize="16dp"/> | android:textSize="16dp"/> | ||||
@@ -357,7 +358,8 @@ | |||||
android:layout_width="wrap_content" | android:layout_width="wrap_content" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | |||||
android:backgroundTint="@color/colorAccent" | |||||
android:theme="@style/MyEditText_num"/> | |||||
<Button | <Button | ||||
android:id="@+id/savetime" | android:id="@+id/savetime" | ||||
android:layout_width="wrap_content" | android:layout_width="wrap_content" | ||||
@@ -33,6 +33,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:text="0" | android:text="0" | ||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
@@ -51,6 +52,7 @@ | |||||
android:text="0" | android:text="0" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
</TableRow> | </TableRow> | ||||
@@ -75,6 +77,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:text="0" | android:text="0" | ||||
android:theme="@style/MyEditText_num" | |||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
@@ -91,6 +94,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:text="0" | android:text="0" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
@@ -118,6 +122,7 @@ | |||||
android:text="0" | android:text="0" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<TextView | <TextView | ||||
@@ -135,6 +140,7 @@ | |||||
android:text="0" | android:text="0" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
</TableRow> | </TableRow> | ||||
@@ -160,6 +166,7 @@ | |||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:text="0" | android:text="0" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<TextView | <TextView | ||||
@@ -177,6 +184,7 @@ | |||||
android:text="0" | android:text="0" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
</TableRow> | </TableRow> | ||||
@@ -199,6 +207,7 @@ | |||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:theme="@style/MyEditText_num" | |||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:text="0" | android:text="0" | ||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
@@ -214,6 +223,7 @@ | |||||
android:id="@+id/passwayText_11" | android:id="@+id/passwayText_11" | ||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:theme="@style/MyEditText_num" | |||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:text="0" | android:text="0" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
@@ -239,6 +249,7 @@ | |||||
android:id="@+id/passwayText_9" | android:id="@+id/passwayText_9" | ||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:theme="@style/MyEditText_num" | |||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:text="0" | android:text="0" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
@@ -133,6 +133,7 @@ | |||||
android:layout_height="40dp" | android:layout_height="40dp" | ||||
android:layout_margin="5dp" | android:layout_margin="5dp" | ||||
android:backgroundTint="@color/colorAccent" | android:backgroundTint="@color/colorAccent" | ||||
android:theme="@style/MyEditText_num" | |||||
android:gravity="center" | android:gravity="center" | ||||
android:minWidth="50dp" | android:minWidth="50dp" | ||||
android:textColor="@color/white" /> | android:textColor="@color/white" /> | ||||
@@ -143,6 +144,7 @@ | |||||
android:layout_height="40dp" | android:layout_height="40dp" | ||||
android:layout_margin="5dp" | android:layout_margin="5dp" | ||||
android:backgroundTint="@color/colorAccent" | android:backgroundTint="@color/colorAccent" | ||||
android:theme="@style/MyEditText_num" | |||||
android:gravity="center" | android:gravity="center" | ||||
android:minWidth="50dp" | android:minWidth="50dp" | ||||
android:textColor="@color/white" /> | android:textColor="@color/white" /> | ||||
@@ -185,6 +187,7 @@ | |||||
android:layout_height="40dp" | android:layout_height="40dp" | ||||
android:layout_margin="5dp" | android:layout_margin="5dp" | ||||
android:backgroundTint="@color/colorAccent" | android:backgroundTint="@color/colorAccent" | ||||
android:theme="@style/MyEditText_num" | |||||
android:gravity="center" | android:gravity="center" | ||||
android:minWidth="50dp" | android:minWidth="50dp" | ||||
android:textColor="@color/white" /> | android:textColor="@color/white" /> | ||||
@@ -195,6 +198,7 @@ | |||||
android:layout_height="40dp" | android:layout_height="40dp" | ||||
android:layout_margin="5dp" | android:layout_margin="5dp" | ||||
android:backgroundTint="@color/colorAccent" | android:backgroundTint="@color/colorAccent" | ||||
android:theme="@style/MyEditText_num" | |||||
android:gravity="center" | android:gravity="center" | ||||
android:minWidth="50dp" | android:minWidth="50dp" | ||||
android:textColor="@color/white" /> | android:textColor="@color/white" /> | ||||
@@ -29,6 +29,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -50,6 +51,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:theme="@style/MyEditText_num" | |||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
@@ -79,6 +81,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -101,6 +104,7 @@ | |||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -129,6 +133,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -151,6 +156,7 @@ | |||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -179,6 +185,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -201,6 +208,7 @@ | |||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -229,6 +237,7 @@ | |||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -251,6 +260,7 @@ | |||||
android:minWidth="60dp" | android:minWidth="60dp" | ||||
android:layout_marginRight="15dp" | android:layout_marginRight="15dp" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
<Switch | <Switch | ||||
@@ -309,6 +319,7 @@ | |||||
android:minWidth="120dp" | android:minWidth="120dp" | ||||
android:layout_width="wrap_content" | android:layout_width="wrap_content" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:theme="@style/MyEditText_num" | |||||
android:textColor="@color/white" | android:textColor="@color/white" | ||||
android:inputType="number|numberDecimal" | android:inputType="number|numberDecimal" | ||||
android:backgroundTint="@color/colorAccent"/> | android:backgroundTint="@color/colorAccent"/> | ||||
@@ -6,27 +6,27 @@ | |||||
android:layout_height="match_parent" | android:layout_height="match_parent" | ||||
android:tag="系统设置" | android:tag="系统设置" | ||||
tools:context=".view.fragment.SystemSetFragment"> | tools:context=".view.fragment.SystemSetFragment"> | ||||
<TableLayout | <TableLayout | ||||
android:layout_width="wrap_content" | |||||
android:layout_width="110dp" | |||||
android:layout_height="match_parent" | android:layout_height="match_parent" | ||||
android:layout_marginTop="10dp" | android:layout_marginTop="10dp" | ||||
android:layout_marginRight="5dp" | android:layout_marginRight="5dp" | ||||
android:background="@mipmap/bgbtbj" | |||||
> | |||||
android:background="@mipmap/bgbtbj"> | |||||
<Button | <Button | ||||
android:id="@+id/stparameter" | android:id="@+id/stparameter" | ||||
android:text="系统参数" | |||||
android:background="@drawable/settingbutton" | |||||
android:layout_margin="10dp" | android:layout_margin="10dp" | ||||
android:textColor="@color/white" | |||||
/> | |||||
android:background="@drawable/settingbutton" | |||||
android:text="系统参数" | |||||
android:textColor="@color/white" /> | |||||
<Button | <Button | ||||
android:id="@+id/lcparameter" | android:id="@+id/lcparameter" | ||||
android:text="料仓校准" | |||||
android:background="@drawable/settingbutton" | |||||
android:layout_margin="10dp" | android:layout_margin="10dp" | ||||
android:textColor="@color/white" | |||||
/> | |||||
android:background="@drawable/settingbutton" | |||||
android:text="其他设置" | |||||
android:textColor="@color/white" /> | |||||
</TableLayout> | </TableLayout> | ||||
@@ -3,7 +3,7 @@ | |||||
android:layout_width="wrap_content" | android:layout_width="wrap_content" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:orientation="vertical" | android:orientation="vertical" | ||||
android:padding="10dp"> | |||||
android:padding="5dp"> | |||||
<RelativeLayout | <RelativeLayout | ||||
android:layout_height="120dp" | android:layout_height="120dp" | ||||
android:layout_width="120dp" | android:layout_width="120dp" | ||||
@@ -3,10 +3,10 @@ | |||||
android:layout_width="wrap_content" | android:layout_width="wrap_content" | ||||
android:layout_height="wrap_content" | android:layout_height="wrap_content" | ||||
android:orientation="vertical" | android:orientation="vertical" | ||||
android:padding="5dp"> | |||||
android:padding="8dp"> | |||||
<RelativeLayout | <RelativeLayout | ||||
android:layout_width="120dp" | |||||
android:layout_height="120dp" | |||||
android:layout_width="140dp" | |||||
android:layout_height="140dp" | |||||
android:layout_marginLeft="10dp" | android:layout_marginLeft="10dp" | ||||
android:layout_marginTop="10dp" | android:layout_marginTop="10dp" | ||||
android:background="@mipmap/nbbj1"> | android:background="@mipmap/nbbj1"> | ||||
@@ -156,12 +156,17 @@ | |||||
<item name="colorControlNormal">@color/warm_blue</item> | <item name="colorControlNormal">@color/warm_blue</item> | ||||
<item name="colorControlActivated">@color/colorAccent</item> | <item name="colorControlActivated">@color/colorAccent</item> | ||||
<item name="android:textColorHint">@color/warm_gray</item> | <item name="android:textColorHint">@color/warm_gray</item> | ||||
<item name="android:imeOptions">flagNoFullscreen</item> | |||||
</style> | </style> | ||||
<style name="MyEditText1" parent="Theme.AppCompat.Light"> | <style name="MyEditText1" parent="Theme.AppCompat.Light"> | ||||
<item name="colorControlNormal">@color/borderBrush</item> | <item name="colorControlNormal">@color/borderBrush</item> | ||||
<item name="colorControlActivated">@color/foreground</item> | <item name="colorControlActivated">@color/foreground</item> | ||||
<item name="android:textColorHint">@color/borderBrush</item> | <item name="android:textColorHint">@color/borderBrush</item> | ||||
<item name="android:imeOptions">flagNoFullscreen</item> | |||||
</style> | |||||
<style name="MyEditText_num" parent="Theme.AppCompat.Light"> | |||||
<item name="android:imeOptions">flagNoFullscreen</item> | |||||
</style> | </style> | ||||
<style name="Widget.AppTheme.ButtonBar.Fullscreen" parent=""> | <style name="Widget.AppTheme.ButtonBar.Fullscreen" parent=""> | ||||