Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos

app/src/main/java/com/xingdata/zzdpos/ui/splash/SplashActivity.java

@@ -7,8 +7,6 @@ import android.view.animation.AlphaAnimation;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.github.ybq.android.spinkit.style.FadingCircle;
-
-import com.xingdata.zzdpos.App;
 import com.xingdata.zzdpos.MainActivity;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -55,7 +55,7 @@ public final class SystemUtil {
             }
         }
 //        return deviceSN;
-        return "92209320";
+        return "92209325";
     }
 
 

app/src/main/res/drawable/red_border.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <corners android:radius="@dimen/all_shape_radius" />
+
+    <solid android:color="@color/red_guanyu" />
+
+</shape>
\ No newline at end of file

app/src/main/res/layout/activity_login.xml

@@ -46,6 +46,7 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
+            android:visibility="gone"
             android:gravity="center"
             android:orientation="horizontal">
 

app/src/main/res/layout/activity_splash.xml

@@ -37,7 +37,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    app:SpinKit_Color="@color/appBack"/>
+                    app:SpinKit_Color="@color/white"/>
 
                 <TextView
                     android:id="@+id/tv_progress"
@@ -45,7 +45,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:text="0 %"
-                    android:textColor="@color/appBack"/>
+                    android:textColor="@color/white"/>
             </RelativeLayout>
 
             <TextView
@@ -55,7 +55,7 @@
                 android:layout_marginTop="@dimen/all_padding"
                 android:gravity="center"
                 android:text="正在加载数据..."
-                android:textColor="@color/appBack"/>
+                android:textColor="@color/white"/>
 
         </LinearLayout>
 

app/src/main/res/layout/fragment_input_password.xml

@@ -24,51 +24,38 @@
             android:src="@mipmap/login_logo"/>
 
         <RelativeLayout
-            android:layout_width="@dimen/et_width"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/et_margin_logo">
 
             <EditText
                 android:id="@+id/et_one_password"
-                android:layout_width="@dimen/et_width"
-                android:layout_height="wrap_content"
+                style="@style/editText"
                 android:background="@drawable/transparent_border"
                 android:digits="1234567890"
                 android:ems="10"
-                android:gravity="center_vertical"
                 android:hint="@string/login_smscodefragment_et_one_input_password_hint"
                 android:inputType="textPassword"
-                android:maxLength="11"
-                android:padding="@dimen/et_padding"
-                android:saveEnabled="false"
-                android:textColorHint="@color/hint"
-                android:textSize="@dimen/et_textsize"/>
+                android:maxLength="11"/>
 
 
         </RelativeLayout>
 
         <EditText
             android:id="@+id/et_two_password"
-            android:layout_width="@dimen/et_width"
-            android:layout_height="wrap_content"
+            style="@style/editText"
             android:layout_marginTop="@dimen/et_margin_edittext"
-            android:background="@drawable/transparent_border"
             android:digits="1234567890"
             android:ems="10"
-            android:gravity="center_vertical"
             android:hint="@string/login_smscodefragment_et_two_input_password_hint"
             android:inputType="textPassword"
             android:maxLength="8"
-            android:padding="@dimen/et_padding"
-            android:saveEnabled="false"
-            android:textColorHint="@color/hint"
-            android:textSize="@dimen/et_textsize"/>
+            />
 
 
         <Button
             android:id="@+id/btn_next"
-            android:layout_width="@dimen/et_width"
-            android:layout_height="wrap_content"
+            style="@style/view_base"
             android:layout_marginTop="@dimen/et_margin_logo"
             android:background="@drawable/blue_border"
             android:onClick="@{onClickListener}"
@@ -77,8 +64,7 @@
             android:textSize="@dimen/et_textsize"/>
 
         <RelativeLayout
-            android:layout_width="@dimen/et_width"
-            android:layout_height="wrap_content"
+            style="@style/view_base"
             android:layout_marginTop="@dimen/et_margin_logo">
 
             <TextView

app/src/main/res/layout/fragment_sign_in.xml

@@ -24,25 +24,19 @@
             android:src="@mipmap/login_logo"/>
 
         <RelativeLayout
-            android:layout_width="@dimen/et_width"
+            android:layout_width="match_parent"
             android:layout_height="@dimen/et_height"
             android:layout_marginTop="@dimen/et_margin_logo">
 
             <EditText
                 android:id="@+id/et_phone"
-                android:layout_width="@dimen/et_width"
-                android:layout_height="match_parent"
-                android:background="@drawable/transparent_border"
+                style="@style/editText"
                 android:digits="1234567890"
                 android:ems="10"
-                android:gravity="center_vertical"
                 android:hint="@string/login_et_phone_hint"
                 android:inputType="phone"
                 android:maxLength="11"
-                android:padding="@dimen/et_padding"
-                android:saveEnabled="false"
-                android:textColorHint="@color/hint"
-                android:textSize="@dimen/et_textsize"/>
+                />
 
             <LinearLayout
                 android:id="@+id/ll_down"
@@ -50,6 +44,7 @@
                 android:layout_height="match_parent"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/all_margin_left"
                 android:gravity="center"
                 android:onClick="@{onClickListener}"
                 android:orientation="vertical"
@@ -67,35 +62,33 @@
 
         <EditText
             android:id="@+id/et_pwd"
-            android:layout_width="@dimen/et_width"
-            android:layout_height="@dimen/et_height"
+            style="@style/editText"
             android:layout_marginTop="@dimen/et_margin_edittext"
-            android:background="@drawable/transparent_border"
             android:digits="1234567890"
             android:ems="10"
-            android:gravity="center_vertical"
             android:hint="@string/login_et_password_hint"
             android:inputType="textPassword"
             android:maxLength="16"
