解决合并
@ -37,6 +37,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
etLoginPaw = (EditText) findViewById(R.id.et_login_paw);
|
etLoginPaw = (EditText) findViewById(R.id.et_login_paw);
|
||||||
tvForgetPaw = (TextView) findViewById(R.id.tv_forget_paw);
|
tvForgetPaw = (TextView) findViewById(R.id.tv_forget_paw);
|
||||||
tvLogin = (TextView) findViewById(R.id.tv_login);
|
tvLogin = (TextView) findViewById(R.id.tv_login);
|
||||||
|
tvLogin.setOnClickListener(this::onClick);
|
||||||
tvRegister.setOnClickListener(this);
|
tvRegister.setOnClickListener(this);
|
||||||
tvForgetPaw.setOnClickListener(this);
|
tvForgetPaw.setOnClickListener(this);
|
||||||
}
|
}
|
||||||
@ -54,6 +55,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
forgetPaw.putExtra("tag", 6);
|
forgetPaw.putExtra("tag", 6);
|
||||||
startActivity(forgetPaw);
|
startActivity(forgetPaw);
|
||||||
break;
|
break;
|
||||||
|
case R.id.tv_login:
|
||||||
|
Intent intent = new Intent(this, HomeActivity.class);
|
||||||
|
startActivity(intent);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,7 @@ public class MainActivity extends BaseActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFinish() {
|
public void onFinish() {
|
||||||
Intent intent = new Intent(MainActivity.this, HomeActivity.class);
|
Intent intent = new Intent(MainActivity.this, LoginActivity.class);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
|
@ -133,7 +133,6 @@ public class ManagementFragment extends BaseActivity {
|
|||||||
fragmentTransaction.add(R.id.frame_layout, forgetPawFragment);
|
fragmentTransaction.add(R.id.frame_layout, forgetPawFragment);
|
||||||
} else {
|
} else {
|
||||||
fragmentTransaction.show(forgetPawFragment);
|
fragmentTransaction.show(forgetPawFragment);
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 7:
|
||||||
@ -150,11 +149,10 @@ public class ManagementFragment extends BaseActivity {
|
|||||||
fragmentTransaction.add(R.id.frame_layout, taskExplainFragment);
|
fragmentTransaction.add(R.id.frame_layout, taskExplainFragment);
|
||||||
} else {
|
} else {
|
||||||
fragmentTransaction.show(taskExplainFragment);
|
fragmentTransaction.show(taskExplainFragment);
|
||||||
break;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
fragmentTransaction.commit();
|
break;
|
||||||
}
|
}
|
||||||
|
fragmentTransaction.commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
android:background="@mipmap/bg"
|
||||||
tools:context="activity.LoginActivity">
|
tools:context="activity.LoginActivity">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:background="@mipmap/bg"
|
||||||
tools:context=".fragment.ForgetPawFragment">
|
tools:context=".fragment.ForgetPawFragment">
|
||||||
<include layout="@layout/register_title" android:id="@+id/forgetPaw"/>
|
<include layout="@layout/register_title" android:id="@+id/forgetPaw"/>
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:background="@mipmap/bg"
|
||||||
tools:context=".fragment.RegisterFragment">
|
tools:context=".fragment.RegisterFragment">
|
||||||
|
|
||||||
<include layout="@layout/register_title"
|
<include layout="@layout/register_title"
|
||||||
|
Before Width: | Height: | Size: 600 B After Width: | Height: | Size: 600 B |
Before Width: | Height: | Size: 425 B After Width: | Height: | Size: 425 B |
Before Width: | Height: | Size: 316 B After Width: | Height: | Size: 316 B |
Before Width: | Height: | Size: 271 B After Width: | Height: | Size: 271 B |
Before Width: | Height: | Size: 426 B After Width: | Height: | Size: 426 B |
Before Width: | Height: | Size: 269 B After Width: | Height: | Size: 269 B |
Before Width: | Height: | Size: 282 B After Width: | Height: | Size: 282 B |
Before Width: | Height: | Size: 320 B After Width: | Height: | Size: 320 B |