YCVideoPlayer

YCVideoPlayerLib/src/main/java/org/yczbj/ycvideoplayerlib/AbsVideoPlayerController.java

@@ -11,6 +11,9 @@ import android.widget.ImageView;
 import java.util.ArrayList;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author yc
@@ -51,6 +54,7 @@ public abstract class AbsVideoPlayerController extends FrameLayout implements Vi
     private float mGestureDownBrightness;
     private int mGestureDownVolume;
     private long mNewPosition;
+    private ScheduledExecutorService pool;
 
 
     public AbsVideoPlayerController(Context context) {
@@ -167,6 +171,27 @@ public abstract class AbsVideoPlayerController extends FrameLayout implements Vi
      */
     protected void startUpdateProgressTimer() {
         cancelUpdateProgressTimer();
+        // Java并发，Timer的缺陷，用ScheduledExecutorService替代
+        /*if(pool==null){
+            pool = Executors.newScheduledThreadPool(1);
+            //pool = Executors.newSingleThreadScheduledExecutor();
+        }
+        if (mUpdateProgressTimerTask == null) {
+            mUpdateProgressTimerTask = new TimerTask() {
+                @Override
+                public void run() {
+                    AbsVideoPlayerController.this.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            updateProgress();
+                        }
+                    });
+                }
+            };
+        }
+        pool.scheduleWithFixedDelay(mUpdateProgressTimerTask,0,1000, TimeUnit.MILLISECONDS);*/
+
+
         if (mUpdateProgressTimer == null) {
             mUpdateProgressTimer = new Timer();
         }

YCVideoPlayerLib/src/main/java/org/yczbj/ycvideoplayerlib/VideoPlayer.java

@@ -248,16 +248,19 @@ public class VideoPlayer extends FrameLayout implements InterVideoPlayer{
     @Override
     public void restart() {
         if (mCurrentState == STATE_PAUSED) {
+            //如果是暂停状态，那么则继续播放
             mMediaPlayer.start();
             mCurrentState = STATE_PLAYING;
             mController.onPlayStateChanged(mCurrentState);
             VideoLogUtil.d("STATE_PLAYING");
         } else if (mCurrentState == STATE_BUFFERING_PAUSED) {
+            //如果是缓存暂停状态，那么则继续播放
             mMediaPlayer.start();
             mCurrentState = STATE_BUFFERING_PLAYING;
             mController.onPlayStateChanged(mCurrentState);
             VideoLogUtil.d("STATE_BUFFERING_PLAYING");
         } else if (mCurrentState == STATE_COMPLETED || mCurrentState == STATE_ERROR) {
+            //如果是完成播放或者播放错误，则重新播放
             mMediaPlayer.reset();
             openMediaPlayer();
         } else {

YCVideoPlayerLib/src/main/java/org/yczbj/ycvideoplayerlib/VideoPlayerController.java

@@ -626,6 +626,7 @@ public class VideoPlayerController extends AbsVideoPlayerController implements V
             mClarityDialog.show();
         } else if (v == mRetry) {
             //点击重试
+            //不论是否记录播放位置，都是从零开始播放
             mVideoPlayer.restart();
         } else if (v == mReplay) {
             //重新播放

YCVideoPlayerLib/src/main/res/layout/custom_video_player_error.xml

@@ -7,13 +7,13 @@
     android:background="@android:color/black"
     android:gravity="center"
     android:orientation="vertical"
-    android:visibility="gone">
+    android:visibility="visible">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="播放错误，请重试。"
         android:textColor="@android:color/white"
-        android:textSize="13sp"/>
+        android:textSize="12sp"/>
     <TextView
         android:id="@+id/retry"
         android:layout_width="wrap_content"

app/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "org.yczbj.ycvideoplayer"
         minSdkVersion 17
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 11
         versionName "1.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -27,28 +27,37 @@ android {
             abortOnError false
         }
     }
+
+    //为了解决第三方库重复打包了META_INF问题，替换为有冲突的依赖
+    packagingOptions {
+        exclude 'META-INF/rxjava.properties'
+    }
+
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     //官方库
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:support-v4:26.1.0'
+    compile 'com.android.support:recyclerview-v7:26.1.0'
+    compile 'com.android.support:design:26.1.0'
+    compile 'com.android.support:cardview-v7:26.1.0'
     compile 'com.android.support:support-annotations:25.3.1'
     compile 'com.android.support:multidex:1.0.1'
 
     //网络请求retrofit2+Rx
-    compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
-    compile 'com.squareup.okhttp3:okhttp:3.4.1'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
+    compile 'com.squareup.okhttp3:okhttp:3.9.0'
     compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
-    compile 'io.reactivex:rxandroid:1.1.0'
-    compile 'io.reactivex:rxjava:1.1.0'
-
+    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
+    //compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+    compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    //compile 'io.reactivex:rxandroid:1.2.1'
+    //compile 'io.reactivex:rxjava:1.2.3'
+    // RxJava 2
+    compile 'io.reactivex.rxjava2:rxjava:2.1.3'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
 
     //注解
     compile 'com.jakewharton:butterknife:7.0.1'                     //黄牛刀
@@ -67,7 +76,10 @@ dependencies {
         transitive = true
     }
     compile 'com.liulishuo.filedownloader:library:1.6.9'            //下载框架
-
+    compile 'com.trello.rxlifecycle2:rxlifecycle:2.2.1'             //RxLifecycle
+    compile 'com.trello.rxlifecycle2:rxlifecycle-components:2.2.1'
+    compile 'me.drakeet.multitype:multitype:3.4.0'                  //简化版 Adapter
+    compile 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.0.0'
 
     //自己封装的库，都有对应的案例项目【欢迎star】：https://github.com/yangchong211
     compile 'cn.yc:YCUtilsLib:1.5'                                  //公共类
@@ -78,6 +90,6 @@ dependencies {
     compile 'cn.yc:YCDialogLib:3.4'                                 //弹窗
     compile 'cn.yc:YCProgressLib:1.2'                               //进度条
     compile 'cn.yc:YCVideoPlayerLib:2.3'                            //播放器
-    //compile project(':YCVideoPlayerLib')
+//    compile project(':YCVideoPlayerLib')
 
 }

app/src/main/AndroidManifest.xml

@@ -28,109 +28,111 @@
         <activity android:name=".ui.home.view.activity.VideoPlayerJzActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.me.view.MeLoginActivity" />
-        <activity android:name=".ui.me.view.MeMemberActivity"/>
-        <activity android:name=".ui.me.view.MeCacheActivity"/>
-
+        <activity android:name=".ui.person.MeLoginActivity" />
+        <activity android:name=".ui.person.MeMemberActivity"/>
+        <activity android:name=".ui.person.MeCacheActivity"/>
+        <activity android:name=".ui.video.view.activity.VideoContentActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="portrait"/>
 
 
 
         <!--下面这些均是测试视频播放器-->
-        <activity android:name=".ui.test3.ui.activity.GlideCropActivity"/>
-        <activity android:name=".ui.test.TestActivity"
+        <activity android:name=".test.test3.ui.activity.GlideCropActivity"/>
+        <activity android:name=".test.test1.TestActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.first.TestFirstActivity"
+        <activity android:name=".test.test1.view.first.TestFirstActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.first.TestApiFirstActivity"
+        <activity android:name=".test.test1.view.first.TestApiFirstActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.first.TestApiSecondActivity"
+        <activity android:name=".test.test1.view.first.TestApiSecondActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.first.TestApiThreeActivity"
+        <activity android:name=".test.test1.view.first.TestApiThreeActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.first.TestApiFourActivity"
+        <activity android:name=".test.test1.view.first.TestApiFourActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.first.TestApiFiveActivity"
+        <activity android:name=".test.test1.view.first.TestApiFiveActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.first.TestApiSixActivity"
+        <activity android:name=".test.test1.view.first.TestApiSixActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.second.TestSecondActivity"
+        <activity android:name=".test.test1.view.second.TestSecondActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.second.TestListFirstActivity"
+        <activity android:name=".test.test1.view.second.TestListFirstActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.second.TestListSecondActivity"
+        <activity android:name=".test.test1.view.second.TestListSecondActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.second.TestListThirdActivity"
+        <activity android:name=".test.test1.view.second.TestListThirdActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.second.TestListFourActivity"
+        <activity android:name=".test.test1.view.second.TestListFourActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.second.TestListFiveActivity"
+        <activity android:name=".test.test1.view.second.TestListFiveActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.three.TestThreeActivity"
+        <activity android:name=".test.test1.view.three.TestThreeActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.three.TestTinyFirstActivity"
+        <activity android:name=".test.test1.view.three.TestTinyFirstActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.three.TestTinyThirdActivity"
+        <activity android:name=".test.test1.view.three.TestTinyThirdActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.three.TestTinyFourActivity"
+        <activity android:name=".test.test1.view.three.TestTinyFourActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.three.TestTinyFiveActivity"
+        <activity android:name=".test.test1.view.three.TestTinyFiveActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.four.TestFourActivity"
+        <activity android:name=".test.test1.view.four.TestFourActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.five.TestFiveActivity"
+        <activity android:name=".test.test1.view.five.TestFiveActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test.view.six.TestSixActivity"
+        <activity android:name=".test.test1.view.six.TestSixActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
 
-        <activity android:name=".ui.test2.TestMyActivity"
+        <activity android:name=".test.test2.TestMyActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test2.view.TestMyFirstActivity"
+        <activity android:name=".test.test2.view.TestMyFirstActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test2.view.TestMySecondActivity"
+        <activity android:name=".test.test2.view.TestMySecondActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test2.view.TestMyThirdActivity"
+        <activity android:name=".test.test2.view.TestMyThirdActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test2.view.TestMyFourActivity"
+        <activity android:name=".test.test2.view.TestMyFourActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test2.view.TestMyFiveActivity"
+        <activity android:name=".test.test2.view.TestMyFiveActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
-        <activity android:name=".ui.test2.view.TestMySixActivity"
+        <activity android:name=".test.test2.view.TestMySixActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="portrait"/>
 
-        <activity android:name=".ui.test3.ui.activity.DLSingleTestActivity"/>
-        <activity android:name=".ui.test3.ui.activity.DLHybridTestActivity"/>
-        <activity android:name=".ui.test3.ui.activity.DLManyTestActivity"/>
-        <activity android:name=".ui.test3.ui.activity.DLMyFileTestActivity"/>
-        <activity android:name=".ui.test3.ui.activity.DLNotificationTestActivity"/>
+        <activity android:name=".test.test3.ui.activity.DLSingleTestActivity"/>
+        <activity android:name=".test.test3.ui.activity.DLHybridTestActivity"/>
+        <activity android:name=".test.test3.ui.activity.DLManyTestActivity"/>
+        <activity android:name=".test.test3.ui.activity.DLMyFileTestActivity"/>
+        <activity android:name=".test.test3.ui.activity.DLNotificationTestActivity"/>
 
     </application>
 

app/src/main/java/org/yczbj/ycvideoplayer/api/constant/Constant.java

@@ -1,5 +1,7 @@
 package org.yczbj.ycvideoplayer.api.constant;
 
+import org.yczbj.ycvideoplayer.R;
+
 /**
  * Description:
  * Update:
@@ -25,5 +27,17 @@ public class Constant {
         int typeList5 = 11;          //list4
     }
 
+    public static final int SLIDABLE_DISABLE = 0;
+    public static final int SLIDABLE_EDGE = 1;
+    public static final int SLIDABLE_FULL = 2;
+
+    public static final int[] ICONS_DRAWABLES = new int[]{
+            R.mipmap.ic_launcher_circle,
+            R.mipmap.ic_launcher_rect,
+            R.mipmap.ic_launcher_square};
+
+    public static final String[] ICONS_TYPE = new String[]{"circle", "rect", "square"};
+
+    public static final String SP_NAME = "yc";
 
 }

app/src/main/java/org/yczbj/ycvideoplayer/api/http/InterceptorUtils.java → app/src/main/java/org/yczbj/ycvideoplayer/api/http/utils/InterceptorUtils.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.api.http;
+package org.yczbj.ycvideoplayer.api.http.utils;
 
 import android.util.Log;
 

app/src/main/java/org/yczbj/ycvideoplayer/api/http/video/VideoApi.java

@@ -0,0 +1,32 @@
+package org.yczbj.ycvideoplayer.api.http.video;
+
+import org.yczbj.ycvideoplayer.ui.video.model.bean.MultiNewsArticleBean;
+import org.yczbj.ycvideoplayer.ui.video.model.bean.VideoContentBean;
+
+import io.reactivex.Observable;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+import retrofit2.http.Url;
+
+
+public interface VideoApi {
+
+    /**
+     * 获取视频标题等信息
+     * http://is.snssdk.com/api/news/feed/v53/?category=subv_cute&refer=1&count=20&max_behot_time=1499321562&iid=11776029171&device_id=36394312781
+     */
+    @GET("http://is.snssdk.com/api/news/feed/v62/?iid=5034850950&device_id=6096495334&refer=1&count=20&aid=13")
+    Observable<MultiNewsArticleBean> getVideoArticle(
+            @Query("category") String category,
+            @Query("max_behot_time") String maxBehotTime);
+
+    /**
+     * 获取视频信息
+     * Api 生成较复杂 详情查看
+     * http://ib.365yg.com/video/urls/v/1/toutiao/mp4/视频ID?r=17位随机数&s=加密结果
+     */
+    @GET
+    Observable<VideoContentBean> getVideoContent(@Url String url);
+
+
+}

app/src/main/java/org/yczbj/ycvideoplayer/api/http/video/VideoModel.java

@@ -0,0 +1,43 @@
+package org.yczbj.ycvideoplayer.api.http.video;
+
+
+import org.yczbj.ycvideoplayer.api.manager.RetrofitWrapper;
+import org.yczbj.ycvideoplayer.ui.video.model.bean.MultiNewsArticleBean;
+import org.yczbj.ycvideoplayer.ui.video.model.bean.VideoContentBean;
+
+import io.reactivex.Observable;
+
+
+/**
+ * Created by PC on 2017/8/21.
+ * 作者：PC
+ */
+
+public class VideoModel {
+
+    private static VideoModel model;
+    private VideoApi mApiService;
+    private static final String HOST = "http://toutiao.com/";
+
+    private VideoModel() {
+        mApiService = RetrofitWrapper
+                .getInstance(HOST)
+                .create(VideoApi.class);
+    }
+
+    public static VideoModel getInstance(){
+        if(model == null) {
+            model = new VideoModel();
+        }
+        return model;
+    }
+
+    public Observable<MultiNewsArticleBean> getVideoArticle(String category, String maxBehotTime) {
+        return mApiService.getVideoArticle(category,maxBehotTime);
+    }
+
+    public Observable<VideoContentBean> getVideoContent(String url) {
+        return mApiService.getVideoContent(url);
+    }
+
+}

app/src/main/java/org/yczbj/ycvideoplayer/api/manager/RetrofitWrapper.java

@@ -5,7 +5,7 @@ import com.google.gson.FieldNamingStrategy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import org.yczbj.ycvideoplayer.api.http.InterceptorUtils;
+import org.yczbj.ycvideoplayer.api.http.utils.InterceptorUtils;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -27,7 +27,7 @@ import javax.net.ssl.X509TrustManager;
 
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
@@ -103,7 +103,7 @@ public class RetrofitWrapper {
                 .baseUrl(url)
                 //添加Gson转换器
                 .addConverterFactory(GsonConverterFactory.create(gson))
-                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
                 .client(build)
                 .build();
     }

app/src/main/java/org/yczbj/ycvideoplayer/base/AppManager.java

@@ -44,7 +44,7 @@ public class AppManager {
     /**
      * 添加Activity到堆栈
      */
-    void addActivity(Activity activity) {
+    public void addActivity(Activity activity) {
         if(activityStack == null){
             activityStack = new Stack<>();
         }
@@ -87,7 +87,7 @@ public class AppManager {
      * 移除指定的Activity
      * @param activity
      */
-    void removeActivity(Activity activity) {
+    public void removeActivity(Activity activity) {
         if (activity != null) {
             activityStack.remove(activity);
         }

app/src/main/java/org/yczbj/ycvideoplayer/base/BaseFragmentFactory.java

@@ -1,8 +1,8 @@
 package org.yczbj.ycvideoplayer.base;
 
-import org.yczbj.ycvideoplayer.ui.find.view.FindFragment;
+import org.yczbj.ycvideoplayer.ui.video.VideoFragment;
 import org.yczbj.ycvideoplayer.ui.home.view.fragment.HomeFragment;
-import org.yczbj.ycvideoplayer.ui.me.view.MeFragment;
+import org.yczbj.ycvideoplayer.ui.person.MeFragment;
 import org.yczbj.ycvideoplayer.ui.special.SpecialFragment;
 
 
@@ -21,7 +21,7 @@ public class BaseFragmentFactory {
     private static BaseFragmentFactory mInstance;
     private HomeFragment mHomeFragment;
     private SpecialFragment mSpecialFragment;
-    private FindFragment mFindFragment;
+    private VideoFragment mVideoFragment;
     private MeFragment mMeFragment;
 
     private BaseFragmentFactory() {}
@@ -62,15 +62,15 @@ public class BaseFragmentFactory {
     }
 
 
-    public FindFragment getFindFragment() {
-        if (mFindFragment == null) {
+    public VideoFragment getVideoFragment() {
+        if (mVideoFragment == null) {
             synchronized (BaseFragmentFactory.class) {
-                if (mFindFragment == null) {
-                    mFindFragment = new FindFragment();
+                if (mVideoFragment == null) {
+                    mVideoFragment = new VideoFragment();
                 }
             }
         }
-        return mFindFragment;
+        return mVideoFragment;
     }
 
 

app/src/main/java/org/yczbj/ycvideoplayer/base/BaseActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/base/mvp1/BaseActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.base;
+package org.yczbj.ycvideoplayer.base.mvp1;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -11,6 +11,8 @@ import android.view.WindowManager;
 import com.blankj.utilcode.util.NetworkUtils;
 import com.blankj.utilcode.util.ToastUtils;
 
+import org.yczbj.ycvideoplayer.base.AppManager;
+
 import butterknife.ButterKnife;
 
 /**
@@ -30,8 +32,10 @@ public abstract class BaseActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(getContentView());
         ButterKnife.bind(this);
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);              //避免切换横竖屏
-        AppManager.getAppManager().addActivity(this);                                   //将当前Activity添加到容器
+        //避免切换横竖屏
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        //将当前Activity添加到容器
+        AppManager.getAppManager().addActivity(this);
         initView();
         initListener();
         initData();
@@ -43,8 +47,10 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        initLeakCanary();             //测试内存泄漏，正式一定要隐藏
-        AppManager.getAppManager().removeActivity(this);                                //将当前Activity移除到容器
+        //测试内存泄漏，正式一定要隐藏
+        initLeakCanary();
+        //将当前Activity移除到容器
+        AppManager.getAppManager().removeActivity(this);
         //AppManager.getAppManager().finishActivity(this);
     }
 

app/src/main/java/org/yczbj/ycvideoplayer/base/BaseFragment.java → app/src/main/java/org/yczbj/ycvideoplayer/base/mvp1/BaseFragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.base;
+package org.yczbj.ycvideoplayer.base.mvp1;
 
 import android.content.Intent;
 import android.os.Bundle;

app/src/main/java/org/yczbj/ycvideoplayer/base/BasePresenter.java → app/src/main/java/org/yczbj/ycvideoplayer/base/mvp1/BasePresenter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.base;
+package org.yczbj.ycvideoplayer.base.mvp1;
 
 /**
  * ================================================

app/src/main/java/org/yczbj/ycvideoplayer/base/BaseView.java → app/src/main/java/org/yczbj/ycvideoplayer/base/mvp1/BaseView.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.base;
+package org.yczbj.ycvideoplayer.base.mvp1;
 
 
 /**

app/src/main/java/org/yczbj/ycvideoplayer/base/mvp2/BaseListFragment.java

@@ -0,0 +1,130 @@
+package org.yczbj.ycvideoplayer.base.mvp2;
+
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import com.pedaily.yc.ycdialoglib.toast.ToastUtil;
+import org.yczbj.ycvideoplayer.R;
+import org.yczbj.ycvideoplayer.model.LoadingEndBean;
+import org.yczbj.ycvideoplayer.util.SettingUtil;
+import io.reactivex.Observable;
+import io.reactivex.annotations.NonNull;
+import io.reactivex.functions.Consumer;
+import me.drakeet.multitype.Items;
+import me.drakeet.multitype.MultiTypeAdapter;
+
+
+public abstract class BaseListFragment<T extends IBasePresenter> extends LazyLoadFragment<T> implements IBaseListView<T>, SwipeRefreshLayout.OnRefreshListener {
+
+    public static final String TAG = "BaseListFragment";
+    protected RecyclerView recyclerView;
+    protected SwipeRefreshLayout swipeRefreshLayout;
+    protected MultiTypeAdapter adapter;
+    protected Items oldItems = new Items();
+    protected boolean canLoadMore = false;
+    protected Observable<Integer> observable;
+
+    @Override
+    protected int attachLayoutId() {
+        return R.layout.base_refresh_recycler_view;
+    }
+
+    @Override
+    protected void initView(View view) {
+        recyclerView = view.findViewById(R.id.recyclerView);
+        recyclerView.setHasFixedSize(true);
+        swipeRefreshLayout = view.findViewById(R.id.refresh);
+        swipeRefreshLayout.setColorSchemeColors(SettingUtil.getInstance().getColor());
+        swipeRefreshLayout.setOnRefreshListener(this);
+    }
+
+    @Override
+    public void onShowLoading() {
+        swipeRefreshLayout.post(new Runnable() {
+            @Override
+            public void run() {
+                swipeRefreshLayout.setRefreshing(true);
+            }
+        });
+    }
+
+    @Override
+    public void onHideLoading() {
+        swipeRefreshLayout.post(new Runnable() {
+            @Override
+            public void run() {
+                swipeRefreshLayout.setRefreshing(false);
+            }
+        });
+    }
+
+    @Override
+    public void fetchData() {
+        observable = RxBus.getInstance().register(BaseListFragment.TAG);
+        observable.subscribe(new Consumer<Integer>() {
+            @Override
+            public void accept(@NonNull Integer integer) throws Exception {
+                adapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+    @Override
+    public void onShowNetError() {
+        ToastUtil.showToast(getActivity(),getString(R.string.network_error));
+        getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                adapter.setItems(new Items());
+                adapter.notifyDataSetChanged();
+                canLoadMore = false;
+            }
+        });
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        // 设置下拉刷新的按钮的颜色
+        swipeRefreshLayout.setColorSchemeColors(SettingUtil.getInstance().getColor());
+    }
+
+    @Override
+    public void onShowNoMore() {
+        getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (oldItems.size() > 0) {
+                    Items newItems = new Items(oldItems);
+                    newItems.remove(newItems.size() - 1);
+                    newItems.add(new LoadingEndBean());
+                    adapter.setItems(newItems);
+                    adapter.notifyDataSetChanged();
+                } else if (oldItems.size() == 0) {
+                    oldItems.add(new LoadingEndBean());
+                    adapter.setItems(oldItems);
+                    adapter.notifyDataSetChanged();
+                }
+                canLoadMore = false;
+            }
+        });
+    }
+
+    @Override
+    public void onRefresh() {
+        int firstVisibleItemPosition = ((LinearLayoutManager) recyclerView.getLayoutManager()).findFirstVisibleItemPosition();
+        if (firstVisibleItemPosition == 0) {
+            presenter.doRefresh();
+            return;
+        }
+        recyclerView.scrollToPosition(5);
+        recyclerView.smoothScrollToPosition(0);
+    }
+
+    @Override
+    public void onDestroy() {
+        RxBus.getInstance().unregister(BaseListFragment.TAG, observable);
+        super.onDestroy();
+    }
+}

app/src/main/java/org/yczbj/ycvideoplayer/base/mvp2/BaseMVPActivity.java

@@ -0,0 +1,110 @@
+package org.yczbj.ycvideoplayer.base.mvp2;
+
+import android.app.ActivityManager;
+import android.content.ComponentName;
+import android.content.pm.PackageManager;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+
+
+import com.trello.rxlifecycle2.components.support.RxAppCompatActivity;
+
+import org.yczbj.ycvideoplayer.R;
+import org.yczbj.ycvideoplayer.api.constant.Constant;
+import org.yczbj.ycvideoplayer.util.SettingUtil;
+
+
+public abstract class BaseMVPActivity extends RxAppCompatActivity {
+
+    private int iconType = -1;
+
+    /**
+     * 初始化 Toolbar
+     */
+    @SuppressWarnings("ConstantConditions")
+    protected void initToolBar(Toolbar toolbar, boolean homeAsUpEnabled, String title) {
+        toolbar.setTitle(title);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(homeAsUpEnabled);
+    }
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.iconType = SettingUtil.getInstance().getCustomIconValue();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        int color = SettingUtil.getInstance().getColor();
+        int drawable = Constant.ICONS_DRAWABLES[SettingUtil.getInstance().getCustomIconValue()];
+        if (getSupportActionBar() != null){
+            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color));
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            //getWindow().setStatusBarColor(CircleView.shiftColorDown(color));
+            // 最近任务栏上色
+            ActivityManager.TaskDescription tDesc = new ActivityManager.TaskDescription(
+                    getString(R.string.app_name),
+                    BitmapFactory.decodeResource(getResources(), drawable),
+                    color);
+            setTaskDescription(tDesc);
+            if (SettingUtil.getInstance().getNavBar()) {
+                //getWindow().setNavigationBarColor(CircleView.shiftColorDown(color));
+            } else {
+                getWindow().setNavigationBarColor(Color.BLACK);
+            }
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    @Override
+    public void onBackPressed() {
+        // Fragment 逐个出栈
+        int count = getSupportFragmentManager().getBackStackEntryCount();
+        if (count == 0) {
+            super.onBackPressed();
+        } else {
+            getSupportFragmentManager().popBackStack();
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        if (iconType != SettingUtil.getInstance().getCustomIconValue()) {
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    String act = ".SplashActivity_";
+                    for (String s : Constant.ICONS_TYPE) {
+                        getPackageManager().setComponentEnabledSetting(new ComponentName(BaseMVPActivity.this, getPackageName() + act + s),
+                                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                                PackageManager.DONT_KILL_APP);
+                    }
+                    act += Constant.ICONS_TYPE[SettingUtil.getInstance().getCustomIconValue()];
+                    getPackageManager().setComponentEnabledSetting(
+                            new ComponentName(BaseMVPActivity.this, getPackageName() + act),
+                            PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                            PackageManager.DONT_KILL_APP);
+                }
+            }).start();
+        }
+        super.onStop();
+    }
+}

app/src/main/java/org/yczbj/ycvideoplayer/base/mvp2/BaseMVPFragment.java

@@ -0,0 +1,65 @@
+package org.yczbj.ycvideoplayer.base.mvp2;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.trello.rxlifecycle2.LifecycleTransformer;
+import com.trello.rxlifecycle2.android.FragmentEvent;
+import com.trello.rxlifecycle2.components.support.RxFragment;
+
+
+public abstract class BaseMVPFragment<T extends IBasePresenter> extends RxFragment implements IBaseView<T> {
+
+    protected T presenter;
+
+    /**
+     * 绑定布局文件
+     *
+     * @return 布局文件ID
+     */
+    protected abstract int attachLayoutId();
+
+    /**
+     * 初始化视图控件
+     */
+    protected abstract void initView(View view);
+
+    /**
+     * 初始化数据
+     */
+    protected abstract void initData() throws NullPointerException;
+
+    /**
+     * 初始化 Toolbar
+     */
+    protected void initToolBar(Toolbar toolbar, boolean homeAsUpEnabled, String title) {
+        ((BaseMVPActivity) getActivity()).initToolBar(toolbar, homeAsUpEnabled, title);
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setPresenter(presenter);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(attachLayoutId(), container, false);
+        initView(view);
+        initData();
+        return view;
+    }
+
+    /**
+     * 绑定生命周期
+     */
+    @Override
+    public <T> LifecycleTransformer<T> bindToLife() {
+        return bindUntilEvent(FragmentEvent.DESTROY);
+    }
+}

app/src/main/java/org/yczbj/ycvideoplayer/base/mvp2/IBaseListView.java

@@ -0,0 +1,52 @@
+package org.yczbj.ycvideoplayer.base.mvp2;
+
+import com.trello.rxlifecycle2.LifecycleTransformer;
+
+import java.util.List;
+
+/**
+ * Created by Meiji on 2017/7/5.
+ */
+
+public interface IBaseListView<T> extends IBaseView<T> {
+
+    /**
+     * 显示加载动画
+     */
+    @Override
+    void onShowLoading();
+
+    /**
+     * 隐藏加载
+     */
+    @Override
+    void onHideLoading();
+
+    /**
+     * 显示网络错误
+     */
+    @Override
+    void onShowNetError();
+
+    /**
+     * 设置 presenter
+     */
+    @Override
+    void setPresenter(T presenter);
+
+    /**
+     * 绑定生命周期
+     */
+    @Override
+    <T> LifecycleTransformer<T> bindToLife();
+
+    /**
+     * 设置适配器
+     */
+    void onSetAdapter(List<?> list);
+
+    /**
+     * 加载完毕
+     */
+    void onShowNoMore();
+}

app/src/main/java/org/yczbj/ycvideoplayer/base/mvp2/IBasePresenter.java

@@ -0,0 +1,18 @@
+package org.yczbj.ycvideoplayer.base.mvp2;
+
+/**
+ * Created by Meiji on 2017/5/7.
+ */
+
+public interface IBasePresenter {
+
+    /**
+     * 刷新数据
+     */
+    void doRefresh();
+
+    /**
+     * 显示网络错误
+     */
+    void doShowNetError();
+}

app/src/main/java/org/yczbj/ycvideoplayer/base/mvp2/IBaseView.java

@@ -0,0 +1,32 @@
+package org.yczbj.ycvideoplayer.base.mvp2;
+
+
+import com.trello.rxlifecycle2.LifecycleTransformer;
+
+public interface IBaseView<T> {
+
+    /**
+     * 显示加载动画
+     */
+    void onShowLoading();
+
+    /**
+     * 隐藏加载
+     */
+    void onHideLoading();
+
+    /**
+     * 显示网络错误
+     */
+    void onShowNetError();
+
+    /**
+     * 设置 presenter
+     */
+    void setPresenter(T presenter);
+
+    /**
+     * 绑定生命周期
+     */
+    <T> LifecycleTransformer<T> bindToLife();
+}

app/src/main/java/org/yczbj/ycvideoplayer/base/mvp2/LazyLoadFragment.java

@@ -0,0 +1,54 @@
+package org.yczbj.ycvideoplayer.base.mvp2;
+
+import android.os.Bundle;
+
+/**
+ * ================================================
+ * 作    者：杨充
+ * 版    本：1.0
+ * 创建日期：2018/2/24
+ * 描    述：预加载
+ * 修订历史：
+ * ================================================
+ */
+public abstract class LazyLoadFragment<T extends IBasePresenter> extends BaseMVPFragment<T> {
+
+    protected boolean isViewInitiated;
+    protected boolean isVisibleToUser;
+    protected boolean isDataInitiated;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        isViewInitiated = true;
+        prepareFetchData();
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        this.isVisibleToUser = isVisibleToUser;
+        prepareFetchData();
+    }
+
+    public abstract void fetchData();
+
+    public boolean prepareFetchData() {
+        return prepareFetchData(false);
+    }
+
+    public boolean prepareFetchData(boolean forceUpdate) {
+        if (isVisibleToUser && isViewInitiated && (!isDataInitiated || forceUpdate)) {
+            fetchData();
+            isDataInitiated = true;
+            return true;
+        }
+        return false;
+    }
+
+}

app/src/main/java/org/yczbj/ycvideoplayer/base/mvp2/RxBus.java

@@ -0,0 +1,78 @@
+package org.yczbj.ycvideoplayer.base.mvp2;
+
+import android.support.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+import io.reactivex.Observable;
+import io.reactivex.subjects.PublishSubject;
+import io.reactivex.subjects.Subject;
+
+/**
+ * https://juejin.im/entry/58ff2e26a0bb9f0065d2c5f2
+ */
+
+public class RxBus {
+
+    private ConcurrentHashMap<Object, List<Subject>> subjectMapper = new ConcurrentHashMap<>();
+
+    private RxBus() {
+
+    }
+
+    @NonNull
+    public static RxBus getInstance() {
+        return Holder.instance;
+    }
+
+    @NonNull
+    public <T> Observable<T> register(@NonNull Class<T> clz) {
+        return register(clz.getName());
+    }
+
+    @NonNull
+    public <T> Observable<T> register(@NonNull Object tag) {
+        List<Subject> subjectList = subjectMapper.get(tag);
+        if (null == subjectList) {
+            subjectList = new ArrayList<>();
+            subjectMapper.put(tag, subjectList);
+        }
+
+        Subject<T> subject = PublishSubject.create();
+        subjectList.add(subject);
+        return subject;
+    }
+
+    public <T> void unregister(@NonNull Class<T> clz, @NonNull Observable observable) {
+        unregister(clz.getName(), observable);
+    }
+
+    public void unregister(@NonNull Object tag, @NonNull Observable observable) {
+        List<Subject> subjects = subjectMapper.get(tag);
+        if (null != subjects) {
+            subjects.remove(observable);
+            if (subjects.isEmpty()) {
+                subjectMapper.remove(tag);
+            }
+        }
+    }
+
+    public void post(@NonNull Object content) {
+        post(content.getClass().getName(), content);
+    }
+
+    public void post(@NonNull Object tag, @NonNull Object content) {
+        List<Subject> subjects = subjectMapper.get(tag);
+        if (!subjects.isEmpty()) {
+            for (Subject subject : subjects) {
+                subject.onNext(content);
+            }
+        }
+    }
+
+    private static class Holder {
+        private static RxBus instance = new RxBus();
+    }
+}

app/src/main/java/org/yczbj/ycvideoplayer/listener/OnLoadMoreListener.java

@@ -0,0 +1,42 @@
+package org.yczbj.ycvideoplayer.listener;
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+
+public abstract class OnLoadMoreListener extends RecyclerView.OnScrollListener {
+
+    private LinearLayoutManager layoutManager;
+    private int itemCount, lastPosition, lastItemCount;
+
+    public abstract void onLoadMore();
+
+    @Override
+    public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+        if (recyclerView.getLayoutManager() instanceof LinearLayoutManager) {
+            layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+            itemCount = layoutManager.getItemCount();
+            lastPosition = layoutManager.findLastCompletelyVisibleItemPosition();
+        } else {
+            Log.e("OnLoadMoreListener", "The OnLoadMoreListener only support LinearLayoutManager");
+            return;
+        }
+        if (lastItemCount != itemCount && lastPosition == itemCount - 1) {
+            lastItemCount = itemCount;
+            this.onLoadMore();
+        }
+    }
+
+    @Override
+    public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+        super.onScrollStateChanged(recyclerView, newState);
+        if (recyclerView.getLayoutManager() instanceof LinearLayoutManager) {
+            if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                if (!recyclerView.canScrollVertically(1)) {
+                    this.onLoadMore();
+                }
+            }
+        }
+    }
+
+}

app/src/main/java/org/yczbj/ycvideoplayer/model/LoadingBean.java

@@ -0,0 +1,5 @@
+package org.yczbj.ycvideoplayer.model;
+
+public class LoadingBean {
+
+}

app/src/main/java/org/yczbj/ycvideoplayer/model/LoadingEndBean.java

@@ -0,0 +1,6 @@
+package org.yczbj.ycvideoplayer.model;
+
+
+public class LoadingEndBean {
+
+}

app/src/main/java/org/yczbj/ycvideoplayer/model/Model.java

@@ -1,8 +0,0 @@
-package org.yczbj.ycvideoplayer.model;
-
-/**
- * Created by yc on 2018/2/23.
- */
-
-public class Model {
-}

app/src/main/java/org/yczbj/ycvideoplayer/model/binder/LoadingEndViewBinder.java

@@ -0,0 +1,34 @@
+package org.yczbj.ycvideoplayer.model.binder;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.yczbj.ycvideoplayer.R;
+import org.yczbj.ycvideoplayer.model.LoadingEndBean;
+
+import me.drakeet.multitype.ItemViewBinder;
+
+
+public class LoadingEndViewBinder extends ItemViewBinder<LoadingEndBean, LoadingEndViewBinder.ViewHolder> {
+
+    @NonNull
+    @Override
+    protected LoadingEndViewBinder.ViewHolder onCreateViewHolder(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
+        View view = inflater.inflate(R.layout.view_recycle_no_more, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    protected void onBindViewHolder(@NonNull ViewHolder holder, @NonNull LoadingEndBean item) {
+
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder {
+        ViewHolder(View itemView) {
+            super(itemView);
+        }
+    }
+}

app/src/main/java/org/yczbj/ycvideoplayer/model/binder/LoadingViewBinder.java

@@ -0,0 +1,51 @@
+package org.yczbj.ycvideoplayer.model.binder;
+
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.v4.graphics.drawable.DrawableCompat;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ProgressBar;
+
+import org.yczbj.ycvideoplayer.R;
+import org.yczbj.ycvideoplayer.model.LoadingBean;
+import org.yczbj.ycvideoplayer.util.SettingUtil;
+
+import me.drakeet.multitype.ItemViewBinder;
+
+
+public class LoadingViewBinder extends ItemViewBinder<LoadingBean, LoadingViewBinder.ViewHolder> {
+
+    @NonNull
+    @Override
+    protected LoadingViewBinder.ViewHolder onCreateViewHolder(@NonNull LayoutInflater inflater, @NonNull ViewGroup parent) {
+        View view = inflater.inflate(R.layout.view_recycle_loading, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    protected void onBindViewHolder(@NonNull ViewHolder holder, @NonNull LoadingBean item) {
+        int color = SettingUtil.getInstance().getColor();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            Drawable wrapDrawable = DrawableCompat.wrap(holder.progressBar.getIndeterminateDrawable());
+            DrawableCompat.setTint(wrapDrawable, color);
+            holder.progressBar.setIndeterminateDrawable(DrawableCompat.unwrap(wrapDrawable));
+        } else {
+            holder.progressBar.getIndeterminateDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);
+        }
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder {
+
+        private ProgressBar progressBar;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+            this.progressBar = itemView.findViewById(R.id.progress_footer);
+        }
+    }
+}

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/TestActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/TestActivity.java

@@ -1,24 +1,21 @@
-package org.yczbj.ycvideoplayer.ui.test;
+package org.yczbj.ycvideoplayer.test.test1;
 
-import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
-import android.widget.PopupWindow;
 
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.first.TestFirstActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.five.TestFiveActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.four.TestFourActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.second.TestSecondActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.six.TestSixActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.three.TestThreeActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.view.first.TestFirstActivity;
+import org.yczbj.ycvideoplayer.test.test1.view.five.TestFiveActivity;
+import org.yczbj.ycvideoplayer.test.test1.view.four.TestFourActivity;
+import org.yczbj.ycvideoplayer.test.test1.view.second.TestSecondActivity;
+import org.yczbj.ycvideoplayer.test.test1.view.six.TestSixActivity;
+import org.yczbj.ycvideoplayer.test.test1.view.three.TestThreeActivity;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.CustomView.MyJZVideoPlayerStandard;
 import cn.jzvd.JZUserAction;
 import cn.jzvd.JZUserActionStandard;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/model/VideoConstant.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/model/VideoConstant.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test.model;
+package org.yczbj.ycvideoplayer.test.test1.model;
 
 /**
  * Created by shengjun on 16/9/10.

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/first/TestApiFirstActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/first/TestApiFirstActivity.java

@@ -1,12 +1,10 @@
-package org.yczbj.ycvideoplayer.ui.test.view.first;
-
-import android.os.Bundle;
+package org.yczbj.ycvideoplayer.test.test1.view.first;
 
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
 import cn.jzvd.CustomView.JZVideoPlayerStandardAutoCompleteAfterFullscreen;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/first/TestApiFiveActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/first/TestApiFiveActivity.java

@@ -1,17 +1,15 @@
-package org.yczbj.ycvideoplayer.ui.test.view.first;
+package org.yczbj.ycvideoplayer.test.test1.view.first;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/first/TestApiFourActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/first/TestApiFourActivity.java

@@ -1,16 +1,14 @@
-package org.yczbj.ycvideoplayer.ui.test.view.first;
+package org.yczbj.ycvideoplayer.test.test1.view.first;
 
-import android.os.Bundle;
 import android.widget.LinearLayout;
 
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/first/TestApiSecondActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/first/TestApiSecondActivity.java

@@ -1,7 +1,7 @@
-package org.yczbj.ycvideoplayer.ui.test.view.first;
+package org.yczbj.ycvideoplayer.test.test1.view.first;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 
 /**
  * Description:

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/first/TestApiSixActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/first/TestApiSixActivity.java

@@ -1,20 +1,17 @@
-package org.yczbj.ycvideoplayer.ui.test.view.first;
+package org.yczbj.ycvideoplayer.test.test1.view.first;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.CustomMediaPlayer.CustomMediaPlayerAssertFolder;
 import cn.jzvd.CustomMediaPlayer.JZMediaIjkplayer;
 import cn.jzvd.JZMediaSystem;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/first/TestApiThreeActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/first/TestApiThreeActivity.java

@@ -1,16 +1,14 @@
-package org.yczbj.ycvideoplayer.ui.test.view.first;
+package org.yczbj.ycvideoplayer.test.test1.view.first;
 
 import android.content.pm.ActivityInfo;
-import android.os.Bundle;
 
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/first/TestFirstActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/first/TestFirstActivity.java

@@ -1,20 +1,18 @@
-package org.yczbj.ycvideoplayer.ui.test.view.first;
+package org.yczbj.ycvideoplayer.test.test1.view.first;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/five/TestFiveActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/five/TestFiveActivity.java

@@ -1,7 +1,6 @@
-package org.yczbj.ycvideoplayer.ui.test.view.five;
+package org.yczbj.ycvideoplayer.test.test1.view.five;
 
 import android.annotation.SuppressLint;
-import android.os.Bundle;
 import android.view.ViewGroup;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebView;
@@ -11,11 +10,10 @@ import android.widget.ProgressBar;
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.JZUtils;
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/four/TestFourActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/four/TestFourActivity.java

@@ -1,18 +1,15 @@
-package org.yczbj.ycvideoplayer.ui.test.view.four;
+package org.yczbj.ycvideoplayer.test.test1.view.four;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
-import android.widget.Toast;
 
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/second/TestFiveBean.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/second/TestFiveBean.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test.view.second;
+package org.yczbj.ycvideoplayer.test.test1.view.second;
 
 /**
  * Description:

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/second/TestListFirstActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/second/TestListFirstActivity.java

@@ -1,9 +1,8 @@
-package org.yczbj.ycvideoplayer.ui.test.view.second;
+package org.yczbj.ycvideoplayer.test.test1.view.second;
 
 import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
-import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,11 +13,10 @@ import android.widget.ListView;
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/second/TestListFiveActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/second/TestListFiveActivity.java

@@ -1,14 +1,13 @@
-package org.yczbj.ycvideoplayer.ui.test.view.second;
+package org.yczbj.ycvideoplayer.test.test1.view.second;
 
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
-import android.widget.Toast;
 
 import com.pedaily.yc.ycdialoglib.toast.ToastUtil;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayer.listener.OnListItemClickListener;
 
 import java.util.ArrayList;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/second/TestListFiveAdapter.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/second/TestListFiveAdapter.java

@@ -1,9 +1,7 @@
-package org.yczbj.ycvideoplayer.ui.test.view.second;
+package org.yczbj.ycvideoplayer.test.test1.view.second;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,7 +11,7 @@ import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.listener.OnListItemClickListener;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import java.util.List;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/second/TestListFourActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/second/TestListFourActivity.java

@@ -1,11 +1,11 @@
-package org.yczbj.ycvideoplayer.ui.test.view.second;
+package org.yczbj.ycvideoplayer.test.test1.view.second;
 
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 
 import butterknife.Bind;
 import cn.jzvd.JZMediaManager;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/second/TestListFourAdapter.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/second/TestListFourAdapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test.view.second;
+package org.yczbj.ycvideoplayer.test.test1.view.second;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -11,9 +11,7 @@ import android.view.ViewGroup;
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
-
-import java.util.List;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/second/TestListFragment.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/second/TestListFragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test.view.second;
+package org.yczbj.ycvideoplayer.test.test1.view.second;
 
 
 import android.os.Bundle;
@@ -11,7 +11,7 @@ import android.widget.AbsListView;
 import android.widget.ListView;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/second/TestListSecondActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/second/TestListSecondActivity.java

@@ -1,17 +1,15 @@
-package org.yczbj.ycvideoplayer.ui.test.view.second;
+package org.yczbj.ycvideoplayer.test.test1.view.second;
 
-import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayer.base.BasePagerAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.JZVideoPlayer;
 
 /**

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/second/TestListThirdActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/second/TestListThirdActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test.view.second;
+package org.yczbj.ycvideoplayer.test.test1.view.second;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@ import android.widget.TextView;
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
 import cn.jzvd.JZVideoPlayer;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/second/TestSecondActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/second/TestSecondActivity.java

@@ -1,19 +1,12 @@
-package org.yczbj.ycvideoplayer.ui.test.view.second;
+package org.yczbj.ycvideoplayer.test.test1.view.second;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.second.TestListFirstActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.second.TestListFiveActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.second.TestListFourActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.second.TestListSecondActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.second.TestListThirdActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 
 /**
  * Description:

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/six/TestSixActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/six/TestSixActivity.java

@@ -1,15 +1,11 @@
-package org.yczbj.ycvideoplayer.ui.test.view.six;
-
-import android.os.Bundle;
+package org.yczbj.ycvideoplayer.test.test1.view.six;
 
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.CustomView.JZVideoPlayerStandardAutoCompleteAfterFullscreen;
 import cn.jzvd.CustomView.JZVideoPlayerStandardShowTextureViewAfterAutoComplete;
 import cn.jzvd.CustomView.JZVideoPlayerStandardShowTitleAfterFullscreen;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/three/TestThreeActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/three/TestThreeActivity.java

@@ -1,17 +1,14 @@
-package org.yczbj.ycvideoplayer.ui.test.view.three;
+package org.yczbj.ycvideoplayer.test.test1.view.three;
 
-import android.content.Intent;
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/three/TestTinyFirstActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/three/TestTinyFirstActivity.java

@@ -1,8 +1,6 @@
-package org.yczbj.ycvideoplayer.ui.test.view.three;
+package org.yczbj.ycvideoplayer.test.test1.view.three;
 
 import android.content.Context;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,8 +11,8 @@ import android.widget.ListView;
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
 import cn.jzvd.JZVideoPlayer;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/three/TestTinyFiveActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/three/TestTinyFiveActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test.view.three;
+package org.yczbj.ycvideoplayer.test.test1.view.three;
 
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -7,16 +7,14 @@ import android.view.View;
 import com.pedaily.yc.ycdialoglib.toast.ToastUtil;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayer.listener.OnListItemClickListener;
-import org.yczbj.ycvideoplayer.ui.test.view.second.TestFiveBean;
+import org.yczbj.ycvideoplayer.test.test1.view.second.TestFiveBean;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.Bind;
-import cn.jzvd.JZMediaManager;
-import cn.jzvd.JZUtils;
 import cn.jzvd.JZVideoPlayer;
 
 /**

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/three/TestTinyFiveAdapter.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/three/TestTinyFiveAdapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test.view.three;
+package org.yczbj.ycvideoplayer.test.test1.view.three;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -11,8 +11,8 @@ import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.listener.OnListItemClickListener;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
-import org.yczbj.ycvideoplayer.ui.test.view.second.TestFiveBean;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
+import org.yczbj.ycvideoplayer.test.test1.view.second.TestFiveBean;
 
 import java.util.List;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/three/TestTinyFourActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/three/TestTinyFourActivity.java

@@ -1,15 +1,13 @@
-package org.yczbj.ycvideoplayer.ui.test.view.three;
+package org.yczbj.ycvideoplayer.test.test1.view.three;
 
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 
 import butterknife.Bind;
-import cn.jzvd.JZMediaManager;
-import cn.jzvd.JZUtils;
 import cn.jzvd.JZVideoPlayer;
 
 /**

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/three/TestTinyFourAdapter.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/three/TestTinyFourAdapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test.view.three;
+package org.yczbj.ycvideoplayer.test.test1.view.three;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -11,7 +11,7 @@ import android.view.ViewGroup;
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test/view/three/TestTinyThirdActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test1/view/three/TestTinyThirdActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test.view.three;
+package org.yczbj.ycvideoplayer.test.test1.view.three;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@ import android.widget.TextView;
 import com.squareup.picasso.Picasso;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test.model.VideoConstant;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test1.model.VideoConstant;
 
 import butterknife.Bind;
 import cn.jzvd.JZVideoPlayer;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/TestMyActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/TestMyActivity.java

@@ -1,19 +1,19 @@
-package org.yczbj.ycvideoplayer.ui.test2;
+package org.yczbj.ycvideoplayer.test.test2;
 
 import android.view.View;
 import android.widget.Button;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.me.view.MeLoginActivity;
-import org.yczbj.ycvideoplayer.ui.me.view.MeMemberActivity;
-import org.yczbj.ycvideoplayer.ui.test2.view.TestMyFirstActivity;
-import org.yczbj.ycvideoplayer.ui.test2.view.TestMyFiveActivity;
-import org.yczbj.ycvideoplayer.ui.test2.view.TestMyFourActivity;
-import org.yczbj.ycvideoplayer.ui.test2.view.TestMySecondActivity;
-import org.yczbj.ycvideoplayer.ui.test2.view.TestMySixActivity;
-import org.yczbj.ycvideoplayer.ui.test2.view.TestMyThirdActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.ui.person.MeLoginActivity;
+import org.yczbj.ycvideoplayer.ui.person.MeMemberActivity;
+import org.yczbj.ycvideoplayer.test.test2.view.TestMyFirstActivity;
+import org.yczbj.ycvideoplayer.test.test2.view.TestMyFiveActivity;
+import org.yczbj.ycvideoplayer.test.test2.view.TestMyFourActivity;
+import org.yczbj.ycvideoplayer.test.test2.view.TestMySecondActivity;
+import org.yczbj.ycvideoplayer.test.test2.view.TestMySixActivity;
+import org.yczbj.ycvideoplayer.test.test2.view.TestMyThirdActivity;
 import org.yczbj.ycvideoplayer.util.ImageUtil;
 import org.yczbj.ycvideoplayer.util.LogUtils;
 import org.yczbj.ycvideoplayerlib.ConstantKeys;
@@ -106,8 +106,6 @@ public class TestMyActivity extends BaseActivity implements View.OnClickListener
     public void initView() {
         //原始封装视频播放，没有设置登录状态和权限
         initVideo();
-        //设置登录和权限
-        initVideo7();
     }
 
     private void initVideo() {

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/base/HomeKeyWatcher.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/base/HomeKeyWatcher.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test2.base;
+package org.yczbj.ycvideoplayer.test.test2.base;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/model/Video.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/model/Video.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test2.model;
+package org.yczbj.ycvideoplayer.test.test2.model;
 
 /**
  * 视频

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/view/TestMyFirstActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/view/TestMyFirstActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test2.view;
+package org.yczbj.ycvideoplayer.test.test2.view;
 
 import android.os.Environment;
 import android.view.View;
@@ -8,7 +8,7 @@ import android.widget.Toast;
 import com.bumptech.glide.Glide;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayerlib.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.VideoPlayerController;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/view/TestMyFiveActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/view/TestMyFiveActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test2.view;
+package org.yczbj.ycvideoplayer.test.test2.view;
 
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
@@ -6,9 +6,9 @@ import android.support.v7.widget.RecyclerView;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test2.base.HomeKeyWatcher;
-import org.yczbj.ycvideoplayer.ui.test2.model.Video;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test2.base.HomeKeyWatcher;
+import org.yczbj.ycvideoplayer.test.test2.model.Video;
 import org.yczbj.ycvideoplayerlib.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.VideoPlayerManager;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/view/TestMyFourActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/view/TestMyFourActivity.java

@@ -1,7 +1,7 @@
-package org.yczbj.ycvideoplayer.ui.test2.view;
+package org.yczbj.ycvideoplayer.test.test2.view;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayerlib.VideoPlayerManager;
 
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/view/TestMyFourFragment.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/view/TestMyFourFragment.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test2.view;
+package org.yczbj.ycvideoplayer.test.test2.view;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -11,7 +11,7 @@ import android.view.ViewGroup;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.ui.test2.model.Video;
+import org.yczbj.ycvideoplayer.test.test2.model.Video;
 import org.yczbj.ycvideoplayerlib.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.VideoPlayerManager;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/view/TestMySecondActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/view/TestMySecondActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test2.view;
+package org.yczbj.ycvideoplayer.test.test2.view;
 
 import android.view.View;
 import android.widget.Button;
@@ -6,7 +6,7 @@ import android.widget.Button;
 import com.bumptech.glide.Glide;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayerlib.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.VideoPlayerManager;
 import org.yczbj.ycvideoplayerlib.VideoPlayerController;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/view/TestMySixActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/view/TestMySixActivity.java

@@ -1,7 +1,7 @@
-package org.yczbj.ycvideoplayer.ui.test2.view;
+package org.yczbj.ycvideoplayer.test.test2.view;
 
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayerlib.VideoPlayerManager;
 
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/view/TestMySixFragment.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/view/TestMySixFragment.java

@@ -1,12 +1,12 @@
-package org.yczbj.ycvideoplayer.ui.test2.view;
+package org.yczbj.ycvideoplayer.test.test2.view;
 
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseFragment;
-import org.yczbj.ycvideoplayer.ui.test2.model.Video;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseFragment;
+import org.yczbj.ycvideoplayer.test.test2.model.Video;
 import org.yczbj.ycvideoplayerlib.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.VideoPlayerManager;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/view/TestMyThirdActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/view/TestMyThirdActivity.java

@@ -1,12 +1,12 @@
-package org.yczbj.ycvideoplayer.ui.test2.view;
+package org.yczbj.ycvideoplayer.test.test2.view;
 
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test2.model.Video;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test2.model.Video;
 import org.yczbj.ycvideoplayerlib.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.VideoPlayerManager;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test2/view/VideoAdapter.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test2/view/VideoAdapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test2.view;
+package org.yczbj.ycvideoplayer.test.test2.view;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -6,10 +6,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.bumptech.glide.Glide;
-
 import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.ui.test2.model.Video;
+import org.yczbj.ycvideoplayer.test.test2.model.Video;
 import org.yczbj.ycvideoplayer.util.ImageUtil;
 import org.yczbj.ycvideoplayerlib.VideoPlayer;
 import org.yczbj.ycvideoplayerlib.VideoPlayerController;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/download/DLTasksManager.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/download/DLTasksManager.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.download;
+package org.yczbj.ycvideoplayer.test.test3.download;
 
 import android.text.TextUtils;
 import android.util.SparseArray;
@@ -11,8 +11,8 @@ import com.liulishuo.filedownloader.model.FileDownloadStatus;
 import com.liulishuo.filedownloader.util.FileDownloadUtils;
 
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.ui.test3.ui.activity.DLManyTestActivity;
-import org.yczbj.ycvideoplayer.ui.test3.ui.adapter.DLManyAdapter;
+import org.yczbj.ycvideoplayer.test.test3.ui.activity.DLManyTestActivity;
+import org.yczbj.ycvideoplayer.test.test3.ui.adapter.DLManyAdapter;
 
 import java.lang.ref.WeakReference;
 import java.util.List;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/download/DLTasksManagerDBController.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/download/DLTasksManagerDBController.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.download;
+package org.yczbj.ycvideoplayer.test.test3.download;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/download/DLTasksManagerDBOpenHelper.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/download/DLTasksManagerDBOpenHelper.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.download;
+package org.yczbj.ycvideoplayer.test.test3.download;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/download/DLTasksManagerModel.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/download/DLTasksManagerModel.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.download;
+package org.yczbj.ycvideoplayer.test.test3.download;
 
 import android.content.ContentValues;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/download2/DlCacheTasksManager.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/download2/DlCacheTasksManager.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.download2;
+package org.yczbj.ycvideoplayer.test.test3.download2;
 
 
 import android.text.TextUtils;
@@ -12,7 +12,7 @@ import com.liulishuo.filedownloader.model.FileDownloadStatus;
 import com.liulishuo.filedownloader.util.FileDownloadUtils;
 
 
-import org.yczbj.ycvideoplayer.ui.me.view.adapter.MeCacheAdapter;
+import org.yczbj.ycvideoplayer.ui.person.adapter.MeCacheAdapter;
 
 import java.lang.ref.WeakReference;
 import java.util.List;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/download2/DlTasksManager.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/download2/DlTasksManager.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.download2;
+package org.yczbj.ycvideoplayer.test.test3.download2;
 
 
 import android.text.TextUtils;
@@ -10,13 +10,10 @@ import com.liulishuo.filedownloader.FileDownloadConnectListener;
 import com.liulishuo.filedownloader.FileDownloader;
 import com.liulishuo.filedownloader.model.FileDownloadStatus;
 import com.liulishuo.filedownloader.util.FileDownloadUtils;
-import com.pedaily.yc.ycdialoglib.toast.ToastUtil;
 
-import org.yczbj.ycvideoplayer.download.TaskViewHolderImp;
-import org.yczbj.ycvideoplayer.ui.test3.ui.adapter.DlMyFileAdapter;
+import org.yczbj.ycvideoplayer.test.test3.ui.adapter.DlMyFileAdapter;
 
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/download2/DlTasksManagerDBController.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/download2/DlTasksManagerDBController.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.download2;
+package org.yczbj.ycvideoplayer.test.test3.download2;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -6,10 +6,8 @@ import android.text.TextUtils;
 
 import com.blankj.utilcode.util.ToastUtils;
 import com.liulishuo.filedownloader.util.FileDownloadUtils;
-import com.pedaily.yc.ycdialoglib.toast.ToastUtil;
 
 import org.yczbj.ycvideoplayer.base.BaseApplication;
-import org.yczbj.ycvideoplayer.ui.test3.download.DLTasksManagerModel;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/download2/DlTasksManagerDBOpenHelper.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/download2/DlTasksManagerDBOpenHelper.java

@@ -1,11 +1,9 @@
-package org.yczbj.ycvideoplayer.ui.test3.download2;
+package org.yczbj.ycvideoplayer.test.test3.download2;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import org.yczbj.ycvideoplayer.ui.test3.download.DLTasksManagerModel;
-
 /**
  * Created by yc on 2018/1/17.
  */

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/download2/DlTasksManagerModel.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/download2/DlTasksManagerModel.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.download2;
+package org.yczbj.ycvideoplayer.test.test3.download2;
 
 import android.content.ContentValues;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/model/api.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/model/api.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.model;
+package org.yczbj.ycvideoplayer.test.test3.model;
 
 /**
  * Created by yc on 2018/1/18.

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/ui/NotificationItem.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/ui/NotificationItem.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.ui;
+package org.yczbj.ycvideoplayer.test.test3.ui;
 
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -13,7 +13,7 @@ import com.liulishuo.filedownloader.util.FileDownloadHelper;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.ui.main.view.activity.MainActivity;
-import org.yczbj.ycvideoplayer.ui.test3.ui.activity.DLNotificationTestActivity;
+import org.yczbj.ycvideoplayer.test.test3.ui.activity.DLNotificationTestActivity;
 
 /**
  * Created by yc on 2018/1/17.

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/ui/activity/DLHybridTestActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/ui/activity/DLHybridTestActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.ui.activity;
+package org.yczbj.ycvideoplayer.test.test3.ui.activity;
 
 import android.annotation.SuppressLint;
 import android.text.Html;
@@ -16,7 +16,7 @@ import com.liulishuo.filedownloader.util.FileDownloadUtils;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 
 import java.io.File;
 import java.util.ArrayList;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/ui/activity/DLManyTestActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/ui/activity/DLManyTestActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.ui.activity;
+package org.yczbj.ycvideoplayer.test.test3.ui.activity;
 
 import android.graphics.Color;
 import android.os.Bundle;
@@ -13,12 +13,12 @@ import com.blankj.utilcode.util.SizeUtils;
 import org.yczbj.ycrefreshviewlib.item.RecycleViewItemLine;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayer.listener.OnItemLongClickListener;
 import org.yczbj.ycvideoplayer.listener.OnListItemClickListener;
-import org.yczbj.ycvideoplayer.ui.test3.download.DLTasksManager;
-import org.yczbj.ycvideoplayer.ui.test3.download.DLTasksManagerModel;
-import org.yczbj.ycvideoplayer.ui.test3.ui.adapter.DLManyAdapter;
+import org.yczbj.ycvideoplayer.test.test3.download.DLTasksManager;
+import org.yczbj.ycvideoplayer.test.test3.download.DLTasksManagerModel;
+import org.yczbj.ycvideoplayer.test.test3.ui.adapter.DLManyAdapter;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/ui/activity/DLMyFileTestActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/ui/activity/DLMyFileTestActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.ui.activity;
+package org.yczbj.ycvideoplayer.test.test3.ui.activity;
 
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -14,11 +14,11 @@ import com.pedaily.yc.ycdialoglib.bottomLayout.BottomDialogFragment;
 import org.yczbj.ycrefreshviewlib.item.RecycleViewItemLine;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayer.listener.OnListItemClickListener;
-import org.yczbj.ycvideoplayer.ui.me.view.MeCacheActivity;
-import org.yczbj.ycvideoplayer.ui.test3.download2.DlTasksManagerModel;
-import org.yczbj.ycvideoplayer.ui.test3.ui.adapter.DlMyFileAdapter;
+import org.yczbj.ycvideoplayer.ui.person.MeCacheActivity;
+import org.yczbj.ycvideoplayer.test.test3.download2.DlTasksManagerModel;
+import org.yczbj.ycvideoplayer.test.test3.ui.adapter.DlMyFileAdapter;
 import org.yczbj.ycvideoplayer.util.AppUtil;
 import org.yczbj.ycvideoplayerlib.VideoPlayer;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/ui/activity/DLNotificationTestActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/ui/activity/DLNotificationTestActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.ui.activity;
+package org.yczbj.ycvideoplayer.test.test3.ui.activity;
 
 import android.app.NotificationManager;
 import android.content.Context;
@@ -17,8 +17,8 @@ import com.liulishuo.filedownloader.util.FileDownloadUtils;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
-import org.yczbj.ycvideoplayer.ui.test3.ui.NotificationItem;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
+import org.yczbj.ycvideoplayer.test.test3.ui.NotificationItem;
 
 import java.io.File;
 import java.lang.ref.WeakReference;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/ui/activity/DLSingleTestActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/ui/activity/DLSingleTestActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.ui.activity;
+package org.yczbj.ycvideoplayer.test.test3.ui.activity;
 
 import android.annotation.SuppressLint;
 import android.view.View;
@@ -14,7 +14,7 @@ import com.pedaily.yc.ycdialoglib.toast.ToastUtil;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayer.util.LogUtils;
 
 import java.io.File;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/ui/activity/GlideCropActivity.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/ui/activity/GlideCropActivity.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.ui.activity;
+package org.yczbj.ycvideoplayer.test.test3.ui.activity;
 
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
@@ -16,7 +16,7 @@ import com.bumptech.glide.request.target.Target;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantImage;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayer.util.ImageCropUtils;
 import org.yczbj.ycvideoplayer.weight.HeightTransformation;
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/ui/adapter/DLManyAdapter.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/ui/adapter/DLManyAdapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.ui.adapter;
+package org.yczbj.ycvideoplayer.test.test3.ui.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -24,8 +24,8 @@ import org.yczbj.ycvideoplayer.base.BaseApplication;
 import org.yczbj.ycvideoplayer.download.TasksManager;
 import org.yczbj.ycvideoplayer.listener.OnItemLongClickListener;
 import org.yczbj.ycvideoplayer.listener.OnListItemClickListener;
-import org.yczbj.ycvideoplayer.ui.test3.download.DLTasksManager;
-import org.yczbj.ycvideoplayer.ui.test3.download.DLTasksManagerModel;
+import org.yczbj.ycvideoplayer.test.test3.download.DLTasksManager;
+import org.yczbj.ycvideoplayer.test.test3.download.DLTasksManagerModel;
 
 import java.io.File;
 import java.util.List;

app/src/main/java/org/yczbj/ycvideoplayer/ui/test3/ui/adapter/DlMyFileAdapter.java → app/src/main/java/org/yczbj/ycvideoplayer/test/test3/ui/adapter/DlMyFileAdapter.java

@@ -1,4 +1,4 @@
-package org.yczbj.ycvideoplayer.ui.test3.ui.adapter;
+package org.yczbj.ycvideoplayer.test.test3.ui.adapter;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -23,12 +23,9 @@ import com.pedaily.yc.ycdialoglib.toast.ToastUtil;
 
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.download.TasksManager;
-import org.yczbj.ycvideoplayer.download.TasksManagerModel;
 import org.yczbj.ycvideoplayer.listener.OnListItemClickListener;
-import org.yczbj.ycvideoplayer.ui.home.view.adapter.DownloadVideoAdapter;
-import org.yczbj.ycvideoplayer.ui.test3.download2.DlTasksManager;
-import org.yczbj.ycvideoplayer.ui.test3.download2.DlTasksManagerModel;
-import org.yczbj.ycvideoplayer.util.LogUtils;
+import org.yczbj.ycvideoplayer.test.test3.download2.DlTasksManager;
+import org.yczbj.ycvideoplayer.test.test3.download2.DlTasksManagerModel;
 
 import java.io.File;
 import java.lang.ref.WeakReference;

app/src/main/java/org/yczbj/ycvideoplayer/ui/find/view/FindFragment.java

@@ -1,63 +0,0 @@
-package org.yczbj.ycvideoplayer.ui.find.view;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import org.yczbj.ycvideoplayer.R;
-import org.yczbj.ycvideoplayer.base.BaseFragment;
-import org.yczbj.ycvideoplayer.ui.test.TestActivity;
-import org.yczbj.ycvideoplayer.ui.test2.TestMyActivity;
-
-import butterknife.Bind;
-import butterknife.ButterKnife;
-
-/**
- * @author yc
- * @date 2017/12/29
- */
-public class FindFragment extends BaseFragment implements View.OnClickListener {
-
-    @Bind(R.id.tv_1)
-    TextView tv1;
-    @Bind(R.id.tv_2)
-    TextView tv2;
-
-    @Override
-    public int getContentView() {
-        return R.layout.fragment_find;
-    }
-
-    @Override
-    public void initView() {
-
-    }
-
-    @Override
-    public void initListener() {
-        tv1.setOnClickListener(this);
-        tv2.setOnClickListener(this);
-    }
-
-    @Override
-    public void initData() {
-
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.tv_1:
-                startActivity(TestActivity.class);
-                break;
-            case R.id.tv_2:
-                startActivity(TestMyActivity.class);
-                break;
-            default:
-                break;
-        }
-    }
-
-}

app/src/main/java/org/yczbj/ycvideoplayer/ui/home/contract/HomeContract.java

@@ -1,10 +1,8 @@
 package org.yczbj.ycvideoplayer.ui.home.contract;
 
 
-import com.flyco.tablayout.listener.CustomTabEntity;
-
-import org.yczbj.ycvideoplayer.base.BasePresenter;
-import org.yczbj.ycvideoplayer.base.BaseView;
+import org.yczbj.ycvideoplayer.base.mvp1.BasePresenter;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseView;
 
 /**
  * ================================================

app/src/main/java/org/yczbj/ycvideoplayer/ui/home/contract/VideoPlayerJzContract.java

@@ -3,8 +3,8 @@ package org.yczbj.ycvideoplayer.ui.home.contract;
 
 import android.support.v7.app.AppCompatActivity;
 
-import org.yczbj.ycvideoplayer.base.BasePresenter;
-import org.yczbj.ycvideoplayer.base.BaseView;
+import org.yczbj.ycvideoplayer.base.mvp1.BasePresenter;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseView;
 import org.yczbj.ycvideoplayer.ui.home.model.VideoPlayerComment;
 
 import java.util.List;

app/src/main/java/org/yczbj/ycvideoplayer/ui/home/contract/VideoPlayerMeContract.java

@@ -3,10 +3,8 @@ package org.yczbj.ycvideoplayer.ui.home.contract;
 
 import android.support.v7.app.AppCompatActivity;
 
-import com.flyco.tablayout.listener.CustomTabEntity;
-
-import org.yczbj.ycvideoplayer.base.BasePresenter;
-import org.yczbj.ycvideoplayer.base.BaseView;
+import org.yczbj.ycvideoplayer.base.mvp1.BasePresenter;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseView;
 import org.yczbj.ycvideoplayer.ui.home.model.VideoPlayerComment;
 
 import java.util.List;

app/src/main/java/org/yczbj/ycvideoplayer/ui/home/presenter/HomePresenter.java

@@ -7,7 +7,9 @@ import com.flyco.tablayout.listener.CustomTabEntity;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.ui.home.contract.HomeContract;
 
-import rx.subscriptions.CompositeSubscription;
+import io.reactivex.CompletableEmitter;
+import io.reactivex.CompletableOnSubscribe;
+import io.reactivex.disposables.CompositeDisposable;
 
 
 /**
@@ -22,12 +24,11 @@ import rx.subscriptions.CompositeSubscription;
 public class HomePresenter implements HomeContract.Presenter {
 
     private HomeContract.View mView;
-    private CompositeSubscription mSubscriptions;
+    private CompositeDisposable mSubscriptions;
     private Activity activity;
 
     public HomePresenter(HomeContract.View androidView) {
         this.mView = androidView;
-        mSubscriptions = new CompositeSubscription();
     }
 
     @Override
@@ -38,7 +39,6 @@ public class HomePresenter implements HomeContract.Presenter {
 
     @Override
     public void unSubscribe() {
-        mSubscriptions.clear();
         if(activity!=null){
             activity = null;
         }

app/src/main/java/org/yczbj/ycvideoplayer/ui/home/presenter/VideoPlayerJzPresenter.java

@@ -10,7 +10,9 @@ import org.yczbj.ycvideoplayer.ui.home.model.VideoPlayerComment;
 import java.util.ArrayList;
 import java.util.List;
 
-import rx.subscriptions.CompositeSubscription;
+import io.reactivex.CompletableObserver;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
 
 
 /**
@@ -25,12 +27,12 @@ import rx.subscriptions.CompositeSubscription;
 public class VideoPlayerJzPresenter implements VideoPlayerJzContract.Presenter {
 
     private VideoPlayerJzContract.View mView;
-    private CompositeSubscription mSubscriptions;
+    private CompositeDisposable mSubscriptions;
     private Activity activity;
 
     public VideoPlayerJzPresenter(VideoPlayerJzContract.View androidView) {
         this.mView = androidView;
-        mSubscriptions = new CompositeSubscription();
+        mSubscriptions = new CompositeDisposable();
     }
 
     @Override

app/src/main/java/org/yczbj/ycvideoplayer/ui/home/presenter/VideoPlayerMePresenter.java

@@ -14,7 +14,7 @@ import org.yczbj.ycvideoplayer.ui.home.model.VideoPlayerComment;
 import java.util.ArrayList;
 import java.util.List;
 
-import rx.subscriptions.CompositeSubscription;
+import io.reactivex.disposables.CompositeDisposable;
 
 
 /**
@@ -29,12 +29,12 @@ import rx.subscriptions.CompositeSubscription;
 public class VideoPlayerMePresenter implements VideoPlayerMeContract.Presenter {
 
     private VideoPlayerMeContract.View mView;
-    private CompositeSubscription mSubscriptions;
+    private CompositeDisposable mSubscriptions;
     private Activity activity;
 
     public VideoPlayerMePresenter(VideoPlayerMeContract.View androidView) {
         this.mView = androidView;
-        mSubscriptions = new CompositeSubscription();
+        mSubscriptions = new CompositeDisposable();
     }
 
     @Override

app/src/main/java/org/yczbj/ycvideoplayer/ui/home/view/activity/VideoPlayerJzActivity.java

@@ -33,7 +33,7 @@ import org.yczbj.ycrefreshviewlib.item.RecycleViewItemLine;
 import org.yczbj.ycrefreshviewlib.item.SpaceViewItemLine;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayer.ui.home.contract.VideoPlayerJzContract;
 import org.yczbj.ycvideoplayer.ui.home.model.DialogListBean;
 import org.yczbj.ycvideoplayer.ui.home.model.VideoPlayerComment;
@@ -180,7 +180,7 @@ public class VideoPlayerJzActivity extends BaseActivity implements VideoPlayerJz
             @Override
             public View onCreateView(ViewGroup parent) {
                 return LayoutInflater.from(VideoPlayerJzActivity.this).inflate(
-                        R.layout.head_video_player, parent, false);
+                        R.layout.head_video_player_top, parent, false);
             }
 
 

app/src/main/java/org/yczbj/ycvideoplayer/ui/home/view/activity/VideoPlayerMeActivity.java

@@ -30,7 +30,7 @@ import org.yczbj.ycrefreshviewlib.item.RecycleViewItemLine;
 import org.yczbj.ycrefreshviewlib.item.SpaceViewItemLine;
 import org.yczbj.ycvideoplayer.R;
 import org.yczbj.ycvideoplayer.api.constant.ConstantVideo;
-import org.yczbj.ycvideoplayer.base.BaseActivity;
+import org.yczbj.ycvideoplayer.base.mvp1.BaseActivity;
 import org.yczbj.ycvideoplayer.ui.home.contract.VideoPlayerMeContract;
 import org.yczbj.ycvideoplayer.ui.home.model.DialogListBean;
 import org.yczbj.ycvideoplayer.ui.home.model.VideoPlayerComment;
@@ -39,8 +39,8 @@ import org.yczbj.ycvideoplayer.ui.home.presenter.VideoPlayerMePresenter;
 import org.yczbj.ycvideoplayer.ui.home.view.adapter.DialogListAdapter;
 import org.yczbj.ycvideoplayer.ui.home.view.adapter.NarrowImageAdapter;
 import org.yczbj.ycvideoplayer.ui.home.view.adapter.VideoPlayerMeAdapter;
-import org.yczbj.ycvideoplayer.ui.me.view.MeLoginActivity;
-import org.yczbj.ycvideoplayer.ui.test.view.second.TestSecondActivity;
+import org.yczbj.ycvideoplayer.ui.person.MeLoginActivity;
+import org.yczbj.ycvideoplayer.test.test1.view.second.TestSecondActivity;
 import org.yczbj.ycvideoplayer.util.AppUtil;
 import org.yczbj.ycvideoplayerlib.ConstantKeys;
 import org.yczbj.ycvideoplayerlib.OnMemberClickListener;
@@ -208,7 +208,7 @@ public class VideoPlayerMeActivity extends BaseActivity implements VideoPlayerMe
             @Override
             public View onCreateView(ViewGroup parent) {
                 return LayoutInflater.from(VideoPlayerMeActivity.this).inflate(
-                        R.layout.head_video_player, parent, false);
+                        R.layout.head_video_player_top, parent, false);
             }