Revert "d_f"

This reverts commit dd813630bbb68e4031f80f72abcab336db635f86.

app/src/main/AndroidManifest.xml

@@ -33,7 +33,6 @@
         <activity android:name=".activity.VisitorRegActivity" />
         <activity android:name=".activity.IdcardRegActivity" />
         <activity android:name=".activity.HomeAc" />
-        <activity android:name=".activity.VisitorRegisterAc" />
     </application>
 
 </manifest>

app/src/main/java/com/sunwin/visitorapp/LoginActivity.java

@@ -6,7 +6,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.sunwin.visitorapp.activity.HomeAc;
 import com.sunwin.visitorapp.activity.VisitorRegActivity;
 
 public class LoginActivity extends BaseActivity implements View.OnClickListener {
@@ -27,9 +26,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         mEtPwd = (EditText) findViewById(R.id.et_pwd);
         mBtnLogin = (Button) findViewById(R.id.btn_login);
         findViewById(R.id.btn_login_by_self).setOnClickListener(this);
-
-        findViewById(R.id.btn_login).setOnClickListener(v -> startActivity(new Intent(LoginActivity.this, HomeAc.class)));
-
     }
 
     @Override

app/src/main/java/com/sunwin/visitorapp/activity/HomeAc.java

@@ -2,9 +2,7 @@ package com.sunwin.visitorapp.activity;
 
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
-import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
 import android.widget.LinearLayout;
 
 import androidx.fragment.app.FragmentContainerView;
@@ -27,12 +25,5 @@ public class HomeAc extends BaseActivity {
 
         fragmentTransaction.commit();
         fragmentmanager.executePendingTransactions();
-
-        findViewById(R.id.MenuItemRegister).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(mContext,VisitorRegisterAc.class));
-            }
-        });
     }
 }

app/src/main/java/com/sunwin/visitorapp/activity/VisitorRegisterAc.java

@@ -1,43 +0,0 @@
-package com.sunwin.visitorapp.activity;
-
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.Spinner;
-
-import com.sunwin.visitorapp.BaseActivity;
-import com.sunwin.visitorapp.R;
-import com.sunwin.visitorapp.view.UINav;
-
-public class VisitorRegisterAc extends BaseActivity {
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.ac_visitor_register);
-
-        UINav uiNav = findViewById(R.id.UINav);
-        uiNav.setData(this,"访客登记");
-
-        ViewGroup form = findViewById(R.id.ViewForm);
-//        setFormEnable(form,false);
-    }
-
-
-    private void setFormEnable(ViewGroup form,boolean bool){
-        int _ChildCount = form.getChildCount();
-        if(_ChildCount>0){
-            for (int i = 0;i<_ChildCount;i++){
-                View _Child =  form.getChildAt(i);
-
-                if(_Child instanceof ViewGroup){
-                    setFormEnable((ViewGroup)_Child,bool);
-                }else if(_Child instanceof EditText){
-                    _Child.setEnabled(bool);
-                }
-            }
-        }
-    }
-}

app/src/main/java/com/sunwin/visitorapp/view/UINav.java

