1.注册登录界面

app/src/main/AndroidManifest.xml

@@ -10,7 +10,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/FlexibleTheme.Base">
-        <activity android:name=".ui.login.LoginActivity"
+        <activity
+            android:name=".ui.login.LoginActivity"
             android:configChanges="keyboardHidden|orientation"
             android:launchMode="singleTask"
             android:theme="@style/Work.Base"
@@ -45,6 +46,32 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
 
+        <activity
+            android:name=".ui.login.UserRegisterOneActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label=" "
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.login.UserRegisterTwoActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label=" "
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+
+        <activity
+            android:name=".ui.login.UserRegisterThreeActivity"
+            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/ui/login/RegisterFirstActivity.java

@@ -3,7 +3,6 @@ package com.wd.workoffice.ui.login;
 
 import android.view.View;
 import android.widget.Button;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.wd.workoffice.R;
@@ -24,10 +23,6 @@ public class RegisterFirstActivity extends WorkToolBarActivity {
     Button btnErp;
     @BindView(R.id.tv_go_login)
     TextView tvGoLogin;
-    private TextView mRegisterclick;
-    private Button mRegisterNewUser;
-    private Button mErtUser;
-    private RelativeLayout mChaDiao;
 
     @Override
     protected void initView() {
@@ -54,6 +49,7 @@ public class RegisterFirstActivity extends WorkToolBarActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.btn_new_user:
+                startActivity(UserRegisterOneActivity.class);
                 break;
             case R.id.btn_erp:
                 startActivity(ErpActivationOneActivity.class);

app/src/main/java/com/wd/workoffice/ui/login/UserRegisterOneActivity.java

@@ -4,38 +4,64 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
 
-import androidx.appcompat.app.AppCompatActivity;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 /*
-* 注册bat
-* */
-public class UserRegisterOneActivity extends AppCompatActivity {
+ * 注册bat
+ * */
+public class UserRegisterOneActivity extends WorkToolBarActivity {
 
-    private Button mRegister;
-    private RelativeLayout mBeanck;
+
+    @BindView(R.id.et_phone)
+    EditText etPhone;
+    @BindView(R.id.et_code)
+    EditText etCode;
+    @BindView(R.id.tv_code)
+    TextView tvCode;
+    @BindView(R.id.btn_register)
+    Button btnRegister;
+    @BindView(R.id.tv_go_protocol)
+    TextView tvGoProtocol;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+
+    }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_user_register_one);
-        mRegister = (Button) findViewById(R.id.login_Next_register);//注册
-        mBeanck = (RelativeLayout) findViewById(R.id.cuangku_im_bank_register);//返回
-        //注册
-        mRegister.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(UserRegisterOneActivity.this, UserRegisterTwoActivity.class));
-            }
-        });
-        mBeanck.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
+    protected void initEvent() {
+
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_user_register_one;
+    }
+
+    @OnClick({R.id.tv_code, R.id.btn_register, R.id.tv_go_protocol})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_code:
+                break;
+            case R.id.btn_register:
+                startActivity(UserRegisterTwoActivity.class);
+                break;
+            case R.id.tv_go_protocol:
+                break;
+        }
     }
 }

app/src/main/java/com/wd/workoffice/ui/login/UserRegisterThreeActivity.java

@@ -4,39 +4,67 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.wd.workoffice.R;
-import com.wd.workoffice.ui.activity.MainActivity;
+import com.wd.workoffice.app.WorkToolBarActivity;
 
-import androidx.appcompat.app.AppCompatActivity;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 /*
-* 完善信息
-* */
-public class UserRegisterThreeActivity extends AppCompatActivity {
+ * 完善信息
+ * */
+public class UserRegisterThreeActivity extends WorkToolBarActivity {
 
-    private Button mSubmissionLogin;
-    private RelativeLayout mBeank;
+
+    @BindView(R.id.et_code)
+    EditText etCode;
+    @BindView(R.id.et_name)
+    EditText etName;
+    @BindView(R.id.tv_phone)
+    TextView tvPhone;
+    @BindView(R.id.tv_product_content)
+    TextView tvProductContent;
+    @BindView(R.id.ll_product)
+    LinearLayout llProduct;
+    @BindView(R.id.et_email)
+    EditText etEmail;
+    @BindView(R.id.btn_submit)
+    Button btnSubmit;
+
+    @Override
+    protected void initView() {
+
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    protected void initEvent() {
+
+    }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_user_register_three);
-        mSubmissionLogin = (Button) findViewById(R.id.Submission_login);
-        mBeank = (RelativeLayout) findViewById(R.id.beank);//返回
-        //跳转登录
-        mSubmissionLogin.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(UserRegisterThreeActivity.this, MainActivity.class));
-            }
-        });
-        mBeank.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
+    protected int layoutId() {
+        return R.layout.activity_user_register_three;
+    }
+
+
+    @OnClick({R.id.ll_product, R.id.btn_submit})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.ll_product:
+                break;
+            case R.id.btn_submit:
+                break;
+        }
     }
 }

app/src/main/java/com/wd/workoffice/ui/login/UserRegisterTwoActivity.java

@@ -4,38 +4,63 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
 
-import androidx.appcompat.app.AppCompatActivity;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 
 /*
-* 账号密码确认密码
-* */
-public class UserRegisterTwoActivity extends AppCompatActivity {
+ * 账号密码确认密码
+ * */
+public class UserRegisterTwoActivity extends WorkToolBarActivity {
 
+    @BindView(R.id.et_name)
+    EditText etName;
+    @BindView(R.id.et_pwd)
+    EditText etPwd;
+    @BindView(R.id.et_confirm_pwd)
+    EditText etConfirmPwd;
+    @BindView(R.id.btn_next)
+    Button btnNext;
+    @BindView(R.id.tv_go_protocol)
+    TextView tvGoProtocol;
     private Button mNextStep;
     private RelativeLayout mSheZhiPassword;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_register__account__password);
-        mNextStep = (Button) findViewById(R.id.password_and_Next_step2_bnt);//《设置密码确认按钮下一步》
-        mSheZhiPassword = (RelativeLayout) findViewById(R.id.cuangku_im_bank_shezhi);//设置密码
-        //下一步
-        mNextStep.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(UserRegisterTwoActivity.this, UserRegisterThreeActivity.class));
-            }
-        });
-        mSheZhiPassword.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    protected void initEvent() {
+
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_user_register_two;
+    }
+
+    @OnClick({R.id.btn_next, R.id.tv_go_protocol})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.btn_next:
+                startActivity(UserRegisterThreeActivity.class);
+                break;
+            case R.id.tv_go_protocol:
+                break;
+        }
     }
 }

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

@@ -125,15 +125,30 @@
             android:textSize="20sp" />
 
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="bottom"
-            android:layout_gravity="center_horizontal|bottom"
-            android:layout_marginBottom="30mm"
-            android:text="注册即代表同意《正望BAT协议》"
-            android:textColor="@color/flexible_text_sup"
-            android:textSize="13sp" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="20mm"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="注册即代表同意"
+                android:textColor="@color/flexible_text_sup"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_go_protocol"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="《正望BAT协议》"
+                android:textColor="#1766DF"
+                android:textSize="12sp" />
+
+        </LinearLayout>
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file