diff --git a/app/build.gradle b/app/build.gradle
index 8aed1e1..2adb66b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,6 +34,7 @@ dependencies {
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.navigation:navigation-fragment:2.1.0'
implementation 'androidx.navigation:navigation-ui:2.1.0'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ae18559..5181b9b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,12 +9,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
-
-
-
-
-
-
+
+
+
diff --git a/app/src/main/java/com/example/myapplication/activity/LoginActivity.java b/app/src/main/java/com/example/myapplication/activity/LoginActivity.java
index 5e21383..61aaf86 100644
--- a/app/src/main/java/com/example/myapplication/activity/LoginActivity.java
+++ b/app/src/main/java/com/example/myapplication/activity/LoginActivity.java
@@ -1,12 +1,23 @@
package com.example.myapplication.activity;
+import android.content.Intent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
import com.example.myapplication.R;
import com.example.myapplication.base.BaseActivity;
/**
* 登录页
*/
-public class LoginActivity extends BaseActivity {
+public class LoginActivity extends BaseActivity implements View.OnClickListener {
+ private TextView tvRegister;
+ private android.widget.EditText etLoginName;
+ private android.widget.EditText etLoginPaw;
+ private TextView tvForgetPaw;
+ private TextView tvLogin;
+
@Override
protected int getLayout() {
return R.layout.activity_login;
@@ -20,5 +31,29 @@ public class LoginActivity extends BaseActivity {
@Override
protected void initView() {
super.initView();
+ tvRegister = (TextView) findViewById(R.id.tv_register);
+
+ etLoginName = (EditText) findViewById(R.id.et_login_name);
+ etLoginPaw = (EditText) findViewById(R.id.et_login_paw);
+ tvForgetPaw = (TextView) findViewById(R.id.tv_forget_paw);
+ tvLogin = (TextView) findViewById(R.id.tv_login);
+ tvRegister.setOnClickListener(this);
+ tvForgetPaw.setOnClickListener(this);
+ }
+
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.tv_register:
+ Intent register = new Intent(this, ManagementFragment.class);
+ register.putExtra("tag", 5);
+ startActivity(register);
+ break;
+ case R.id.tv_forget_paw:
+ Intent forgetPaw = new Intent(this, ManagementFragment.class);
+ forgetPaw.putExtra("tag", 6);
+ startActivity(forgetPaw);
+ break;
+ }
}
}
diff --git a/app/src/main/java/com/example/myapplication/activity/ManagementFragment.java b/app/src/main/java/com/example/myapplication/activity/ManagementFragment.java
index 4176a18..1c662df 100644
--- a/app/src/main/java/com/example/myapplication/activity/ManagementFragment.java
+++ b/app/src/main/java/com/example/myapplication/activity/ManagementFragment.java
@@ -7,8 +7,10 @@ import android.view.KeyEvent;
import com.example.myapplication.R;
import com.example.myapplication.base.BaseActivity;
import com.example.myapplication.fragment.FindFragment;
+import com.example.myapplication.fragment.ForgetPawFragment;
import com.example.myapplication.fragment.MineFragment;
import com.example.myapplication.fragment.RecordFragment;
+import com.example.myapplication.fragment.RegisterFragment;
import com.example.myapplication.fragment.TreasureFragment;
import com.gyf.immersionbar.ImmersionBar;
@@ -28,6 +30,8 @@ public class ManagementFragment extends BaseActivity {
private FindFragment findFragment;//发现的fragment
private RecordFragment recordFragment;//纪录的fragment
private TreasureFragment treasureFragment;//寻宝的fragment
+ private RegisterFragment registerFragment;//注册的fragment
+ private ForgetPawFragment forgetPawFragment;//忘记密码fragment
@Override
@@ -56,6 +60,10 @@ public class ManagementFragment extends BaseActivity {
fragmentTransaction.hide(recordFragment);
if (treasureFragment != null)
fragmentTransaction.hide(treasureFragment);
+ if (registerFragment != null)
+ fragmentTransaction.hide(registerFragment);
+ if (forgetPawFragment != null)
+ fragmentTransaction.hide(forgetPawFragment);
}
public void selectorFragment(int i) {
@@ -97,6 +105,22 @@ public class ManagementFragment extends BaseActivity {
fragmentTransaction.show(treasureFragment);
}
break;
+ case 5:
+ if (registerFragment == null) {
+ registerFragment = new RegisterFragment();
+ fragmentTransaction.add(R.id.frame_layout, registerFragment);
+ } else {
+ fragmentTransaction.show(registerFragment);
+ }
+ break;
+ case 6:
+ if (forgetPawFragment == null) {
+ forgetPawFragment = new ForgetPawFragment();
+ fragmentTransaction.add(R.id.frame_layout, forgetPawFragment);
+ } else {
+ fragmentTransaction.show(forgetPawFragment);
+ }
+ break;
}
fragmentTransaction.commit();
@@ -118,9 +142,16 @@ public class ManagementFragment extends BaseActivity {
case 4:
treasureFragment.onActivityResult(requestCode, resultCode, data);
break;
+ case 5:
+ registerFragment.onActivityResult(requestCode, resultCode, data);
+ break;
+ case 6:
+ forgetPawFragment.onActivityResult(requestCode, resultCode, data);
+ break;
}
}
+
private void setZtlTextColor() {
ImmersionBar.with(this)
.statusBarDarkFont(true, 0.2f) //原理：如果当前设备支持状态栏字体变色，会设置状态栏字体为黑色，如果当前设备不支持状态栏字体变色，会使当前状态栏加上透明度，否则不执行透明度
diff --git a/app/src/main/java/com/example/myapplication/base/BaseFragment.java b/app/src/main/java/com/example/myapplication/base/BaseFragment.java
index 639e082..4aba05a 100644
--- a/app/src/main/java/com/example/myapplication/base/BaseFragment.java
+++ b/app/src/main/java/com/example/myapplication/base/BaseFragment.java
@@ -13,22 +13,24 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
+import com.example.myapplication.R;
public abstract class BaseFragment extends Fragment {
private AlertDialog alertDialog;
+ public View mview;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View inflate = inflater.inflate(getLayout(), container, false);
+ mview = inflater.inflate(getLayout(), container, false);
initMvp();
initView();
initData();
- return inflate;
+ return mview;
}
protected void initMvp() {
@@ -70,6 +72,7 @@ public abstract class BaseFragment extends Fragment {
protected void initView() {
+
}
@Override
diff --git a/app/src/main/java/com/example/myapplication/bean/TaskSpecificationInfo.java b/app/src/main/java/com/example/myapplication/bean/TaskSpecificationInfo.java
new file mode 100644
index 0000000..bb82430
--- /dev/null
+++ b/app/src/main/java/com/example/myapplication/bean/TaskSpecificationInfo.java
@@ -0,0 +1,5 @@
+package com.example.myapplication.bean;
+
+public class TaskSpecificationInfo {
+
+}
diff --git a/app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java b/app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java
new file mode 100644
index 0000000..5bfa556
--- /dev/null
+++ b/app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java
@@ -0,0 +1,32 @@
+package com.example.myapplication.fragment;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.example.myapplication.R;
+import com.example.myapplication.base.BaseFragment;
+
+/**
+ *忘记密码页面
+ */
+public class ForgetPawFragment extends BaseFragment {
+ @Override
+ protected int getLayout() {
+ return R.layout.fragment_forget_paw;
+ }
+
+ @Override
+ protected void initView() {
+ super.initView();
+ }
+
+ @Override
+ protected void initData() {
+ super.initData();
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/myapplication/fragment/RegisterFragment.java b/app/src/main/java/com/example/myapplication/fragment/RegisterFragment.java
new file mode 100644
index 0000000..0bca853
--- /dev/null
+++ b/app/src/main/java/com/example/myapplication/fragment/RegisterFragment.java
@@ -0,0 +1,62 @@
+package com.example.myapplication.fragment;
+
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.example.myapplication.R;
+import com.example.myapplication.base.BaseFragment;
+
+/**
+ * 注册页面
+ */
+public class RegisterFragment extends BaseFragment {
+
+
+ private EditText etRegisterPhone;
+ private EditText etRegisterNote;
+ private TextView registerGetNote;
+ private EditText etRegisterReferrer;
+ private EditText etRegisterPaw;
+ private EditText etRegisterConfirmPaw;
+ private ImageView ivRegisterCheck;
+ private TextView haveGoLogin;
+ private TextView tvRegister;
+ private ImageView ivFinish;
+
+
+ @Override
+ protected int getLayout() {
+ return R.layout.fragment_register;
+ }
+
+ @Override
+ protected void initView() {
+ super.initView();
+ ivFinish =mview.findViewById(R.id.iv_finish);
+ etRegisterPhone = mview.findViewById(R.id.et_register_phone);
+ etRegisterNote = mview.findViewById(R.id.et_register_note);
+ registerGetNote = mview.findViewById(R.id.register_get_note);
+ etRegisterReferrer = mview.findViewById(R.id.et_register_referrer);
+ etRegisterPaw = mview.findViewById(R.id.et_register_paw);
+ etRegisterConfirmPaw = mview.findViewById(R.id.et_register_confirm_paw);
+ ivRegisterCheck = mview.findViewById(R.id.iv_register_check);
+ haveGoLogin = mview.findViewById(R.id.have_go_login);
+ tvRegister = mview.findViewById(R.id.tv_register);
+ ivFinish.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ getActivity().finish();
+ }
+ });
+
+ }
+
+
+ @Override
+ protected void initData() {
+ super.initData();
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/select_check.xml b/app/src/main/res/drawable/select_check.xml
new file mode 100644
index 0000000..b0c52fb
--- /dev/null
+++ b/app/src/main/res/drawable/select_check.xml
@@ -0,0 +1,5 @@
+
+
+