1.登录逻辑

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.支数参数

app/src/main/AndroidManifest.xml

@@ -1778,7 +1778,22 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
-
+        <activity
+            android:name=".ui.activity.mes.MesLoginActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label=" "
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.MainLoginActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label=" "
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/app/WorkApp.java

@@ -51,7 +51,6 @@ public class WorkApp extends BaseApp {
         RtfMesHelper.getInstance().init(MesApiService.DOMAIN, chain -> {
             Request original = chain.request();
             Request request = original.newBuilder()
-                    .header("Cookie", "SESSION=0514c62e-9e13-4382-be68-b499ec39b3df")
                     .method(original.method(), original.body())
                     .build();
 

app/src/main/java/com/wd/workoffice/bean/event/MesLoginEvent.java

+package com.wd.workoffice.bean.event;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesLoginEvent {
+    public MesLoginEvent() {
+    }
+}

app/src/main/java/com/wd/workoffice/retrofit/ApiService.java

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.Config;
 import com.wd.workoffice.bean.ProDetail;
-import com.wd.workoffice.ui.fg.ApprovalToMeFragment;
-
 import java.util.Map;
-
 import io.reactivex.Observable;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -31,7 +28,7 @@ import retrofit2.http.QueryMap;
 public interface ApiService {
 //    String DOMAIN = Config.DEBUG ? "http://121.36.41.30:9001/" : "http://zwang.bat100.net.cn:8000/";
 
-    String DOMAIN = Config.DEBUG ? "http://zwang.bat100.net.cn:8000/" : "http://zwang.bat100.net.cn:8000/";
+    String DOMAIN = Config.DEBUG ? "http://121.36.41.111:9001/" : "http://121.36.41.111:9001/";
 
 
     /**

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -27,6 +27,14 @@ public interface MesApiService {
     String DOMAIN = Config.DEBUG ? "http://114.116.55.221/" : "http://114.116.55.221/";
 
 
+    /**
+     * 登录
+     *
+     * @return
+     */
+    @POST("/himes/api/checkLogin")
+    Observable<BaseMesBean> login(@Query("userName") String userName, @Query("password") String password);
+
     /**
      * 工单列表
      *
@@ -223,7 +231,6 @@ public interface MesApiService {
     Observable<BaseMesBean> supplierAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
 
 
-
     /**
      * otherSupplierAdd
      *
@@ -337,7 +344,7 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/feedback/deal/update.json")
-    Observable<BaseMesBean> feedbackCheck( @Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> feedbackCheck(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
      * 销售经理查询
@@ -345,7 +352,7 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/user/show/page.json")
-    Observable<BaseMesBean> managerList( @Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> managerList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
      * 销售经理查询
@@ -353,7 +360,7 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/feedback/show/conster/list.json")
-    Observable<BaseMesBean> machineByUser( @Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> machineByUser(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
 
     /**
@@ -362,7 +369,7 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/mpsProduct/show/getMpsProduct/list.json")
-    Observable<BaseMesBean> boxNum( @Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> boxNum(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
      * 获取箱码接口
@@ -370,33 +377,31 @@ public interface MesApiService {
      * @return
      */
     @POST("/himes/api/defectdict/show/page.json")
-    Observable<BaseMesBean> defectList( @Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> defectList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
-     *
      * @return
      */
     @POST("/himes/api/feedback/add/save.json")
-    Observable<BaseMesBean> feedbackAdd( @Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> feedbackAdd(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
-     *
      * @return
      */
     @POST("/himes/api/feedback/show/geteProcedureList.json")
-    Observable<BaseMesBean> processList( @Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> processList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
     /**
-     *
      * @return
      */
     @POST("/himes/api/feedback/show/bom/page.json")
-    Observable<BaseMesBean> questionList( @Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> questionList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
-     *
      * @return
      */
     @POST("/himes/api/msStockRecord/show/page.json")
-    Observable<BaseMesBean> stockList( @Query("functionId") String functionId, @Body RequestBody requestBody);
+    Observable<BaseMesBean> stockList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
 
 }

app/src/main/java/com/wd/workoffice/ui/activity/MainActivity.java

@@ -15,8 +15,10 @@ import com.ashokvarma.bottomnavigation.TextBadgeItem;
 import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkBaseActivity;
+import com.wd.workoffice.bean.event.MesLoginEvent;
 import com.wd.workoffice.bean.event.RefreshTokenEvent;
 import com.wd.workoffice.ui.activity.login.LoginActivity;
+import com.wd.workoffice.ui.activity.mes.MesLoginActivity;
 import com.wd.workoffice.ui.adapter.VpMainAdapter;
 import com.wd.workoffice.ui.fg.MainFragment;
 import com.wd.workoffice.ui.fg.MesFragment;
@@ -53,13 +55,14 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
     private ArrayList<Fragment> fragments;
     private FragmentManager fm;
     private TextBadgeItem numberBadgeItem;
+    private int oldPosition;
 
     //    private MainActivityPresenter mainPresenter;
     @Override
     protected void initView() {
-        if (TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo())) {
+        if (TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo()) && !UserKeeper.getInstance().getMesLogin()) {
             finish();
-            startActivity(LoginActivity.class);
+            startActivity(MainLoginActivity.class);
             return;
         }
         ButterKnife.bind(this);
@@ -73,7 +76,7 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
 //                .setBackgroundColorResource(R.color.red)
 //                .setText("0");
         bnbMainBottomBar
-                .addItem(new BottomNavigationItem(R.mipmap.main_bat_choose , "首页").
+                .addItem(new BottomNavigationItem(R.mipmap.main_bat_choose, "首页").
                         setActiveColorResource(R.color.main_icon_select).
                         setInActiveColorResource(R.color.main_icon).setInactiveIconResource(R.mipmap.main_bat))
                 .addItem(new BottomNavigationItem(R.mipmap.main_work_choose, "工作台").
@@ -133,6 +136,21 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
 
     @Override
     public void onTabSelected(int position) {
+        if (position == 0 || position == 1) {
+            if (TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo())) {
+                bnbMainBottomBar.selectTab(oldPosition, false);
+                startActivity(LoginActivity.class);
+                return;
+            }
+        }
+        if (position == 2) {
+            if (!UserKeeper.getInstance().getMesLogin()) {
+                bnbMainBottomBar.selectTab(oldPosition, false);
+                startActivity(MesLoginActivity.class);
+                return;
+            }
+        }
+        oldPosition = position;
         mainContent.setCurrentItem(position);
     }
 
@@ -172,10 +190,12 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void login(LoginEvent lg) {
-        Intent intent = new Intent(MainActivity.this, LoginActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        UserKeeper.getInstance().clearAll();
-        startActivity(intent);
+        if (!UserKeeper.getInstance().getMesLogin() && TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo())) {
+            Intent intent = new Intent(MainActivity.this, LoginActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            UserKeeper.getInstance().clearAll();
+            startActivity(intent);
+        }
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -185,5 +205,9 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
         mainContent.setOffscreenPageLimit(4);
         VpMainAdapter vpFgAdapter = new VpMainAdapter(fm, fragments);
         mainContent.setAdapter(vpFgAdapter);
+        if (TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo()) && UserKeeper.getInstance().getMesLogin()) {
+            bnbMainBottomBar.selectTab(2);
+        }
     }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/MainLoginActivity.java

+package com.wd.workoffice.ui.activity;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkBaseActivity;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.ui.activity.login.LoginActivity;
+import com.wd.workoffice.ui.activity.mes.MesLoginActivity;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * 选择角色
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MainLoginActivity extends WorkBaseActivity {
+
+
+    @BindView(R.id.tv_bat)
+    TextView tvBat;
+    @BindView(R.id.tv_mes)
+    TextView tvMes;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+    }
+
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_main_login;
+    }
+
+
+
+    @OnClick({R.id.tv_bat, R.id.tv_mes})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_bat:
+                startActivity(LoginActivity.class);
+                break;
+            case R.id.tv_mes:
+                startActivity(MesLoginActivity.class);
+                break;
+        }
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/login/LoginActivity.java

 package com.wd.workoffice.ui.activity.login;
 
+import android.content.Intent;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -16,6 +17,7 @@ import com.wd.workoffice.bean.workEnum.CodeType;
 import com.wd.workoffice.contract.LoginContract;
 import com.wd.workoffice.presenter.LoginPresenter;
 import com.wd.workoffice.ui.activity.MainActivity;
+import com.wd.workoffice.ui.activity.mes.MesLoginActivity;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.HashMap;
@@ -237,7 +239,8 @@ public class LoginActivity extends WorkBaseActivity implements LoginContract.Vie
 
     @Override
     public void loginSuccess() {
-        finish();
-        startActivity(MainActivity.class);
+        Intent intent = new Intent(LoginActivity.this, MainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        startActivity(intent);
     }
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/MesLoginActivity.java

+package com.wd.workoffice.ui.activity.mes;
+
+import android.content.Intent;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkBaseActivity;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.MesLoginEvent;
+import com.wd.workoffice.bean.mesBean.MesClientBean;
+import com.wd.workoffice.presenter.LoginPresenter;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.MainActivity;
+import com.wd.workoffice.ui.activity.login.LoginActivity;
+import com.wd.workoffice.ui.fg.MsgListFragment;
+import com.wd.workoffice.util.UserKeeper;
+import com.wd.workoffice.util.WorkUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+/*
+ * mes
+ * 关于登录页
+ * */
+public class MesLoginActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.et_account)
+    EditText etAccount;
+    @BindView(R.id.et_password)
+    EditText etPassword;
+    @BindView(R.id.ll_pwd)
+    LinearLayout llPwd;
+    @BindView(R.id.btn_login)
+    Button btnLogin;
+    private int type;
+    private LoginPresenter loginPresenter;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        btnLogin.setEnabled(false);
+    }
+
+    @Override
+    public void initData() {
+    }
+
+    @Override
+    protected void initEvent() {
+        etAccount.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (!TextUtils.isEmpty(s) && !TextUtils.isEmpty(etPassword.getText().toString())) {
+                    btnLogin.setEnabled(true);
+                } else {
+                    btnLogin.setEnabled(false);
+                }
+            }
+        });
+        etPassword.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (!TextUtils.isEmpty(s) && !TextUtils.isEmpty(etAccount.getText().toString())) {
+                    btnLogin.setEnabled(true);
+                } else {
+                    btnLogin.setEnabled(false);
+                }
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_login;
+    }
+
+
+    @OnClick(R.id.btn_login)
+    public void onViewClicked() {
+        String account = etAccount.getText().toString();
+        String pwd = etPassword.getText().toString();
+        RtfUtils.getMesRtf().login(account, pwd).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                toast("登录成功");
+                UserKeeper.getInstance().keepMesLogin(true);
+                Intent intent = new Intent(MesLoginActivity.this, MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                startActivity(intent);
+                finish();
+                EventBus.getDefault().post(new MesLoginEvent());
+            }
+        });
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/user/UserSettingActivity.java

@@ -17,6 +17,7 @@ import com.wd.workoffice.bean.UserInfoBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.MainActivity;
+import com.wd.workoffice.ui.activity.MainLoginActivity;
 import com.wd.workoffice.ui.activity.login.LoginActivity;
 import com.wd.workoffice.util.UserKeeper;
 
@@ -112,7 +113,7 @@ public class UserSettingActivity extends WorkToolBarActivity {
                     return;
                 }
                 toast("退出成功");
-                Intent intent = new Intent(UserSettingActivity.this, LoginActivity.class);
+                Intent intent = new Intent(UserSettingActivity.this, MainLoginActivity.class);
                 intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
                 UserKeeper.getInstance().clearAll();
                 startActivity(intent);

app/src/main/java/com/wd/workoffice/util/UserKeeper.java

@@ -20,7 +20,7 @@ public class UserKeeper {
     private SPUtils sp = SPUtils.getInstance("UserKeeper");
     private final String LOGIN_INFO = "_LOGIN_INFO";
     private final String USER_INFO = "_USER_INFO";
-
+    private final String MES_LOGIN = "_MES_LOGIN";
     private UserKeeper() {
     }
 
@@ -35,6 +35,23 @@ public class UserKeeper {
         return keeper;
     }
 
+    /**
+     * mes登录状态
+     * @param info
+     */
+    public void keepMesLogin(Boolean info) {
+        sp.put(MES_LOGIN, info);
+    }
+
+    public Boolean getMesLogin() {
+        return sp.getBoolean(MES_LOGIN);
+    }
+
+    public void clearMesLogin() {
+        sp.put(MES_LOGIN, false);
+    }
+
+
     public void keepLoginInfo(String info) {
         sp.put(LOGIN_INFO, info);
     }
@@ -136,6 +153,6 @@ public class UserKeeper {
     public void clearAll() {
         clearLoginInfo();
         clearUserInfo();
-//        clearAccount();
+        clearMesLogin();
     }
 }

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

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

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/activity_main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="正望"
+        android:layout_marginTop="80mm"
+        android:textSize="25sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50mm"
+        android:text="选择一个角色进入"
+        android:textSize="16sp"
+         />
+
+    <TextView
+        android:id="@+id/tv_bat"
+        android:layout_width="100mm"
+        android:layout_height="100mm"
+        android:background="@drawable/shape_main_login"
+        android:gravity="center"
+        android:text="BAT"
+        android:layout_marginTop="20mm"
+        android:textSize="25sp" />
+    <TextView
+        android:id="@+id/tv_mes"
+        android:layout_width="100mm"
+        android:layout_height="100mm"
+        android:background="@drawable/shape_main_login"
+        android:gravity="center"
+        android:layout_marginTop="20mm"
+        android:text="MES"
+        android:textSize="25sp" />
+</LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+
+        <ImageView
+            android:layout_width="140mm"
+            android:layout_height="30mm"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="100mm"
+            android:background="@mipmap/mes_login" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="正望集团MES系统"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="15mm"
+            android:textColor="#FF828282"/>
+        <!--密码登录-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="58mm"
+            android:layout_marginTop="130mm"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/ll_pwd"
+                android:layout_width="match_parent"
+                android:layout_height="130mm"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50mm"
+                    android:background="@drawable/shape_login_et"
+                    android:gravity="center_vertical">
+
+                    <ImageView
+                        android:layout_width="20mm"
+                        android:layout_height="20mm"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="13mm"
+                        android:background="@mipmap/login_phone" />
+
+                    <EditText
+                        android:id="@+id/et_account"
+                        android:layout_width="match_parent"
+                        android:layout_height="30mm"
+                        android:layout_centerVertical="true"
+                        android:layout_marginHorizontal="10mm"
+                        android:background="@null"
+                        android:inputType="textVisiblePassword"
+                        android:hint="输入注册账号"
+                        android:textColorHint="@color/flexible_text_sup"
+                        android:textSize="14sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50mm"
+                    android:layout_marginTop="20mm"
+                    android:background="@drawable/shape_login_et"
+                    android:gravity="center_vertical">
+
+                    <ImageView
+                        android:layout_width="20mm"
+                        android:layout_height="20mm"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="13mm"
+                        android:background="@mipmap/login_pwd" />
+
+                    <EditText
+                        android:id="@+id/et_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="30mm"
+                        android:layout_marginHorizontal="10mm"
+                        android:background="@null"
+                        android:hint="输入账号密码"
+                        android:inputType="textPassword"
+                        android:textColorHint="@color/flexible_text_sup"
+                        android:textSize="14sp" />
+                </LinearLayout>
+            </LinearLayout>
+
+        </LinearLayout>
+
+
+        <Button
+            android:id="@+id/btn_login"
+            android:layout_width="256mm"
+            android:layout_height="53mm"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/selector_btn"
+            android:text="登录"
+            android:layout_marginTop="30mm"
+            android:layout_gravity="center_horizontal"
+            android:textColor="@color/white"
+            android:textSize="24sp" />
+
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file