@@ -1,156 +0,0 @@
-package com.sunwin.visitorapp.view;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import androidx.annotation.ColorRes;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.Nullable;
-
-
-import com.sunwin.visitorapp.R;
-
-import java.util.Objects;
-
-/**
- * author : FLB
- * date   : 2020/7/30
- * desc   :
- */
-public class UINav extends RelativeLayout {
-    private static  @ColorRes
-    int navViewBackColor = R.color.NavBackgroundColor;
-    private static  @ColorRes int navViewTextColor = R.color.NormalTextColorBlack;
-    public static void setNavColor(@ColorRes int rootViewBackColor,@ColorRes int navViewTextColor) {
-        UINav.navViewBackColor = rootViewBackColor;
-        UINav.navViewTextColor = navViewTextColor;
-    }
-
-
-    Context context;
-    //    View rootView;
-    public UINav(Context context) {
-        this(context,null);
-    }
-
-    public UINav(Context context, @Nullable AttributeSet attrs) {
-        this(context, attrs,0);
-    }
-
-    public UINav(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initView(context, attrs);
-    }
-
-    View UINavView;
-    TextView UINavTitle;
-    View UINavBack;
-    View UINavExtra;
-    TextView UINavExtraText;
-    ImageView UINavExtraImage;
-
-
-    private void initView(Context context, @Nullable AttributeSet attrs){
-        this.context = context;
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View rootView = Objects.requireNonNull(inflater).inflate(R.layout.ui_navigation, this, true);
-        UINavView = rootView.findViewById(R.id.UINavView);
-        UINavView.setBackgroundColor(getResources().getColor(navViewBackColor));
-        UINavTitle = rootView.findViewById(R.id.UINavTitle);
-        UINavTitle.setTextColor(getResources().getColor(navViewTextColor));
-        UINavBack =rootView.findViewById(R.id.UINavBack);
-//        UINavBack.setColorFilter(getResources().getColor(navViewTextColor));
-        UINavExtra =rootView.findViewById(R.id.UINavExtra);
-        UINavExtraText =rootView.findViewById(R.id.UINavExtraText);
-        UINavExtraText.setTextColor(getResources().getColor(navViewTextColor));
-        UINavExtraImage =rootView.findViewById(R.id.UINavExtraImage);
-
-
-
-    }
-    public static final String ExtraNone = "ExtraNone";
-    public static final String ExtraTextType = "ExtraTextType";
-    public static final String ExtraImgType = "ExtraImgType";
-
-    public void setMainData(OnClickListener backListener, String title){
-        setBack(backListener!=null,backListener);
-        UINavTitle.setText(title);
-    }
-
-    public void setTitle(String title){
-        UINavTitle.setText(title);
-    }
-    public void setData(Activity activity,String title){
-        setMainData(v-> activity.finish(),title);
-    }
-
-    public void setBack(OnClickListener listener){
-        UINavBack.setOnClickListener(listener);
-    }
-    public void setBack(boolean show, OnClickListener listener){
-        UINavBack.setVisibility(show?VISIBLE:GONE);
-        UINavBack.setOnClickListener(listener);
-    }
-
-    @SuppressLint("UseCompatLoadingForDrawables")
-    public void setData(boolean showBack, OnClickListener listener, String title, String extraType, String extraTextZ, @DrawableRes int extraImageZ, OnClickListener extraListener){
-        UINavTitle.setText(title);
-        UINavBack.setVisibility(showBack?VISIBLE:GONE);
-        UINavBack.setOnClickListener(listener);
-        switch (extraType){
-            case ExtraNone:
-                UINavExtra.setVisibility(View.GONE);
-                break;
-            case ExtraTextType:{
-                UINavExtra.setVisibility(View.VISIBLE);
-                UINavExtraText.setVisibility(View.VISIBLE);
-                UINavExtraText.setText(extraTextZ);
-                UINavExtraImage.setVisibility(View.GONE);
-                UINavExtra.setOnClickListener(extraListener);
-                break;
-            }
-            case ExtraImgType:{
-                UINavExtra.setVisibility(View.VISIBLE);
-                UINavExtraImage.setVisibility(View.VISIBLE);
-                UINavExtraImage.setImageDrawable(context.getResources().getDrawable(extraImageZ));
-                UINavExtraText.setVisibility(View.GONE);
-                UINavExtra.setOnClickListener(extraListener);
-                break;
-            }
-        }
-    }
-
-    public void setExtraText(String extraTextZ, OnClickListener extraListener){
-        UINavExtra.setVisibility(View.VISIBLE);
-        UINavExtraText.setVisibility(View.VISIBLE);
-        UINavExtraText.setText(extraTextZ);
-        UINavExtraImage.setVisibility(View.GONE);
-        UINavExtra.setOnClickListener(extraListener);
-    }
-
-
-    public void setExtraText(String extraTextZ){
-        UINavExtraText.setText(extraTextZ);
-    }
-
-
-    public TextView getExtraText() {
-        return UINavExtraText;
-    }
-
-    @SuppressLint("UseCompatLoadingForDrawables")
-    public void setExtraImage(@DrawableRes int extraImageZ, OnClickListener extraListener){
-        UINavExtra.setVisibility(View.VISIBLE);
-        UINavExtraImage.setVisibility(View.VISIBLE);
-        UINavExtraImage.setImageDrawable(context.getResources().getDrawable(extraImageZ));
-        UINavExtraText.setVisibility(View.GONE);
-        UINavExtra.setOnClickListener(extraListener);
-    }
-}

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <!--设置圆角-->
-    <!--  按顺序分别对应：左下角的角度、右下角的角度、左上角的角度、右上角的角度-->
-    <corners
-        android:bottomLeftRadius="@dimen/CardInputRadius"
-        android:bottomRightRadius="@dimen/CardInputRadius"
-        android:topLeftRadius="@dimen/CardInputRadius"
-        android:topRightRadius="@dimen/CardInputRadius" />
-    <!--设置圆角背景色-->
-    <!--  设置边框大小与背景色-->
-    <stroke
-        android:width="2dp"
-        android:color="@color/ColorGray" />
-
-</shape>

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

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <!--设置圆角-->
-    <!--  按顺序分别对应：左下角的角度、右下角的角度、左上角的角度、右上角的角度-->
-    <corners
-        android:bottomLeftRadius="@dimen/Normal_Card_Radius"
-        android:bottomRightRadius="@dimen/Normal_Card_Radius"
-        android:topLeftRadius="@dimen/Normal_Card_Radius"
-        android:topRightRadius="@dimen/Normal_Card_Radius" />
-    <!--设置圆角背景色-->
-    <solid android:color="@color/ColorPrimary" />
-    <!--  设置边框大小与背景色-->
-    <stroke
-        android:width="2dp"
-        android:color="@color/ColorPrimary" />
-
-</shape>

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

