修改登录

app/src/main/AndroidManifest.xml

@@ -19,12 +19,10 @@
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:label="@string/main_title"
             android:launchMode="singleTask"
-            android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity
             android:name=".ui.splash.SplashActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:screenOrientation="landscape"
             android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -35,10 +33,13 @@
         <activity
             android:name=".ui.login.LoginActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
-            android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
         <activity
-            android:name=".ui.exception.ex.ui.exception.ErrorDialogActivity"
+            android:name=".ui.exception.ErrorDialogActivity"
+            android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
+            android:theme="@style/Theme.AppCompat.Light.Dialog"/>
+        <activity
+            android:name=".ui.exception.ServerErrActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:theme="@style/Theme.AppCompat.Light.Dialog"/>
     </application>

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

@@ -54,7 +54,7 @@ public class SplashActivity extends BaseActivity<com.xingdata.zzdpos.ui.splash.S
         aAnima.setInterpolator(new AccelerateDecelerateInterpolator());
 
         // 启动动画
-        mViewBinding.tvHint.startAnimation(aAnima);
+//        mViewBinding.tvHint.startAnimation(aAnima);
 
     }
 

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

@@ -6,43 +6,38 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/appBack"
+        android:background="@mipmap/splash"
         android:orientation="vertical"
         android:padding="@dimen/all_margin"
-        tools:context="com.xingdata.zzdhd.ui.splash.SplashActivity">
+        tools:context="com.xingdata.zzdpos.ui.splash.SplashActivity">
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/all_margin_big"
             android:gravity="center"
             android:orientation="vertical"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            >
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
 
-            <TextView
-                android:id="@+id/tv_hint"
-                android:drawableStart="@mipmap/ic_launcher"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/white"
-                android:textSize="55dp" />
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/all_margin">
 
-                <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+                <com.github.ybq.android.spinkit.SpinKitView
+                    xmlns:app="http://schemas.android.com/apk/res-auto"
                     android:id="@+id/spin_kit"
                     style="@style/SpinKitView.Circle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    app:SpinKit_Color="@color/white" />
+                    app:SpinKit_Color="@color/appBack"/>
 
                 <TextView
                     android:id="@+id/tv_progress"
@@ -50,48 +45,48 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:text="0 %"
-                    android:textColor="@color/white" />
+                    android:textColor="@color/appBack"/>
             </RelativeLayout>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                android:layout_marginTop="@dimen/all_margin"
+                android:layout_marginTop="@dimen/all_padding"
                 android:gravity="center"
                 android:text="正在加载数据..."
-                android:textColor="@color/white" />
+                android:textColor="@color/appBack"/>
 
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
+        <!--<LinearLayout-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:gravity="center"-->
+        <!--android:orientation="horizontal"-->
+        <!--app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--app:layout_constraintEnd_toEndOf="parent"-->
+        <!--app:layout_constraintLeft_toLeftOf="parent"-->
+        <!--app:layout_constraintRight_toRightOf="parent"-->
+        <!--app:layout_constraintStart_toStartOf="parent">-->
 
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawableStart="@mipmap/logo_welcome_zzd"
-                android:gravity="center"
-                android:drawablePadding="@dimen/all_margin"
-                android:text="@string/splash_info"
-                android:textColor="@color/white" />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/all_margin"
-                android:drawableStart="@mipmap/login_phone"
-                android:text="@string/login_phone"
-                android:textColor="@color/white" />
-        </LinearLayout>
+        <!--<TextView-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:drawableStart="@mipmap/logo_welcome_zzd"-->
+        <!--android:gravity="center"-->
+        <!--android:drawablePadding="@dimen/all_margin"-->
+        <!--android:text="@string/splash_info"-->
+        <!--android:textColor="@color/white" />-->
+        <!--<TextView-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_marginStart="@dimen/all_margin"-->
+        <!--android:drawableStart="@mipmap/login_phone"-->
+        <!--android:text="@string/login_phone"-->
+        <!--android:textColor="@color/white" />-->
+        <!--</LinearLayout>-->
 
 
     </android.support.constraint.ConstraintLayout>