-            android:padding="@dimen/et_padding"
-            android:saveEnabled="false"
-            android:textColorHint="@color/hint"
-            android:textSize="@dimen/et_textsize"/>
+            />
 
 
         <Button
             android:id="@+id/btn_login"
-            android:layout_width="@dimen/et_width"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/all_margin_left"
+            android:layout_marginRight="@dimen/all_margin_left"
             android:layout_marginTop="@dimen/et_margin_logo"
-            android:background="@drawable/blue_border"
+            android:background="@drawable/red_border"
             android:onClick="@{onClickListener}"
             android:text="@string/login_signinfragmentfragment_btn_login"
             android:textColor="@color/white"
             android:textSize="@dimen/et_textsize"/>
 
         <RelativeLayout
-            android:layout_width="@dimen/et_width"
+            android:layout_width="match_parent"
+            android:layout_marginLeft="@dimen/all_margin_left"
+            android:layout_marginRight="@dimen/all_margin_left"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/et_margin_logo">
 

app/src/main/res/layout/fragment_sms_code.xml

@@ -23,25 +23,19 @@
             android:src="@mipmap/login_logo"/>
 
         <RelativeLayout
-            android:layout_width="@dimen/et_width"
-            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/et_height"
             android:layout_marginTop="@dimen/et_margin_logo">
 
             <EditText
                 android:id="@+id/et_phone"
-                android:layout_width="@dimen/et_width"
-                android:layout_height="wrap_content"
-                android:background="@drawable/transparent_border"
+                style="@style/editText"
                 android:digits="1234567890"
                 android:ems="10"
                 android:gravity="center_vertical"
                 android:hint="@string/login_et_phone_hint"
                 android:inputType="phone|number"
-                android:maxLength="11"
-                android:padding="@dimen/et_padding"
-                android:saveEnabled="false"
-                android:textColorHint="@color/hint"
-                android:textSize="@dimen/et_textsize"/>
+                android:maxLength="11"/>
 
 
             <LinearLayout
@@ -49,6 +43,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/all_margin_left"
                 android:orientation="horizontal">
 
                 <View
@@ -73,26 +68,19 @@
 
         <EditText
             android:id="@+id/et_sms_code"
-            android:layout_width="@dimen/et_width"
-            android:layout_height="wrap_content"
+            style="@style/editText"
             android:layout_marginTop="@dimen/all_margin"
-            android:background="@drawable/transparent_border"
             android:digits="1234567890"
             android:ems="10"
-            android:gravity="center_vertical"
             android:hint="@string/login_smscodefragment_et_input_sms_hint"
             android:inputType="phone|number"
             android:maxLength="11"
-            android:padding="@dimen/et_padding"
-            android:saveEnabled="false"
-            android:textColorHint="@color/hint"
-            android:textSize="@dimen/et_textsize"/>
+            />
 
 
         <Button
             android:id="@+id/btn_next"
-            android:layout_width="@dimen/et_width"
-            android:layout_height="wrap_content"
+            style="@style/view_base"
             android:layout_marginTop="@dimen/et_margin_logo"
             android:background="@drawable/blue_border"
             android:onClick="@{onClickListener}"
@@ -101,7 +89,7 @@
             android:textSize="@dimen/et_textsize"/>
 
         <RelativeLayout
-            android:layout_width="@dimen/et_width"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/et_margin_logo">
 
@@ -109,6 +97,7 @@
                 android:id="@+id/tv_existing_account"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/all_margin_left"
                 android:layout_alignParentRight="true"
                 android:onClick="@{onClickListener}"
                 android:text="已有账号 >"

app/src/main/res/values/colors.xml

@@ -116,5 +116,5 @@
     <color name="navy_blue">#1f7bdb</color>
     <color name="light_grey">#b9b9b9</color>
 
-
+    <color name="red_guanyu">#b4282d</color>
 </resources>

app/src/main/res/values/dimens.xml

@@ -13,6 +13,7 @@
     <dimen name="all_padding">10dp</dimen>
     <dimen name="all_text_size_big">22sp</dimen>
     <dimen name="all_text_size_super_big">25sp</dimen>
+    <dimen name="all_margin_left">15dp</dimen>
     <dimen name="title_height">50dp</dimen>
     <dimen name="small_text_size">13sp</dimen>
     <dimen name="big_text_size">18sp</dimen>
@@ -80,8 +81,8 @@
     <dimen name="fragment_menu_show">36dp</dimen>
 
     <!--登录界面-->
-    <dimen name="et_width">400dp</dimen>
-    <dimen name="et_height">45dp</dimen>
+    <dimen name="et_width">270dp</dimen>
+    <dimen name="et_height">44dp</dimen>
     <dimen name="et_textsize">16sp</dimen>
     <dimen name="et_padding">12dp</dimen>
     <dimen name="et_margin_logo">40dp</dimen>

app/src/main/res/values/styles.xml

@@ -269,4 +269,21 @@
         <item name="android:textColor">@drawable/selector_gray_button_text_color</item>
         <item name="android:gravity">center</item>
     </style>
+
+    <style name="view_base" parent="android:ButtonBar">
+        <item name="android:layout_height">@dimen/et_height</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:layout_marginLeft">@dimen/all_margin_left</item>
+        <item name="android:layout_marginRight">@dimen/all_margin_left</item>
+    </style>
+
+    <style name="editText" parent="view_base">
+        <item name=" android:background">@drawable/transparent_border</item>
+        <item name="android:padding">@dimen/et_padding</item>
+        <item name=" android:saveEnabled">false</item>
+        <item name="android:textSize">@dimen/et_textsize</item>
+        <item name="android:textColorHint">@color/hint</item>
+    </style>
+
 </resources>