@@ -8,7 +8,7 @@
         android:topLeftRadius="@dimen/Normal_Card_Radius"
         android:topRightRadius="@dimen/Normal_Card_Radius" />
     <!--设置圆角背景色-->
-    <solid android:color="@color/ColorWhite" />
+    <solid android:color="@color/Normal_Card_Color" />
     <!--  设置边框大小与背景色-->
     <stroke
         android:width="2dp"

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-
-    android:width="15dp"
-    android:height="15dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024"
-
-    >
-    <group android:rotation="0" android:pivotX="512" android:pivotY="512"
-        >
-        <path
-            android:fillColor="@color/NormalTextColorBlack"
-            android:pathData=
-                "M510.9 60.7c-245.6 0-446.7 199.8-446.7 446.7C64.2 753 263.9 954 510.8 954s446.6-199.7 446.6-446.6c0.1-245.6-199.6-446.7-446.5-446.7zM760.5 694c-0.1 6.3-5.3 11.4-11.7 11.4-5.6 0-10.3-3.9-11.4-9.3-0.2-0.7-7.8-35.2-40.4-69.1-41.5-43.2-105.8-66.9-186.4-69v93.8c0 4.4-2.5 8.3-6.4 10.3-3.9 2-8.6 1.6-12.2-0.9L268.2 500.7c-1-0.7-1.9-1.6-2.6-2.6-3.7-5.2-2.5-12.3 2.6-16L492 321c3.6-2.6 8.3-2.9 12.2-1 3.9 2 6.3 5.9 6.4 10.3v99.6c23.2 0.9 46.3 4.4 68.7 10.3 46.4 12.2 85 33.4 114.6 63.2 45.6 45.6 68 109.8 66.6 190.6z"
-            />
-
-    </group>
-</vector>

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

