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:09:35 +08:00
parent b0526a0eb1
commit cea2d6c31c
14 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
etLoginPaw = (EditText) findViewById(R.id.et_login_paw);
tvForgetPaw = (TextView) findViewById(R.id.tv_forget_paw);
tvLogin = (TextView) findViewById(R.id.tv_login);
tvLogin.setOnClickListener(this::onClick);
tvRegister.setOnClickListener(this);
tvForgetPaw.setOnClickListener(this);
}
@@ -54,6 +55,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
forgetPaw.putExtra("tag", 6);
startActivity(forgetPaw);
break;
case R.id.tv_login:
Intent intent = new Intent(this, HomeActivity.class);
startActivity(intent);
break;
}
}
}

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

@@ -27,7 +27,7 @@ public class MainActivity extends BaseActivity {
@Override
public void onFinish() {
Intent intent = new Intent(MainActivity.this, HomeActivity.class);
Intent intent = new Intent(MainActivity.this, LoginActivity.class);
startActivity(intent);
finish();
}

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

@@ -133,7 +133,6 @@ public class ManagementFragment extends BaseActivity {
fragmentTransaction.add(R.id.frame_layout, forgetPawFragment);
} else {
fragmentTransaction.show(forgetPawFragment);
}
break;
case 7:
@@ -150,11 +149,10 @@ public class ManagementFragment extends BaseActivity {
fragmentTransaction.add(R.id.frame_layout, taskExplainFragment);
} else {
fragmentTransaction.show(taskExplainFragment);
break;
}
fragmentTransaction.commit();
break;
}
fragmentTransaction.commit();
}
@Override