1 完成用户登录模块修改

2 优化基类

1 完成用户登录模块修改
2 优化基类
YangShuai
1 parent 10656f4d
Showing 9 changed files with 51 additions and 107 deletions
app/strike/src/main/java/com/cnlive/strike/MainActivity.java
app/strike/src/main/java/com/cnlive/strike/MyActivity.java
app/strike/src/main/java/com/cnlive/strike/MyActivityTest1.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/LoginActivity.java
cloud/user/src/main/java/com/cnlive/strike/user/ui/activity/SelectCountryActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/MvpActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/MvpBindingActivity.java
core/base/src/main/java/com/cnlive/core/libs/base/frame/fragment/BaseFragment.java
@@ -9,8 +9,9 @@ import com.cnlive.strike.user.ui.activity.LoginActivity;
 public class MainActivity extends BaseActivity {
+
     @Override
-    protected int getLayoutId() {
+    protected int getViewLayoutId() {
         return R.layout.activity_main;
     }
@@ -6,9 +6,8 @@ import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 public class MyActivity extends BaseActivity {
-
     @Override
-    protected int getLayoutId() {
+    protected int getViewLayoutId() {
         return R.layout.activity_my;
     }
@@ -6,9 +6,8 @@ import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 public class MyActivityTest1 extends BaseActivity {
     @Override
-    protected int getLayoutId() {
+    protected int getViewLayoutId() {
         return R.layout.activity_my1;
-
     }
     @Override
@@ -75,8 +75,9 @@ public class LoginActivity extends BaseActivity {
         context.startActivity(intent);
     }
+
     @Override
-    protected int getLayoutId() {
+    protected int getViewLayoutId() {
         return R.layout.activity_login;
     }
@@ -38,8 +38,8 @@ public class SelectCountryActivity extends BaseActivity&lt;SelectCountryView, Selec
     }
     @Override
-    protected int getLayoutId() {
-        return R.layout.activity_select_country;
+    protected int getBindLayoutId() {
+        return  R.layout.activity_select_country;
     }
     @Override
@@ -27,12 +27,16 @@ import com.cnlive.core.libs.base.util.ReflectUtil;
 import com.cnlive.core.libs.base.util.StatusBarConfig;
 import com.cnlive.core.libs.base.util.StatusBarUtil;
 import com.cnlive.core.libs.base.util.ActivityCollector;
+import com.hannesdorfmann.mosby3.mvp.MvpActivity;
 /**
  * @author ys
  * 基类 activity
  */
 public abstract class BaseActivity<V extends BaseView, P extends BasePresenter<V>> extends MvpActivity<V, P> {
+    private V view;
+    private P presenter;
+    public ViewDataBinding baseBinding;
     //获取TAG的activity名称
     protected final String TAG = this.getClass().getSimpleName();
     //是否显示标题栏
@@ -45,14 +49,16 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     private static Toast toast;
     public Context context;
     private int stateBarColor = -1;
-    public ViewDataBinding baseBinding;
-    private V view;
-    private P presenter;
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (0 != getBindLayoutId()) {
+            baseBinding = DataBindingUtil.setContentView(this, getBindLayoutId());
+        } else if (0 != getViewLayoutId()) {
+            setContentView(getViewLayoutId());
+        }
         context = this;
         //activity管理
         ActivityCollector.addActivity(this);
@@ -66,10 +72,6 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN
                     , WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
-        //设置布局
-        if (0 != getLayoutId()) {
-            baseBinding = DataBindingUtil.setContentView(this, getLayoutId());
-        }
         //设置屏幕是否可旋转
         if (!isAllowScreenRoate) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
@@ -84,10 +86,6 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         initData();
     }
-    @Override
-    protected int getLayoutId() {
-        return 0;
-    }
     /**
      * 初始化控件
@@ -95,7 +93,6 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     protected void initView() {
     }
-    ;
     /**
      * 设置数据
@@ -272,4 +269,13 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         }
         return view;
     }
+
+    //    protected abstract int getLayoutId();
+    protected int getBindLayoutId() {
+        return 0;
+    }
+
+    protected int getViewLayoutId() {
+        return 0;
+    }
 }
 \ No newline at end of file
-package com.cnlive.core.libs.base.frame.activity;
-
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-
-import com.cnlive.core.libs.base.util.ReflectUtil;
-import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
-
-/**
- * MVP Databinding Base Activity
- * @param <V> MVP View {@link MvpView}
- * @param <P> MVP Presenter {@link MvpPresenter}
- */
-public abstract class MvpActivity<V extends MvpView, P extends MvpPresenter<V>> extends com.hannesdorfmann.mosby3.mvp.MvpActivity<V, P> {
-
-    public V view;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(getLayoutId());
-    }
-
-    protected abstract int getLayoutId();
-
-    @NonNull
-    public V createView() {
-        return ReflectUtil.instance(0, this.getClass(), this);
-    }
-
-    @NonNull
-    @Override
-    public P createPresenter() {
-        return ReflectUtil.instance(1, this);
-    }
-
-    @NonNull
-    @Override
-    public V getMvpView() {
-        if (view == null) view = createView();
-        return view;
-    }
-
-}
-package com.cnlive.core.libs.base.frame.activity;
-
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.databinding.DataBindingUtil;
-import androidx.databinding.ViewDataBinding;
-
-import com.cnlive.core.libs.base.util.ReflectUtil;
-import com.hannesdorfmann.mosby3.mvp.MvpPresenter;
-import com.hannesdorfmann.mosby3.mvp.MvpView;
-
-/**
- * MVP Databinding Base Activity
- * @param <V> MVP View {@link MvpView}
- * @param <P> MVP Presenter {@link MvpPresenter}
- * @param <D> Databind Page Data
- * @param <T> Databind Activity ViewDataBinding {@link ViewDataBinding}
- */
-public abstract class MvpBindingActivity<V extends MvpView, P extends MvpPresenter<V>, D, T extends ViewDataBinding> extends MvpActivity<V, P> {
-
-    public T binding;
-    public D data;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        binding = DataBindingUtil.setContentView(this, getLayoutId());
-        ReflectUtil.invoke(binding, "setData", getViewData());
-}
-
-    protected D initLayoutData() {
-        return ReflectUtil.instance(2, this);
-    }
-
-    @NonNull
-    public D getViewData() {
-        if (data == null) data = initLayoutData();
-        return data;
-    }
-}
 package com.cnlive.core.libs.base.frame.fragment;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import androidx.annotation.ColorRes;
@@ -9,6 +11,8 @@ import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.libs.base.util.ReflectUtil;
@@ -29,6 +33,20 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     private V view;
     private P presenter;
     protected final String TAG = this.getClass().getSimpleName();
+    public ViewDataBinding baseBinding;
+    public View baseView;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (0 != getBindLayoutId()) {
+            baseBinding = DataBindingUtil.inflate(inflater, getBindLayoutId(), container, false);
+            return baseBinding.getRoot();
+        } else if (0 != getViewLayoutId()) {
+            baseView = inflater.inflate(getViewLayoutId(), container, false);
+        }
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
@@ -70,6 +88,13 @@ public abstract class BaseFragment&lt;V extends BaseView, P extends BasePresenter&lt;V
     protected void initBindingData() {
     }
+    protected int getBindLayoutId() {
+        return 0;
+    }
+
+    protected int getViewLayoutId() {
+        return 0;
+    }
     /**
      * 设置状态栏颜色