@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tool="http://schemas.android.com/tools"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:focusableInTouchMode="true"
-    android:focusable="true"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/login_button_normal"
-    android:orientation="vertical">
-
-    <com.sunwin.visitorapp.view.UINav
-        android:id="@+id/UINav"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:orientation="horizontal"
-        android:layout_weight="1"
-        android:paddingVertical="20dp"
-        android:paddingHorizontal="30dp"
-        >
-        <LinearLayout
-            android:background="@drawable/card_white"
-            android:layout_weight="1"
-            android:layout_margin="20dp"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:text="访客信息"
-                android:layout_marginVertical="5dp"
-                style="@style/StyleTextLarge"/>
-
-            <ImageView
-                android:id="@+id/ImageVisitorPhoto"
-                android:layout_margin="10dp"
-                android:background="@color/white"
-                android:scaleType="fitCenter"
-                android:layout_width="160dp"
-                android:layout_height="160dp"/>
-            <TextView
-                android:id="@+id/TextVisitorName"
-                tools:text="访客名称"
-                android:layout_marginVertical="5dp"
-                style="@style/StyleTextLarge"/>
-            <TextView
-                android:text="身份证号"
-                android:layout_marginVertical="5dp"
-                style="@style/StyleTextLarge"/>
-            <TextView
-                android:id="@+id/TextVisitorIdCode"
-                tools:text="code"
-                android:layout_marginVertical="5dp"
-                style="@style/StyleTextContent"/>
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/ViewForm"
-            android:background="@drawable/card_white"
-            android:layout_weight="2"
-            android:layout_margin="20dp"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <TextView
-                style="@style/StyleTextLarge"
-                android:padding="10dp"
-                android:layout_width="match_parent"
-                android:textAlignment="center"
-                android:text="完善访客信息"
-                />
-            <TextView
-                style="@style/StyleTextContent"
-                android:paddingVertical="5dp"
-                android:paddingHorizontal="15dp"
-                android:text="访客信息"
-                />
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="10dp"
-                android:paddingHorizontal="30dp">
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:gravity="center_vertical"
-                        android:layout_height="match_parent">
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="手机号码"
-                            />
-                        <EditText
-                            android:id="@+id/EditPhone"
-                            android:layout_weight="2"
-                            android:layout_width="0dp"
-                            style="@style/StyleInputContent"
-                            android:layout_height="wrap_content"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:gravity="center_vertical"
-                        android:layout_height="match_parent">
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="来访事由"
-                            />
-                        <Spinner
-                            style="@style/StyleInputContent"
-                            android:id="@+id/SpinnerReason"
-                            android:layout_weight="2"
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"/>
-                    </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:gravity="center_vertical"
-                        android:layout_height="match_parent">
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="公司信息"
-                            />
-                        <EditText
-                            android:id="@+id/EditCompany"
-                            android:layout_weight="2"
-                            android:layout_width="0dp"
-                            style="@style/StyleInputContent"
-                            android:layout_height="wrap_content"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:gravity="center_vertical"
-                        android:layout_height="match_parent">
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="车牌信息"
-                            />
-                        <EditText
-                            android:id="@+id/EditCarPlate"
-                            android:layout_weight="2"
-                            android:layout_width="0dp"
-                            style="@style/StyleInputContent"
-                            android:layout_height="wrap_content"/>
-                    </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:gravity="center_vertical"
-                        android:layout_height="match_parent">
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="来访时间"
-                            />
-                        <EditText
-                            android:id="@+id/EditVisitTimeBegin"
-                            android:layout_weight="2"
-                            android:layout_width="0dp"
-                            style="@style/StyleInputContent"
-                            android:layout_height="wrap_content"/>
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:textAlignment="center"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="至"
-                            />
-                        <EditText
-                            android:id="@+id/EditVisitTimeEnd"
-                            android:layout_weight="2"
-                            android:layout_width="0dp"
-                            style="@style/StyleInputContent"
-                            android:layout_height="wrap_content"/>
-                    </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:gravity="center_vertical"
-                        android:layout_height="match_parent">
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="通行次数"
-                            />
-                        <EditText
-                            android:id="@+id/EditVisitNumber"
-                            android:layout_weight="2"
-                            android:layout_width="0dp"
-                            style="@style/StyleInputContent"
-                            android:layout_height="wrap_content"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:gravity="center_vertical"
-                        android:layout_height="match_parent">
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="随行人数"
-                            />
-                        <EditText
-                            android:id="@+id/EditVisitPeopleCount"
-                            android:layout_weight="2"
-                            android:layout_width="0dp"
-                            style="@style/StyleInputContent"
-                            android:layout_height="wrap_content"/>
-                    </LinearLayout>
-                </LinearLayout>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:gravity="center_vertical"
-                        android:layout_height="match_parent">
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="IC卡"
-                            />
-                        <EditText
-                            android:id="@+id/EditICCode"
-                            android:layout_weight="5"
-                            android:layout_width="0dp"
-                            style="@style/StyleInputContent"
-                            android:layout_height="wrap_content"/>
-                    </LinearLayout>
-
-                </LinearLayout>
-            </LinearLayout>
-            <TextView
-                style="@style/StyleTextContent"
-                android:paddingVertical="5dp"
-                android:paddingHorizontal="15dp"
-                android:text="被访人员信息"
-                />
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingVertical="10dp"
-                android:paddingHorizontal="30dp">
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:gravity="center_vertical"
-                        android:layout_height="match_parent">
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="被访员工"
-                            />
-                        <EditText
-                            android:id="@+id/EditByVisitPeople"
-                            android:layout_weight="2"
-                            android:layout_width="0dp"
-                            style="@style/StyleInputContent"
-                            android:layout_height="wrap_content"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_weight="1"
-                        android:layout_width="0dp"
-                        android:gravity="center_vertical"
-                        android:layout_height="match_parent">
-                        <TextView
-                            style="@style/StyleTextContent"
-                            android:layout_width="0dp"
-                            android:layout_weight="1"
-                            android:text="被访部门"
-                            />
-                        <EditText
-                            android:id="@+id/EditByVisitDepartment"
-                            android:layout_weight="2"
-                            android:layout_width="0dp"
-                            style="@style/StyleInputContent"
-                            android:layout_height="wrap_content"/>
-                    </LinearLayout>
-                </LinearLayout>
-            </LinearLayout>
-            <TextView
-                android:id="@+id/TextButtonSure"
-                android:layout_gravity="center_horizontal"
-                style="@style/TextButtonPrimary"
-
-                android:layout_marginHorizontal="100dp"
-                android:layout_width="match_parent"
-                android:textAlignment="center"
-                android:layout_marginTop="20dp"
-                android:text="提交"
-                />
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>

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

