fix codeestX#82

yuxinabc · Apr 23, 2017 · 444b66a · 444b66a
1 parent 5bf0ca1
commit 444b66a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 98 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,6 +16,10 @@ android {
         multiDexEnabled true
         renderscriptTargetApi 23
         renderscriptSupportModeEnabled true
+
+        ndk {
+            abiFilters "armeabi"
+        }
     }
 
     buildTypes {

diff --git a/app/src/main/java/com/codeest/geeknews/base/BaseActivity.java b/app/src/main/java/com/codeest/geeknews/base/BaseActivity.java
@@ -1,11 +1,6 @@
 package com.codeest.geeknews.base;
 
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
 import android.view.ViewGroup;
 
 import com.codeest.geeknews.app.App;
@@ -16,46 +11,14 @@
 
 import javax.inject.Inject;
 
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-import me.yokeyword.fragmentation.SupportActivity;
-
 /**
  * Created by codeest on 2016/8/2.
  * MVP activity基类
  */
-public abstract class BaseActivity<T extends BasePresenter> extends SupportActivity implements BaseView{
+public abstract class BaseActivity<T extends BasePresenter> extends SimpleActivity implements BaseView {
 
     @Inject
     protected T mPresenter;
-    protected Activity mContext;
-    private Unbinder mUnBinder;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(getLayout());
-        mUnBinder = ButterKnife.bind(this);
-        mContext = this;
-        initInject();
-        if (mPresenter != null)
-            mPresenter.attachView(this);
-        App.getInstance().addActivity(this);
-        initEventAndData();
-    }
-
-    protected void setToolBar(Toolbar toolbar, String title) {
-        toolbar.setTitle(title);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setDisplayShowHomeEnabled(true);
-        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                onBackPressedSupport();
-            }
-        });
-    }
 
     protected ActivityComponent getActivityComponent(){
         return  DaggerActivityComponent.builder()
@@ -68,13 +31,19 @@ protected ActivityModule getActivityModule(){
         return new ActivityModule(this);
     }
 
+    @Override
+    protected void onViewCreated() {
+        super.onViewCreated();
+        initInject();
+        if (mPresenter != null)
+            mPresenter.attachView(this);
+    }
+
     @Override
     protected void onDestroy() {
-        super.onDestroy();
         if (mPresenter != null)
             mPresenter.detachView();
-        mUnBinder.unbind();
-        App.getInstance().removeActivity(this);
+        super.onDestroy();
     }
 
     @Override
@@ -107,6 +76,4 @@ public void stateMain() {
     }
 
     protected abstract void initInject();
-    protected abstract int getLayout();
-    protected abstract void initEventAndData();
 }
diff --git a/app/src/main/java/com/codeest/geeknews/base/BaseFragment.java b/app/src/main/java/com/codeest/geeknews/base/BaseFragment.java
@@ -1,10 +1,7 @@
 package com.codeest.geeknews.base;
 
-import android.app.Activity;
-import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -16,30 +13,14 @@
 
 import javax.inject.Inject;
 
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-import me.yokeyword.fragmentation.SupportFragment;
-
 /**
  * Created by codeest on 2016/8/2.
  * MVP Fragment基类
  */
-public abstract class BaseFragment<T extends BasePresenter> extends SupportFragment implements BaseView{
+public abstract class BaseFragment<T extends BasePresenter> extends SimpleFragment implements BaseView {
 
     @Inject
     protected T mPresenter;
-    protected View mView;
-    protected Activity mActivity;
-    protected Context mContext;
-    private Unbinder mUnBinder;
-    protected boolean isInited = false;
-
-    @Override
-    public void onAttach(Context context) {
-        mActivity = (Activity) context;
-        mContext = context;
-        super.onAttach(context);
-    }
 
     protected FragmentComponent getFragmentComponent(){
         return DaggerFragmentComponent.builder()
@@ -52,46 +33,17 @@ protected FragmentModule getFragmentModule(){
         return new FragmentModule(this);
     }
 
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        mView = inflater.inflate(getLayoutId(), null);
-        initInject();
-        return mView;
-    }
-
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
+        initInject();
         mPresenter.attachView(this);
-        mUnBinder = ButterKnife.bind(this, view);
-        if (savedInstanceState == null) {
-            if (!isHidden()) {
-                isInited = true;
-                initEventAndData();
-            }
-        } else {
-            if (!isSupportHidden()) {
-                isInited = true;
-                initEventAndData();
-            }
-        }
-    }
-
-    @Override
-    public void onHiddenChanged(boolean hidden) {
-        super.onHiddenChanged(hidden);
-        if (!isInited && !hidden) {
-            isInited = true;
-            initEventAndData();
-        }
+        super.onViewCreated(view, savedInstanceState);
     }
 
     @Override
     public void onDestroyView() {
-        super.onDestroyView();
         if (mPresenter != null) mPresenter.detachView();
-        mUnBinder.unbind();
+        super.onDestroyView();
     }
 
     @Override
@@ -120,6 +72,4 @@ public void stateMain() {
     }
 
     protected abstract void initInject();
-    protected abstract int getLayoutId();
-    protected abstract void initEventAndData();
 }
diff --git a/app/src/main/java/com/codeest/geeknews/base/SimpleActivity.java b/app/src/main/java/com/codeest/geeknews/base/SimpleActivity.java
@@ -28,6 +28,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(getLayout());
         mUnBinder = ButterKnife.bind(this);
         mContext = this;
+        onViewCreated();
         App.getInstance().addActivity(this);
         initEventAndData();
     }
@@ -45,6 +46,10 @@ public void onClick(View view) {
         });
     }
 
+    protected void onViewCreated() {
+
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

diff --git a/app/src/main/java/com/codeest/geeknews/base/SimpleFragment.java b/app/src/main/java/com/codeest/geeknews/base/SimpleFragment.java
@@ -23,7 +23,7 @@ public abstract class SimpleFragment extends SupportFragment {
     protected Activity mActivity;
     protected Context mContext;
     private Unbinder mUnBinder;
-    private boolean isInited = false;
+    protected boolean isInited = false;
 
     @Override
     public void onAttach(Context context) {