整理代码

Author: Othershe

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     package="com.otherhshe.niceread">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
         android:name=".NiceReadApplication"
@@ -25,8 +26,9 @@
 
         <activity android:name=".ui.activity.GankDetailActivity" />
         <activity android:name=".ui.activity.GirlDetailActivity" />
+        <activity android:name=".ui.activity.SetActivity" />
 
-        <service android:name=".sevice.DataService"/>
+        <service android:name=".sevice.DataService" />
     </application>
 
 </manifest>

app/src/main/java/com/otherhshe/niceread/presenter/GankItemPresenter.java

@@ -1,6 +1,7 @@
 package com.otherhshe.niceread.presenter;
 
 import com.otherhshe.niceread.data.GankItemData;
+import com.otherhshe.niceread.model.IGankItemModel;
 import com.otherhshe.niceread.model.impl.GankItemModelImpl;
 import com.otherhshe.niceread.rx.RxManager;
 import com.otherhshe.niceread.rx.RxSubscriber;
@@ -13,7 +14,7 @@
  * Time: 2016/8/12 14:29
  */
 public class GankItemPresenter extends BasePresenter<GankItemView> {
-    private GankItemModelImpl mModel;
+    private IGankItemModel mModel;
 
     public GankItemPresenter() {
         mModel = new GankItemModelImpl();

app/src/main/java/com/otherhshe/niceread/presenter/GirlDetailPresenter.java

@@ -1,5 +1,6 @@
 package com.otherhshe.niceread.presenter;
 
+import com.otherhshe.niceread.model.IGirlDetailModel;
 import com.otherhshe.niceread.model.impl.GirlDetailModelImpl;
 import com.otherhshe.niceread.rx.RxManager;
 import com.otherhshe.niceread.rx.RxSubscriber;
@@ -11,7 +12,7 @@
  * Time: 2016/8/12 14:29
  */
 public class GirlDetailPresenter extends BasePresenter<GirlDetailView> {
-    private GirlDetailModelImpl mModel;
+    private IGirlDetailModel mModel;
 
     public GirlDetailPresenter() {
         mModel = new GirlDetailModelImpl();

app/src/main/java/com/otherhshe/niceread/presenter/GirlItemPresenter.java

@@ -1,5 +1,6 @@
 package com.otherhshe.niceread.presenter;
 
+import com.otherhshe.niceread.model.IGirlItemModel;
 import com.otherhshe.niceread.model.impl.GirlItemModelImpl;
 import com.otherhshe.niceread.rx.RxManager;
 import com.otherhshe.niceread.rx.RxSubscriber;
@@ -11,7 +12,7 @@
  * Time: 2016/8/12 14:29
  */
 public class GirlItemPresenter extends BasePresenter<GirlItemView> {
-    private GirlItemModelImpl mModel;
+    private IGirlItemModel mModel;
 
     public GirlItemPresenter() {
         mModel = new GirlItemModelImpl();

app/src/main/java/com/otherhshe/niceread/presenter/SplashPresenter.java

@@ -1,6 +1,7 @@
 package com.otherhshe.niceread.presenter;
 
 import com.otherhshe.niceread.data.SplashData;
+import com.otherhshe.niceread.model.ISplashModel;
 import com.otherhshe.niceread.model.impl.SplashModelImpl;
 import com.otherhshe.niceread.rx.RxManager;
 import com.otherhshe.niceread.rx.RxSubscriber;
@@ -11,7 +12,7 @@
  * Time:  2016/8/11 11:26
  */
 public class SplashPresenter extends BasePresenter<SplashView> {
-    private SplashModelImpl mModel;
+    private ISplashModel mModel;
 
     public SplashPresenter() {
         mModel = new SplashModelImpl();

app/src/main/java/com/otherhshe/niceread/ui/activity/BaseActivity.java

@@ -1,9 +1,14 @@
 package com.otherhshe.niceread.ui.activity;
 
 import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -31,11 +36,25 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mContext = this;
         mUnbinder = ButterKnife.bind(this);
 
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {//5.0 全透明状态栏
+            View decorView = getWindow().getDecorView();
+            int option = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
+            decorView.setSystemUiVisibility(option);
+            getWindow().setNavigationBarColor(Color.TRANSPARENT);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {//4.4 全透明状态栏
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+
+
         initData();
 
         initView();
     }
 
+
     @Override
     protected void onDestroy() {
         mUnbinder.unbind();

app/src/main/java/com/otherhshe/niceread/ui/activity/MainActivity.java

@@ -1,5 +1,6 @@
 package com.otherhshe.niceread.ui.activity;
 
+import android.content.Intent;
 import android.os.Handler;
 import android.support.design.widget.NavigationView;
 import android.support.v4.app.FragmentTransaction;
@@ -96,12 +97,11 @@ public boolean onNavigationItemSelected(MenuItem item) {
                     case R.id.nav_girl:
                         doReplace(ResourceUtil.resToStr(mContext, R.string.girl));
                         break;
-                    case R.id.nav_video:
-                        doReplace(ResourceUtil.resToStr(mContext, R.string.video));
-                        break;
                     case R.id.nav_share:
+
                         break;
                     case R.id.nav_set:
+                        openSet();
                         break;
                     case R.id.nav_about:
                         break;
@@ -126,6 +126,11 @@ private void replaceFragment(BaseFragment fragment, String tag) {
         transaction.commit();
     }
 
+    private void openSet() {
+        Intent intent = new Intent(mContext, SetActivity.class);
+        startActivity(intent);
+    }
+
     @Override
     public void onBackPressed() {
         if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {

app/src/main/java/com/otherhshe/niceread/ui/activity/SetActivity.java

@@ -1,18 +1,38 @@
 package com.otherhshe.niceread.ui.activity;
 
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+
+import com.otherhshe.niceread.R;
+
+import butterknife.BindView;
+
 /**
  * Author: Othershe
  * Time: 2016/8/22 17:45
  */
 public class SetActivity extends BaseActivity {
+    @BindView(R.id.set_toolbar)
+    Toolbar mToolbar;
+
     @Override
     protected int initLayoutId() {
-        return 0;
+        return R.layout.activity_set;
     }
 
     @Override
     protected void initView() {
+        setSupportActionBar(mToolbar);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
 
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
     }
 
     @Override

app/src/main/java/com/otherhshe/niceread/ui/activity/SplashActivity.java

@@ -7,8 +7,12 @@
 import com.otherhshe.niceread.R;
 import com.otherhshe.niceread.data.SplashData;
 import com.otherhshe.niceread.presenter.SplashPresenter;
+import com.otherhshe.niceread.ui.fragemnt.SetFragment;
 import com.otherhshe.niceread.ui.view.SplashView;
+import com.otherhshe.niceread.utils.DateUtil;
 import com.otherhshe.niceread.utils.ImageLoader;
+import com.otherhshe.niceread.utils.NetUtil;
+import com.otherhshe.niceread.utils.SPUtil;
 
 import butterknife.BindView;
 
@@ -17,6 +21,8 @@
  * Time:  2016/8/11 11:22
  */
 public class SplashActivity extends BaseMvpActivity<SplashView, SplashPresenter> implements SplashView {
+    private String mTimeLine;
+
     @BindView(R.id.splash_iv)
     ImageView mSplashIv;
 
@@ -27,7 +33,9 @@ protected SplashPresenter initPresenter() {
 
     @Override
     protected void fetchData() {
-        mPresenter.getSplashPic();
+        if (!DateUtil.formatDate().equals(mTimeLine)) {
+            mPresenter.getSplashPic();
+        }
     }
 
     @Override
@@ -37,18 +45,32 @@ protected int initLayoutId() {
 
     @Override
     protected void initView() {
+        if (!(Boolean) SPUtil.get(SetFragment.SPLASH, false) || !NetUtil.isConnected(mContext)) {
+            ImageLoader.load(mContext, R.drawable.original_splash, mSplashIv);
+        } else {
+            ImageLoader.load(mContext, (String) SPUtil.get("splash_url", ""), mSplashIv);
+        }
 
+        startDelay();
     }
 
     @Override
     protected void initData() {
-
+        mTimeLine = (String) SPUtil.get("splash_time", "");
     }
 
     @Override
     public void onSuccess(SplashData data) {
-        ImageLoader.load(mContext, data.getUrl(), mSplashIv);
+        SPUtil.save("splash_time", DateUtil.formatDate());
+        SPUtil.save("splash_url", data.getUrl());
+    }
+
+    @Override
+    public void onError() {
 
+    }
+
+    private void startDelay() {
         new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -58,9 +80,4 @@ public void run() {
             }
         }, 2000);
     }
-
-    @Override
-    public void onError() {
-        finish();
-    }
 }

app/src/main/java/com/otherhshe/niceread/ui/fragemnt/GankItemFragment.java

@@ -109,6 +109,11 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                 super.onScrollStateChanged(recyclerView, newState);
                 if (newState == RecyclerView.SCROLL_STATE_IDLE) {
                     mLastVisibleItemPosition = layoutManager.findLastVisibleItemPosition();
+                    //防止重复请求
+                    if (PAGE_COUNT == mTempPageCount) {
+                        return;
+                    }
+
                     if (mLastVisibleItemPosition > 0 && mLastVisibleItemPosition + 1 == mGankItemAdapter.getItemCount()) {
                         //已到达底部，开始加载更多
                         isLoadMore = true;

app/src/main/java/com/otherhshe/niceread/ui/fragemnt/GirlDetailFragment.java

@@ -18,20 +18,11 @@
 public class GirlDetailFragment extends BaseFragment {
     private static final String URL = "url";
 
-    private boolean mIsViewInitiated;
-    private boolean mIsVisibleToUser;
-    private boolean mIsDataInitiated;
-
     private String mUrl;
 
     @BindView(R.id.girl_detail_iv)
     PhotoView mImageView;
 
-    @OnClick(R.id.girl_detail_iv)
-    void onClic() {
-
-    }
-
     @Override
     protected int initLayoutId() {
         return R.layout.fragment_girl_detail;

app/src/main/java/com/otherhshe/niceread/ui/fragemnt/GirlItemFragment.java

@@ -104,6 +104,11 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                 super.onScrollStateChanged(recyclerView, newState);
 
                 int[] lastVisiblePositions = layoutManager.findLastVisibleItemPositions(new int[layoutManager.getSpanCount()]);
+                //防止重复请求
+                if (PAGE_COUNT == mTempPageCount) {
+                    return;
+                }
+
                 if (findMax(lastVisiblePositions) + 1 == mGirlItemAdapter.getItemCount() && mGirlItemAdapter.getItemCount() > 1) {
                     //已到达底部，开始加载更多
                     isLoadMore = true;

app/src/main/java/com/otherhshe/niceread/ui/fragemnt/SetFragment.java

@@ -0,0 +1,67 @@
+package com.otherhshe.niceread.ui.fragemnt;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+
+import com.otherhshe.niceread.R;
+import com.otherhshe.niceread.utils.FileUtil;
+
+import java.io.File;
+
+/**
+ * Author: Othershe
+ * Time: 2016/8/23 11:00
+ */
+public class SetFragment extends PreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
+    private static final String CLEAR_CACHE = "clear_cache";
+    public static final String SPLASH = "original_splash";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getPreferenceManager().setSharedPreferencesName("niceread");//设置参数与值保存文件
+        addPreferencesFromResource(R.xml.set_preference);
+
+        init();
+    }
+
+    private void init() {
+        Preference clearCache = findPreference(CLEAR_CACHE);
+        clearCache.setSummary(clearCache.getSummary() + getCacheSize());
+        clearCache.setOnPreferenceClickListener(this);
+
+        Preference splash = findPreference(SPLASH);
+        splash.setOnPreferenceChangeListener(this);
+    }
+
+    private String getCacheSize() {
+        File file = getActivity().getApplicationContext().getCacheDir();
+        return FileUtil.getFileSize(file);
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        switch (preference.getKey()) {
+            case CLEAR_CACHE:
+                openAppInfo(getActivity());
+                break;
+        }
+        return true;
+    }
+
+    public static void openAppInfo(Context context) {
+        Intent i = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        i.addCategory(Intent.CATEGORY_DEFAULT);
+        i.setData(Uri.parse("package:" + context.getApplicationContext().getPackageName()));
+        context.startActivity(i);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object o) {
+        return true;
+    }
+}