@@ -2,8 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
     android:background="@drawable/login_button_normal"
     android:orientation="vertical">
 

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

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tool="http://schemas.android.com/tools"
-    android:id="@+id/UINavView"
-    android:layout_width="match_parent"
-    android:background="@color/NavBackgroundColor"
-    android:layout_height="60dp"
-     >
-
-    <LinearLayout
-        android:id="@+id/UINavBack"
-        tool:visibility="visible"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:layout_alignParentStart="true"
-        android:gravity="center"
-        android:orientation="horizontal"
-        tool:ignore="RtlSymmetry">
-        <ImageView
-
-
-            android:layout_margin="10dp"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:adjustViewBounds="true"
-            android:src="@drawable/ui_vector_left_arrow"
-            android:scaleType="fitCenter"
-            />
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/UINavCenter"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true">
-        <TextView
-            android:layout_centerInParent="true"
-            android:id="@+id/UINavTitle"
-            android:layout_width="wrap_content"
-            tool:text="Title"
-            android:textSize="@dimen/NavigationTitleTextSize"
-            android:textColor="@color/NormalTextColorBlack"
-            android:layout_height="wrap_content" />
-    </RelativeLayout>
-
-
-    <FrameLayout
-        android:id="@+id/UINavExtra"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerInParent="true"
-        android:layout_alignParentEnd="true"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-
-        android:visibility="gone"
-        tool:visibility="visible"
-        >
-        <TextView
-            android:layout_gravity="center"
-            android:id="@+id/UINavExtraText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tool:text="extra"
-            android:padding="10dp"
-            android:textSize="18sp"
-            android:textColor="@color/NormalTextColorBlack"/>
-        <ImageView
-            android:layout_gravity="center"
-            android:id="@+id/UINavExtraImage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="0dp"
-            android:scaleType="centerInside"
-
-            />
-    </FrameLayout>
-
-</RelativeLayout>

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

