diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1887e74..241901f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,6 +10,7 @@
+
diff --git a/app/build.gradle b/app/build.gradle
index 2786678..1f770a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,4 +27,5 @@ dependencies {
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
implementation project(':mvpsdk')
+ implementation project(':roundedimageview-2.2.1')
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b2ebf1d..5f3d13a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,14 +10,14 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
-
+
-
+
diff --git a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
index bfa737e..bc1a41e 100644
--- a/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
+++ b/app/src/main/java/com/shunzhi/parent/contract/loginandregister/LoginAndRegisterContract.java
@@ -21,15 +21,6 @@ public interface LoginAndRegisterContract {
}
interface ILoginView extends IBaseFragment {
- //显示网络错误
- void showNetworkError();
-
- //显示加载更多错误
- void showLoadMoreError();
-
- //显示没有更多数据
- void showNomoreData();
-
//更新用户信息
void getUserInfo();
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index 729febd..c7da851 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -1,8 +1,29 @@
package com.shunzhi.parent.presenter.loginandregister;
+import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
+
/**
* Created by Administrator on 2018/3/6 0006.
*/
-public class LoginAndRegisterPresenter {
+public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPresenter {
+ @Override
+ public void loginResult(String loginName, String loginPwd) {
+
+ }
+
+ @Override
+ public void getUserInfo() {
+
+ }
+
+ @Override
+ public LoginAndRegisterContract.ILoginModel getModel() {
+ return null;
+ }
+
+ @Override
+ public void onStart() {
+
+ }
}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
index 7138502..7fa5300 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/LoginAndRegistActivity.java
@@ -1,29 +1,28 @@
package com.shunzhi.parent.ui.activity;
import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import com.share.mvpsdk.base.activity.BaseCompatActivity;
import com.shunzhi.parent.R;
import com.shunzhi.parent.ui.fragment.loginandregistfragment.LoginAndRegistFragment;
-public class LoginAndRegistActivity extends AppCompatActivity {
-
- LoginAndRegistFragment loginAndRegistFragment = new LoginAndRegistFragment();
- FragmentTransaction ft;
+import me.yokeyword.fragmentation.SupportFragment;
+public class LoginAndRegistActivity extends BaseCompatActivity {
+ private SupportFragment[] mFragments = new SupportFragment[1];
@Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_regist);
- initViews();
+ protected void initView(Bundle savedInstanceState) {
+ if (savedInstanceState==null){
+ mFragments[0]= LoginAndRegistFragment.getInstance();
+ loadRootFragment(R.id.frame,mFragments[0]);
+ }else {
+ mFragments[0]=findFragment(LoginAndRegistFragment.class);
+ }
}
- private void initViews() {
- ft = getSupportFragmentManager().beginTransaction();
- ft.add(R.id.frame, loginAndRegistFragment);
- ft.commit();
+ @Override
+ protected int getLayoutId() {
+ return R.layout.activity_regist;
}
-
}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
index 9662d47..9f972a0 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
@@ -9,26 +9,28 @@ import com.share.mvpsdk.base.BasePresenter;
import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
import com.shunzhi.parent.R;
import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
+import com.shunzhi.parent.presenter.loginandregister.LoginAndRegisterPresenter;
-public class LoginAndRegistFragment extends BaseMVPCompatFragment{
+public class LoginAndRegistFragment extends BaseMVPCompatFragment
+implements LoginAndRegisterContract.ILoginView{
-// public static LoginAndRegistFragment getInstance(){
-// LoginAndRegistFragment loginFragment=new LoginAndRegistFragment();
-// return loginFragment;
-// }
+ public static LoginAndRegistFragment getInstance(){
+ LoginAndRegistFragment loginFragment=new LoginAndRegistFragment();
+ return loginFragment;
+ }
@NonNull
@Override
public BasePresenter initPresenter() {
- return null;
+ return new LoginAndRegisterPresenter();
}
@Override
public int getLayoutId() {
- return R.layout.activity_regist;
+ return R.layout.fragment_login_and_regist;
}
@Override
@@ -38,12 +40,8 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rudiobtn2.xml b/app/src/main/res/drawable/rudiobtn2.xml
new file mode 100644
index 0000000..4592793
--- /dev/null
+++ b/app/src/main/res/drawable/rudiobtn2.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_regist.xml b/app/src/main/res/layout/activity_regist.xml
index beac382..aaf73a9 100644
--- a/app/src/main/res/layout/activity_regist.xml
+++ b/app/src/main/res/layout/activity_regist.xml
@@ -5,5 +5,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.shunzhi.parent.ui.activity.LoginAndRegistActivity">
-
+
diff --git a/app/src/main/res/layout/fragment_login_and_regist.xml b/app/src/main/res/layout/fragment_login_and_regist.xml
index 9eb78e1..2dfba6d 100644
--- a/app/src/main/res/layout/fragment_login_and_regist.xml
+++ b/app/src/main/res/layout/fragment_login_and_regist.xml
@@ -1,13 +1,166 @@
-
-
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ab3e9c..b846dc6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,9 @@
#3F51B5
#303F9F
#FF4081
+
+
+ #C1C1C1
+ #B8B8B9
+
diff --git a/roundedimageview-2.2.1/build.gradle b/roundedimageview-2.2.1/build.gradle
new file mode 100644
index 0000000..0cde961
--- /dev/null
+++ b/roundedimageview-2.2.1/build.gradle
@@ -0,0 +1,2 @@
+configurations.create("default")
+artifacts.add("default", file('roundedimageview-2.2.1.aar'))
\ No newline at end of file
diff --git a/roundedimageview-2.2.1/roundedimageview-2.2.1.aar b/roundedimageview-2.2.1/roundedimageview-2.2.1.aar
new file mode 100644
index 0000000..f900a4e
Binary files /dev/null and b/roundedimageview-2.2.1/roundedimageview-2.2.1.aar differ
diff --git a/settings.gradle b/settings.gradle
index 670125b..4bd36fb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':mvpsdk'
+include ':app', ':mvpsdk', ':roundedimageview-2.2.1'
--
libgit2 0.21.0