xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wds
2021-05-26 19:01:46 +08:00
parent 80893ca08f 3b0581c621
commit b0526a0eb1
35 changed files with 628 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/com/example/myapplication/activity/LoginActivity.java
View File

@@ -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;
}
}
}

15
app/src/main/java/com/example/myapplication/activity/MainActivity.java
View File

@@ -4,6 +4,8 @@ package com.example.myapplication.activity;
import androidx.core.app.ActivityCompat;
import android.Manifest;
import android.content.Intent;
import android.os.CountDownTimer;
import com.example.myapplication.R;
import com.example.myapplication.base.BaseActivity;
@@ -18,6 +20,19 @@ public class MainActivity extends BaseActivity {
@Override
protected void initData() {
super.initData();
new CountDownTimer(3000, 1000) {
@Override
public void onTick(long l) {
}
@Override
public void onFinish() {
Intent intent = new Intent(MainActivity.this, HomeActivity.class);
startActivity(intent);
finish();
}
}.start();
}
private void initPermission() {
String[] pers = {

63
app/src/main/java/com/example/myapplication/activity/ManagementFragment.java
View File

@@ -7,10 +7,13 @@ 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.TaskExplainFragment;
import com.example.myapplication.fragment.TaskPrefectureFragment;
import com.example.myapplication.fragment.RegisterFragment;
import com.example.myapplication.fragment.TreasureFragment;
import com.gyf.immersionbar.ImmersionBar;
@@ -33,6 +36,10 @@ public class ManagementFragment extends BaseActivity {
private TaskPrefectureFragment taskPrefectureFragment;//发现-任务专区的fragment
private TaskExplainFragment taskExplainFragment;//发现-任务说明的fragment
private RegisterFragment registerFragment;//注册的fragment
private ForgetPawFragment forgetPawFragment;//忘记密码fragment
@Override
protected int getLayout() {
@@ -60,10 +67,17 @@ public class ManagementFragment extends BaseActivity {
fragmentTransaction.hide(recordFragment);
if (treasureFragment != null)
fragmentTransaction.hide(treasureFragment);
if (taskPrefectureFragment!=null)
fragmentTransaction.hide(taskPrefectureFragment);
if (taskExplainFragment!=null)
fragmentTransaction.hide(taskExplainFragment);
if (registerFragment != null)
fragmentTransaction.hide(registerFragment);
if (forgetPawFragment != null)
fragmentTransaction.hide(forgetPawFragment);
}
public void selectorFragment(int i) {
@@ -105,25 +119,42 @@ 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;
case 7:
if (taskPrefectureFragment==null){
taskPrefectureFragment=new TaskPrefectureFragment();
fragmentTransaction.add(R.id.frame_layout,taskPrefectureFragment);
}else {
if (taskPrefectureFragment == null) {
taskPrefectureFragment = new TaskPrefectureFragment();
fragmentTransaction.add(R.id.frame_layout, taskPrefectureFragment);
} else {
fragmentTransaction.show(taskPrefectureFragment);
}
break;
case 8:
if (taskExplainFragment==null){
taskExplainFragment=new TaskExplainFragment();
fragmentTransaction.add(R.id.frame_layout,taskExplainFragment);
}else {
if (taskExplainFragment == null) {
taskExplainFragment = new TaskExplainFragment();
fragmentTransaction.add(R.id.frame_layout, taskExplainFragment);
} else {
fragmentTransaction.show(taskExplainFragment);
}
break;
}
fragmentTransaction.commit();
break;
}
fragmentTransaction.commit();
}
}
@Override
@@ -142,6 +173,12 @@ 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;
case 7:
taskPrefectureFragment.onActivityResult(requestCode, resultCode, data);
break;
@@ -150,10 +187,12 @@ public class ManagementFragment extends BaseActivity {
break;
}
}
private void setZtlTextColor() {
ImmersionBar.with(this)
.statusBarDarkFont(true, 0.2f) //原理：如果当前设备支持状态栏字体变色，会设置状态栏字体为黑色，如果当前设备不支持状态栏字体变色，会使当前状态栏加上透明度，否则不执行透明度
.init();
}
}

4
app/src/main/java/com/example/myapplication/base/BaseActivity.java
View File

@@ -44,10 +44,10 @@ public abstract class BaseActivity extends AppCompatActivity {
alertDialog.getWindow().setBackgroundDrawable(new ColorDrawable());
alertDialog.setCancelable(false);
alertDialog.setOnKeyListener((dialog, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK)
if (keyCode == KeyEvent.KEYCODE_SEARCH || keyCode == KeyEvent.KEYCODE_BACK)
return true;
return false;
});
});
//loading样式
//View view = LayoutInflater.from(this).inflate(R.layout.loading_alert, null);
//alertDialog.setView(view);

5
app/src/main/java/com/example/myapplication/base/BaseFragment.java
View File

@@ -13,14 +13,15 @@ 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) {
@@ -29,6 +30,7 @@ public abstract class BaseFragment extends Fragment {
initView();
initData();
return mView;
}
protected void initMvp() {
@@ -70,6 +72,7 @@ public abstract class BaseFragment extends Fragment {
protected void initView() {
}
@Override

5
app/src/main/java/com/example/myapplication/bean/TaskSpecificationInfo.java Normal file
View File

@@ -0,0 +1,5 @@
package com.example.myapplication.bean;
public class TaskSpecificationInfo {
}

32
app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java Normal file
View File

@@ -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();
}
}

62
app/src/main/java/com/example/myapplication/fragment/RegisterFragment.java Normal file
View File

@@ -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();
}
}