1、使用RxJava 2.x版重构项目

2、新增Retrofit的简要封装、错误代码、快速观察者、带loading效果快速观察者
3、使用RxLifeCycle2.x进行网络请求生命周期绑定去掉自己实现模式
4、新增Retrofit调用相关demo示例
5、升级部分第三方库版本
6、分包及类命名方式稍微调整
7、代码及资源增加注释

Author: AriesHoo

README.md

@@ -2,7 +2,7 @@
 --------------------------
 ## 简介：
 
-一个Android项目级快速开发框架,节约大部分写常用功能时间以实现更多项目业务功能及体验上的优化.在[RapidLib](https://github.com/MarnoDev/RapidLib)基础上加以大的修改与扩展.有问题欢迎issue。
+一个Android项目级快速开发框架,节约大部分写常用功能时间以实现更多项目业务功能及体验上的优化.有问题欢迎issue。
 
 [[Sample PC Download]](https://github.com/AriesHoo/FastLib/blob/master/apk/sample.apk)
 
@@ -23,11 +23,18 @@ allprojects {
 
 ```
 dependencies {
-     //compile 'com.github.AriesHoo:FastLib:1.0.3'
+     //compile 'com.github.AriesHoo:FastLib:2.0.0'
      compile 'com.github.AriesHoo:FastLib:${LATEST_VERSION}'
 }
 ```
 
+**compile集成**
+
+```
+compile project(':fastLib')
+
+```
+
 **包含第三方库**
 
 ```
@@ -42,35 +49,40 @@ dependencies {
     compile 'com.orhanobut:logger:2.1.1'
     //注解
     compile 'com.jakewharton:butterknife:8.8.1'
-    //retrofit+rxjava
-    compile 'io.reactivex:rxjava:1.1.6'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.squareup.retrofit2:retrofit:2.1.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+    //retrofit+rxjava 网络请求及数据解析相关
+    compile "io.reactivex.rxjava2:rxjava:2.1.3"
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    compile 'com.squareup.retrofit2:retrofit:2.3.0'
+    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
+    compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.8.0'
     compile 'com.google.code.gson:gson:2.8.1'
+
+    //处理rxjava内存泄漏-生命周期绑定
+    compile 'com.trello.rxlifecycle2:rxlifecycle-components:2.1.0'
     //万能适配器
-    compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.27'
+    compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.28'
     //滑动返回Activity
     compile 'cn.bingoogolapple:bga-swipebacklayout:1.1.0@aar'
     //快速Tab库
     compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar'
     //多状态视图切换
     compile 'com.github.MarnonDev:EasyStatusView:v1.0.3'
     //常用UI控件(TitleBarView、RadiusView等)
-    compile 'com.github.AriesHoo:UIWidget:1.8.0'
+    compile 'com.github.AriesHoo:UIWidget:v1.9.5'
     //下拉刷新库
-    compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.3'
+    compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.2'
     //页面事件交互
     compile 'org.simple:androideventbus:1.0.5.1'
     //webView库
-    compile 'com.just.agentweb:agentweb:1.2.6'
+    compile 'com.just.agentweb:agentweb:2.0.0'
 }
 ```
 
 ## 实现功能
 
-* [RxActivity](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/basis/RxActivity.java)与[RxFragment](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/basis/RxFragment.java)分别为FastLib所有Activity/Fragment基类:Retrofit请求与Activity、Fragment生命周期绑定,需要手动调用bindLifeCycle()方法
+* 网络请求与Activity/Fragment生命周期绑定--通过RxLifeCycle2.x
+* Retrofit2.x 网络请求简单封装
 * Basis开头是通用基类:[BasisActivity](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/basis/BasisActivity.java)和[BasisFragment](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/basis/BasisFragment.java)
 * Fast开头的是快速创建常见功能页面:[FastMainActivity](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/module/activity/FastMainActivity.java)-快速创建包含tab主Activity;[FastTitleActivity](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/module/activity/FastTitleActivity.java)-快速创建包含TitleBarView的Activity;[FastRefreshLoadActivity](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/module/activity/FastRefreshLoadActivity.java)-快速创建包含TitleBarView及下拉刷新、多状态切换的Activity;[FastWebActivity](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/module/activity/FastWebActivity.java)快速创建应用内webView的Activity;[FastTitleFragment](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/module/fragment/FastTitleFragment.java)-快速创建包含TitleBarView的Fragment;[FastRefreshLoadFragment](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/module/fragment/FastRefreshLoadFragment.java)-快速实现下拉刷新的Fragment;[FastTitleRefreshLoadFragment](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/module/fragment/FastTitleRefreshLoadFragment.java)-快速实现包含TitleBarView及下拉刷新与多状态切换Fragment
 * [FastApplication](https://github.com/AriesHoo/FastLib/blob/master/library/src/main/java/com/aries/library/fast/FastApplication.java):快速配置ToastUtil及滑动关闭Activity的Application可以根据需要继承(需要滑动关闭Activity需要参考初始化)
@@ -80,10 +92,10 @@ dependencies {
 * 创建支持手势返回的Activity:继承BasisActivity一行代码实现-参考[SwipeBackActivity](https://github.com/AriesHoo/FastLib/blob/master/app/src/main/java/com/aries/library/fast/demo/module/sample/SwipeBackActivity.java)
 * 沉浸式状态栏:继承FastTitleActivity/FastRefreshLoadActivity/FastWebActivity/FastTitleFragment/FastTitleRefreshLoadFragment 无需额外代码即可实现
 * 状态栏白底黑字模式:同沉浸式状态栏功能继承,只需重写父类实现接口isLightStatusBarEnable即可实现;MIUI V6、Flyme 4.0、Android 6.0以上:参考[UIWidget-StatusBarUtil](https://github.com/AriesHoo/UIWidget/blob/master/library/src/main/java/com/aries/ui/util/StatusBarUtil.java)
-* 快速创建圆角、全圆、按下、不可点击状态的EditText、FrameLayout、LinearLayout、RelativeLayout、TextView减少shape文件创建设置:参考库[UIWidget](https://github.com/AriesHoo/UIWidget)或简化版库[RadiusView](https://github.com/AriesHoo/RadiusView)
+* 快速创建圆角、全圆、按下、不可点击状态的TextView、EditText、FrameLayout、LinearLayout、RelativeLayout、TextView、RadioButton、CheckBox减少shape文件创建设置:参考库[UIWidget](https://github.com/AriesHoo/UIWidget)
 * Activity/Fragment 页面事件交互(支持设置TAG)
 * 万能适配器（ListView、GridView，RecyclerView):可添加多个Header和Footer
-* Fragment懒加载,Activity可见时加载
+* Fragment懒加载,Activity可见时加载--统一了普通Fragment及与ViewPager配合滑动的用户可见回调
 * 下拉刷新、上拉加载:支持多种效果的刷新头及自定义刷新头-参考库[SmartRefreshLayout](https://github.com/scwang90/SmartRefreshLayout)
 
 ## 注意事项
@@ -94,6 +106,7 @@ dependencies {
 
 ## 鸣谢
 
+* [RapidLib-来自改库的扩展](https://github.com/MarnoDev/RapidLib)
 * [ButterKnife-注解](https://github.com/JakeWharton/butterknife)
 * [Glide-图片加载](https://github.com/bumptech/glide)
 * [Logger-日志打印](https://github.com/orhanobut/logger)

apk/sample.apk

@@ -10,10 +10,11 @@ android {
         applicationId "com.aries.library.fast.demo"
         minSdkVersion ext.minSdkVersion
         targetSdkVersion ext.targetSdkVersion
-        versionCode 3
-        versionName "1.0.3"
+        versionCode 200
+        versionName "2.0.0"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        buildConfigField "String", "BASE_URL", "\"https://api.douban.com/\""
     }
     signingConfigs {
         release {
@@ -25,6 +26,7 @@ android {
     }
     buildTypes {
         debug {
+            //是否debug模式用于控制是否打印log等
             debuggable true
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -49,7 +51,8 @@ dependencies {
     compile project(':library')
     apt 'com.jakewharton:butterknife-compiler:8.8.1'
     compile 'cn.bingoogolapple:bga-banner:2.1.7@aar'
-    compile 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.3'
+    compile 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.2'
     //设置界面Item库
-    compile 'com.github.lygttpod:SuperTextView:2.1.0'
+    compile 'com.github.lygttpod:SuperTextView:2.1.3'
+    compile 'com.flyco.labelview:FlycoLabelView_Lib:1.0.2@aar'
 }

app/build.gradle

@@ -6,22 +6,26 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <!--AgentWeb 是默认启动定位-->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 
     <application
         android:name=".App"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:supportsRtl="true"
         android:persistent="true"
+        android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".module.main.SplashActivity"
+            android:name=".module.SplashActivity"
             android:theme="@style/AppTheme.NotTranslucent">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -32,11 +36,23 @@
         <activity
             android:name=".module.main.MainActivity"
             android:theme="@style/AppTheme.NotTranslucent"/>
-        <activity android:name=".module.main.WebViewActivity"/>
-        <activity android:name=".module.sample.SwipeBackActivity"/>
-        <activity android:name=".module.sample.ali.ALiPayMainActivity"/>
-        <activity android:name=".module.sample.news.NewsMainActivity"/>
-        <activity android:name=".module.main.ThirdLibraryActivity"/>
+        <!--应用内浏览器-->
+        <activity
+            android:name=".module.WebViewActivity"
+            android:configChanges="orientation|screenSize"
+            android:hardwareAccelerated="true"/>
+        <!--滑动返回Activity-微信效果-->
+        <activity android:name=".module.main.sample.SwipeBackActivity"/>
+        <!--QQ默认主题TitleBar样式-->
+        <activity android:name=".module.main.sample.QQTitleActivity"/>
+        <!--支付宝主界面效果-->
+        <activity android:name=".module.main.sample.ali.ALiPayMainActivity"/>
+        <!--腾讯新闻主界面效果-->
+        <activity android:name=".module.main.sample.news.NewsMainActivity"/>
+        <!--设置页-->
+        <activity android:name=".module.mine.SettingActivity"/>
+        <!--第三方库-->
+        <activity android:name=".module.mine.ThirdLibraryActivity"/>
     </application>
 
 </manifest>

app/src/main/AndroidManifest.xml

@@ -4,12 +4,16 @@
 
 import com.aries.library.fast.FastApplication;
 import com.aries.library.fast.manager.LoggerManager;
+import com.aries.library.fast.retrofit.FastRetrofit;
 import com.aries.library.fast.util.ToastUtil;
 
+import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * Created: AriesHoo on 2017/7/20 14:11
- * Function:
+ * Function: 基础配置Application
  * Desc:
  */
 public class App extends FastApplication {
@@ -20,7 +24,18 @@ public class App extends FastApplication {
     public void onCreate() {
         super.onCreate();
         mContext = getApplicationContext();
+        //测试关键header
+        Map<String, Object> header = new HashMap<>();
+        header.put("head", "head");
+        header.put("time", System.currentTimeMillis());
         LoggerManager.init(TAG, BuildConfig.DEBUG);
-        ToastUtil.init(mContext,true);
+        ToastUtil.init(mContext, true);
+        FastRetrofit.getInstance()
+                .setBaseUrl(BuildConfig.BASE_URL)
+                .trustAllSSL()//信任所有证书--也可设置useSingleSignedSSL(单向认证)或useBothSignedSSL(双向验证)
+                .setHeaders(header)//设置统一请求头
+                .setLogEnable(BuildConfig.DEBUG)//设置请求全局log-可设置tag及Level类型
+//                .setLogEnable(BuildConfig.DEBUG, TAG, HttpLoggingInterceptor.Level.BASIC)
+                .setTimeout(20);//设置统一超时--也可单独调用read/write/connect超时(可以设置时间单位TimeUnit)
     }
 }

app/src/main/java/com/aries/library/fast/demo/App.java

@@ -0,0 +1,38 @@
+package com.aries.library.fast.demo.adapter;
+
+import android.view.View;
+
+import com.aries.library.fast.demo.R;
+import com.aries.library.fast.demo.entity.SubjectsEntity;
+import com.aries.library.fast.manager.GlideManager;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.flyco.labelview.LabelView;
+
+/**
+ * Created: AriesHoo on 2017/8/23 17:01
+ * Function: 豆瓣电影适配器
+ * Desc:
+ */
+public class SubjectMovieAdapter extends BaseQuickAdapter<SubjectsEntity, BaseViewHolder> {
+
+    boolean isShowTop = false;
+
+    public SubjectMovieAdapter(boolean isShowTop) {
+        super(R.layout.item_subject_movie);
+        this.isShowTop = isShowTop;
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, SubjectsEntity item) {
+        helper.setText(R.id.tv_titleMovie, item.title)
+                .setText(R.id.tv_typeMovie, "题材:" + item.getGenres())
+                .setText(R.id.tv_yearMovie, "年份:" + item.year)
+                .setText(R.id.tv_directorMovie, "导演:" + item.getDirectors())
+                .setText(R.id.tv_castMovie, "主演:" + item.getCasts());
+        GlideManager.loadImg(item.images.large, helper.getView(R.id.iv_coverMovie));
+        LabelView labelView = helper.getView(R.id.lv_topMovie);
+        labelView.setText("Top" + (helper.getLayoutPosition() + 1));
+        labelView.setVisibility(isShowTop ? View.VISIBLE : View.GONE);
+    }
+}

app/src/main/java/com/aries/library/fast/demo/adapter/SubjectMovieAdapter.java

@@ -9,7 +9,7 @@
 
 /**
  * Created: AriesHoo on 2017/7/14 9:55
- * Function:
+ * Function: 描述性条目适配器
  * Desc:
  */
 public class WidgetAdapter extends BaseQuickAdapter<WidgetEntity, BaseViewHolder> {