@@ -1,35 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <dimen name="TextSizeBig">30.0sp</dimen>
-    <dimen name="TextSizeLarge">25.0sp</dimen>
-    <dimen name="TextSizeContent">20.0sp</dimen>
-    <style name="StyleTextDefault">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">@color/NormalTextColorBlack</item>
-    </style>
-    <style name="StyleTextBig" parent="StyleTextDefault">
-        <item name="android:textSize">@dimen/TextSizeBig</item>
-    </style>
-    <style name="StyleTextLarge" parent="StyleTextDefault">
-        <item name="android:textSize">@dimen/TextSizeLarge</item>
-    </style>
-    <style name="StyleTextContent" parent="StyleTextDefault">
-        <item name="android:textSize">@dimen/TextSizeContent</item>
-    </style>
-    <style name="StyleInputContent" parent="StyleTextContent">
-        <item name="android:padding">5dp</item>
-        <item name="android:layout_margin">2dp</item>
-        <item name="android:background">@drawable/card_input</item>
-    </style>
-    <color name="NavBackgroundColor">#00FFFFFF</color>
-    <dimen name="NavigationTitleTextSize">@dimen/TextSizeBig</dimen>
-    <dimen name="CardInputRadius">4dp</dimen>
     <dimen name="Normal_Card_Radius">7dp</dimen>
-    <color name="ColorWhite">#eeeeee</color>
-    <color name="ColorPrimary">#409eff</color>
-    <color name="ColorGray">#c9c9c9</color>
+    <color name="Normal_Card_Color">#eeeeee</color>
+
     <dimen name="Home_Menu_Item_Radius">10dp</dimen>
     <dimen name="Home_Menu_Item_StrokeWidth">2dp</dimen>
 
@@ -39,11 +12,9 @@
     <color name="Home_Menu_Item_Green">#00ff33</color>
     <color name="Home_Menu_Item_Yellow">#ccff33</color>
     <color name="Home_Menu_Item_Red">#cc6699</color>
-    <color name="Home_Menu_Item_Gray">@color/ColorGray</color>
+    <color name="Home_Menu_Item_Gray">#c9c9c9</color>
 
     <color name="NormalTextColorBlack">#333333</color>
-
-
     <style name="NormalVerticalLine" >
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
@@ -64,7 +35,7 @@
     <style name="Home_Menu_Item_Label">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">@dimen/TextSizeLarge</item>
+        <item name="android:textSize">25sp</item>
         <item name="android:textColor">@color/NormalTextColorBlack</item>
     </style>
     <style name="Home_Welcome_Item_View" parent="NormalVerticalLine">
@@ -74,14 +45,16 @@
         <item name="android:paddingVertical">20dp</item>
 
     </style>
-
-    <style name="Home_Welcome_Item_Number" parent="StyleTextBig">
-    </style>
-    <style name="Home_Welcome_Item_Label" parent="StyleTextLarge">
+    <style name="Home_Welcome_Item_Number">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">30sp</item>
+        <item name="android:textColor">@color/NormalTextColorBlack</item>
     </style>
-    <style name="TextButtonPrimary" parent="StyleTextLarge">
-        <item name="android:background">@drawable/card_primary</item>
-        <item name="android:padding">12dp</item>
-        <item name="android:textColor">@color/ColorWhite</item>
+    <style name="Home_Welcome_Item_Label">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">25sp</item>
+        <item name="android:textColor">@color/NormalTextColorBlack</item>
     </style>
 </resources>