androidx兼容，新版轮播图样式

admin

2021-04-07 edeef504e654415c25d3816a4609f43edc79fbb3

androidx兼容，新版轮播图样式

 BuWanVideo/AndroidManifest.xml

@@ -422,7 +422,7 @@
        <!--广点通广告-->
        <!-- targetSDKVersion >= 24时才需要添加这个provider。provider的authorities属性的值为${applicationId}.fileprovider，请开发者根据自己的${applicationId}来设置这个值，例如本例中applicationId为"com.qq.e.union.demo"。 -->
        <provider
            android:name="android.support.v4.content.FileProvider"
            android:name="androidx.core.content.FileProvider"
            android:authorities="com.doudou.ysvideo.fileprovider"
            android:exported="false"
            android:grantUriPermissions="true">

 BuWanVideo/build.gradle

@@ -2,8 +2,7 @@
apply plugin: 'com.huawei.agconnect'
dependencies {
    implementation project(':library-ViewPagerIndicator')
    implementation files('libs/SohuPlayerExtend_4.1.0_0_201606121225_open_release.jar')
    implementation 'com.android.support:appcompat-v7:27.1.1'
    implementation 'androidx.appcompat:appcompat:1.0.0'
    implementation files('libs/jg_filter_sdk_1.1.jar')
    implementation files('libs/wup-1.0.0.E-SNAPSHOT.jar')
    implementation files('libs/Xg_sdk_v2.46_20160602_1638.jar')
@@ -21,7 +20,7 @@
    implementation files('libs/phoneNumber-L-AuthSDK-2.12.0.aar')


    implementation 'com.android.support:recyclerview-v7:27.1.1'
    implementation 'androidx.recyclerview:recyclerview:1.0.0'
    implementation project(path: ':library-BaiduCPU')
    implementation project(path: ':library-DownloadProvider')
    implementation project(path: ':library-GDTSDK')
@@ -51,7 +50,7 @@
    implementation 'com.alibaba.sdk.android:AlibcTradeCommon:4.0.0.15@aar'
    implementation 'com.alibaba.sdk.android:AlibcTradeBiz:4.0.0.15@aar'
    implementation 'com.alibaba.sdk.android:nb_trade:4.0.0.15@aar'
    implementation 'com.android.support:cardview-v7:27.1.1'
    implementation 'androidx.cardview:cardview:1.0.0'


    //权限请求
@@ -60,6 +59,7 @@
    implementation project(path: ':library-VideoPlayer')
    implementation project(path: ':library-common')
    implementation project(path: ':library-push')
    implementation project(path: ':library-gallery')
    annotationProcessor 'com.github.jokermonn:permissions4m:2.1.2-processor'
    //微信SDK
    api 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
@@ -77,7 +77,7 @@
        }
    }
    useLibrary 'org.apache.http.legacy'
    compileSdkVersion 27
    compileSdkVersion 28
    buildToolsVersion '29.0.2'
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_7

 BuWanVideo/libs/SohuPlayerExtend_4.1.0_0_201606121225_open_release.jar

Binary files differ

 BuWanVideo/res/layout/activity_main.xml

@@ -188,7 +188,7 @@
    </FrameLayout>


    <android.support.v4.view.ViewPager
    <androidx.viewpager.widget.ViewPager
        android:id="@+id/pager"
        android:layout_width="match_parent"
        android:layout_height="0dp"

 BuWanVideo/res/layout/fragment_cate_recommend.xml

@@ -11,9 +11,9 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

        <android.support.v7.widget.RecyclerView
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/rv_category"
            android:layout_width="match_parent"
            android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
            android:layout_height="match_parent"></androidx.recyclerview.widget.RecyclerView>
    </com.weikou.beibeivideo.widget.MySwipeRefreshLayout>
</FrameLayout>

 BuWanVideo/res/layout/fragment_discover_top.xml

@@ -21,7 +21,7 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent">

            <android.support.v4.view.ViewPager
            <androidx.viewpager.widget.ViewPager
                android:id="@+id/vp_discover"
                android:layout_width="match_parent"
                android:layout_height="match_parent" />

 BuWanVideo/res/layout/fragment_episode.xml

@@ -132,13 +132,13 @@
        android:layout_height="wrap_content"
        android:descendantFocusability="blocksDescendants">

        <android.support.v7.widget.RecyclerView
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/rv_episode"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:minHeight="40dp"
            android:paddingTop="10dp"
            android:paddingBottom="10dp"></android.support.v7.widget.RecyclerView>
            android:paddingBottom="10dp"></androidx.recyclerview.widget.RecyclerView>
    </RelativeLayout>

</LinearLayout>

 BuWanVideo/res/layout/fragment_recommend_category.xml

@@ -15,7 +15,7 @@
        android:paddingBottom="8dp"></FrameLayout>
    

    <android.support.v4.view.ViewPager
    <androidx.viewpager.widget.ViewPager
        android:id="@+id/pager_recomend_category"
        android:layout_width="match_parent"
        android:layout_height="0dp"

 BuWanVideo/res/layout/fragment_search_suggest.xml

@@ -4,7 +4,7 @@
    android:layout_height="wrap_content"
    android:background="@color/transparent">

    <android.support.v7.widget.RecyclerView
    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/rv_suggest"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@@ -12,7 +12,7 @@
        android:layout_marginTop="2dp"
        android:layout_marginRight="18dp"
        android:layout_marginBottom="18dp"
        android:background="#DFDFDF"></android.support.v7.widget.RecyclerView>
        android:background="#DFDFDF"></androidx.recyclerview.widget.RecyclerView>


</FrameLayout>

 BuWanVideo/res/layout/item_cate_recommend_top.xml

@@ -17,7 +17,7 @@
            android:paddingLeft="8dp"
            android:paddingRight="8dp">

            <android.support.v4.view.ViewPager
            <androidx.viewpager.widget.ViewPager
                android:id="@+id/vp_recommend"
                android:layout_width="match_parent"
                android:layout_height="match_parent" />

 BuWanVideo/res/layout/item_follow2.xml

@@ -10,7 +10,7 @@
    android:padding="6.5dp">


    <android.support.v7.widget.CardView
    <androidx.cardview.widget.CardView
        android:layout_width="37dp"
        android:layout_height="37dp"
        android:layout_gravity="center_vertical"
@@ -23,7 +23,7 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:scaleType="centerCrop" />
    </android.support.v7.widget.CardView>
    </androidx.cardview.widget.CardView>


    <LinearLayout

 BuWanVideo/res/layout/item_recommend_home_type.xml

@@ -67,10 +67,10 @@
        </LinearLayout>


        <android.support.v7.widget.RecyclerView
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/rv_content"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
            android:layout_height="wrap_content"></androidx.recyclerview.widget.RecyclerView>


        <TextView

 BuWanVideo/res/layout/item_recyclerview.xml

@@ -3,13 +3,13 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content">

    <android.support.v7.widget.RecyclerView
    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/rv"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingLeft="6dp"
        android:paddingTop="3dp"
        android:paddingRight="6dp"
        android:paddingBottom="3dp"></android.support.v7.widget.RecyclerView>
        android:paddingBottom="3dp"></androidx.recyclerview.widget.RecyclerView>

</LinearLayout>

 BuWanVideo/res/layout/mvideo_activity.xml

@@ -88,7 +88,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"></FrameLayout>

    <android.support.v4.view.ViewPager
    <androidx.viewpager.widget.ViewPager
        android:id="@+id/pager"
        android:layout_width="match_parent"
        android:layout_height="0dp"

 BuWanVideo/res/layout/recommend_fragment.xml

@@ -30,12 +30,12 @@
            android:layout_height="match_parent">


            <android.support.v7.widget.RecyclerView
            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/rv_recommend"
                android:layout_width="match_parent"
                android:layout_height="match_parent">

            </android.support.v7.widget.RecyclerView>
            </androidx.recyclerview.widget.RecyclerView>


        </com.weikou.beibeivideo.widget.MySwipeRefreshLayout>

 BuWanVideo/res/layout/recommend_top.xml

@@ -3,15 +3,14 @@
    xmlns:app1="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical"
    android:paddingLeft="8dp"
    android:paddingRight="8dp">
    android:orientation="vertical">

    <!-- 首页顶部广告容器 -->

    <LinearLayout
        android:id="@+id/ll_ad_containner"
        android:layout_width="match_parent"
        android:background="@color/red"
        android:layout_height="wrap_content"></LinearLayout>

    <com.lcjian.library.widget.RatioLayout xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -24,22 +23,11 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent">

            <android.support.v4.view.ViewPager
            <com.lzj.gallery.library.views.BannerViewPager
                android:id="@+id/vp_recommend"
                android:layout_width="match_parent"
                android:layout_height="wrap_content" />
                android:layout_height="wrap_content"></com.lzj.gallery.library.views.BannerViewPager>


            <com.viewpagerindicator.CirclePageIndicator
                android:id="@+id/indicator_recommend"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_gravity="bottom"
                android:padding="10dip"
                app:fillColor="@color/banner_indicator_highlight_color"
                app:pageColor="#aaffffff"
                app:radius="5dp"
                app:strokeColor="#00000000" />

        </FrameLayout>
    </com.lcjian.library.widget.RatioLayout>

 BuWanVideo/res/layout/search_result_activity.xml

@@ -83,14 +83,14 @@
                android:layout_height="0dp"
                android:layout_weight="1">

                <android.support.v7.widget.RecyclerView
                <androidx.recyclerview.widget.RecyclerView
                    android:id="@+id/rv_video_search"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:background="@color/page_content_bg_color"
                    android:paddingLeft="10dp"
                    android:paddingTop="10dp"
                    android:paddingRight="10dp"></android.support.v7.widget.RecyclerView>
                    android:paddingRight="10dp"></androidx.recyclerview.widget.RecyclerView>
            </com.weikou.beibeivideo.widget.MySwipeRefreshLayout>

            <LinearLayout

 BuWanVideo/res/layout/specific_detail_fragment.xml

@@ -10,7 +10,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

        <android.support.v7.widget.RecyclerView
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/rv_specific_detail"
            android:layout_width="match_parent"
            android:layout_height="0dp"
@@ -19,7 +19,7 @@
            android:dividerHeight="0dp"
            android:listSelector="@android:color/transparent"
            android:paddingLeft="10dp"
            android:paddingRight="10dp"></android.support.v7.widget.RecyclerView>
            android:paddingRight="10dp"></androidx.recyclerview.widget.RecyclerView>
    </com.weikou.beibeivideo.widget.MySwipeRefreshLayout>



 BuWanVideo/res/layout/star_detail_fragment.xml

@@ -12,12 +12,12 @@
        android:layout_height="0dp"
        android:layout_weight="1">

        <android.support.v7.widget.RecyclerView
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/rv_star_detail"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:divider="@null"
            android:listSelector="@android:color/transparent"></android.support.v7.widget.RecyclerView>
            android:listSelector="@android:color/transparent"></androidx.recyclerview.widget.RecyclerView>
    </com.weikou.beibeivideo.widget.MySwipeRefreshLayout>

</LinearLayout>

 BuWanVideo/res/layout/video_episode_fragment.xml

@@ -46,14 +46,14 @@
                    android:focusable="true"
                    android:focusableInTouchMode="true">

                    <android.support.v7.widget.RecyclerView
                    <androidx.recyclerview.widget.RecyclerView
                        android:id="@+id/rv_video_related_video"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:nestedScrollingEnabled="false"
                        android:paddingLeft="8dp"
                        android:paddingRight="8dp"
                        android:paddingBottom="8dp"></android.support.v7.widget.RecyclerView>
                        android:paddingBottom="8dp"></androidx.recyclerview.widget.RecyclerView>
                </RelativeLayout>
            </LinearLayout>

@@ -85,14 +85,14 @@
                    android:focusableInTouchMode="true">


                    <android.support.v7.widget.RecyclerView
                    <androidx.recyclerview.widget.RecyclerView
                        android:id="@+id/rv_video_guess_like"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:nestedScrollingEnabled="false"
                        android:paddingLeft="8dp"
                        android:paddingRight="8dp"
                        android:paddingBottom="8dp"></android.support.v7.widget.RecyclerView>
                        android:paddingBottom="8dp"></androidx.recyclerview.widget.RecyclerView>
                </RelativeLayout>
            </LinearLayout>


 BuWanVideo/res/layout/videos_activity.xml

@@ -14,12 +14,12 @@
        android:layout_weight="1"
        android:paddingTop="5dp">

        <android.support.v7.widget.RecyclerView
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/rv_category_video"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:paddingLeft="3dp"
            android:paddingRight="3dp"></android.support.v7.widget.RecyclerView>
            android:paddingRight="3dp"></androidx.recyclerview.widget.RecyclerView>
    </com.weikou.beibeivideo.widget.MySwipeRefreshLayout>

    <ImageView

 BuWanVideo/src/com/doudou/ysvideo/wxapi/WXEntryActivity.java

@@ -2,14 +2,13 @@


import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;

import android.view.View;
import android.view.Window;
import android.view.WindowManager;

 BuWanVideo/src/com/weikou/beibeivideo/BeibeiVideoApplication.java

@@ -12,7 +12,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.multidex.MultiDex;
import androidx.multidex.MultiDex;
import android.util.Log;

import com.alibaba.baichuan.android.trade.AlibcTradeSDK;

 BuWanVideo/src/com/weikou/beibeivideo/db/DownloadProvider.java

@@ -11,7 +11,7 @@
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.v4.database.DatabaseUtilsCompat;
import androidx.core.database.DatabaseUtilsCompat;

public class DownloadProvider extends ContentProvider {
    

 BuWanVideo/src/com/weikou/beibeivideo/db/MessageProvider.java

@@ -11,7 +11,7 @@
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.v4.database.DatabaseUtilsCompat;
import androidx.core.database.DatabaseUtilsCompat;

public class MessageProvider extends ContentProvider {
    

 BuWanVideo/src/com/weikou/beibeivideo/db/WatchHistoryProvider.java

@@ -11,7 +11,7 @@
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.v4.database.DatabaseUtilsCompat;
import androidx.core.database.DatabaseUtilsCompat;
import android.util.Log;

public class WatchHistoryProvider extends ContentProvider {

 BuWanVideo/src/com/weikou/beibeivideo/entity/recommend/holder/RecommendVideoAdHolder.java

@@ -1,6 +1,6 @@
package com.weikou.beibeivideo.entity.recommend.holder;

import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.TextView;

 BuWanVideo/src/com/weikou/beibeivideo/entity/video/holder/FooterViewHolder.java

@@ -1,6 +1,6 @@
package com.weikou.beibeivideo.entity.video.holder;

import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;

public class FooterViewHolder extends RecyclerView.ViewHolder {

 BuWanVideo/src/com/weikou/beibeivideo/entity/video/holder/HeaderViewHolder.java

@@ -1,6 +1,6 @@
package com.weikou.beibeivideo.entity.video.holder;

import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;

public class HeaderViewHolder  extends RecyclerView.ViewHolder {

 BuWanVideo/src/com/weikou/beibeivideo/entity/video/holder/VideoHolder.java

@@ -1,8 +1,7 @@
package com.weikou.beibeivideo.entity.video.holder;

import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;

 BuWanVideo/src/com/weikou/beibeivideo/test/MyViewPager.java

@@ -1,8 +1,8 @@
package com.weikou.beibeivideo.test;

import android.content.Context;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;

 BuWanVideo/src/com/weikou/beibeivideo/ui/BaseActivity.java

@@ -6,7 +6,7 @@
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.FragmentActivity;

import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.ui.dialog.LoadingDialogUtil;

 BuWanVideo/src/com/weikou/beibeivideo/ui/SplashActivity.java

@@ -16,21 +16,19 @@
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import android.telephony.TelephonyManager;
import android.view.KeyEvent;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;

import com.bumptech.glide.Glide;
import com.google.gson.Gson;
import com.lcjian.library.util.ScreenUtils;
import com.lcjian.library.util.common.BitmapUtils;
import com.lcjian.library.util.common.DrawableUtils;
import com.lcjian.library.util.common.StringUtils;
import com.lcjian.library.util.glide.GlideRoundTransform;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.BeibeiVideoApplication;
@@ -38,7 +36,6 @@
import com.weikou.beibeivideo.entity.ad.AdPidInfo;
import com.weikou.beibeivideo.entity.ad.AdPositionEnum;
import com.weikou.beibeivideo.entity.ad.AdTypeVO;
import com.weikou.beibeivideo.entity.ad.SplashAdLoadInfo;
import com.weikou.beibeivideo.ui.ad.SplashADFragment;
import com.weikou.beibeivideo.ui.dialog.UserProtocolDialog;
import com.weikou.beibeivideo.ui.main.MainActivity;
@@ -50,7 +47,6 @@
import com.weikou.beibeivideo.util.ad.AdUtil;
import com.weikou.beibeivideo.util.ad.CSJConstant;
import com.weikou.beibeivideo.util.ad.GDTConstant;
import com.weikou.beibeivideo.util.ad.SplashAdUtil;
import com.weikou.beibeivideo.util.ui.TopStatusSettings;

import org.apache.http.Header;

 BuWanVideo/src/com/weikou/beibeivideo/ui/VBrowserActivity.java

@@ -10,7 +10,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.v4.app.NotificationCompat;
import androidx.core.app.NotificationCompat;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;

 BuWanVideo/src/com/weikou/beibeivideo/ui/ad/PlayVideoPreADFragment.java

@@ -4,9 +4,9 @@
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -17,11 +17,9 @@
import android.widget.TextView;

import com.bytedance.sdk.openadsdk.AdSlot;
import com.bytedance.sdk.openadsdk.TTAdManager;
import com.bytedance.sdk.openadsdk.TTAdNative;
import com.bytedance.sdk.openadsdk.TTAdSdk;
import com.bytedance.sdk.openadsdk.TTFeedAd;
import com.bytedance.sdk.openadsdk.TTSplashAd;
import com.qq.e.ads.cfg.VideoOption;
import com.qq.e.ads.nativ.MediaView;
import com.qq.e.ads.nativ.NativeADEventListener;
@@ -39,9 +37,6 @@
import com.weikou.beibeivideo.util.BeibeiConstant;
import com.weikou.beibeivideo.util.DimenUtils;
import com.weikou.beibeivideo.util.ad.AdUtil;
import com.weikou.beibeivideo.util.ad.CSJConstant;
import com.weikou.beibeivideo.util.ad.GDTConstant;
import com.weikou.beibeivideo.util.ad.TTAdManagerHolder;
import com.weikou.beibeivideo.util.ui.IPageEventListener;

import java.util.ArrayList;

 BuWanVideo/src/com/weikou/beibeivideo/ui/ad/SplashADFragment.java

@@ -2,9 +2,9 @@

import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -16,13 +16,7 @@
import com.qq.e.ads.splash.SplashAD;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.entity.ad.AdPidInfo;
import com.weikou.beibeivideo.entity.ad.AdPositionEnum;
import com.weikou.beibeivideo.entity.ad.SplashAdLoadInfo;
import com.weikou.beibeivideo.ui.SplashActivity;
import com.weikou.beibeivideo.util.BeibeiConstant;
import com.weikou.beibeivideo.util.ad.AdUtil;
import com.weikou.beibeivideo.util.ad.CSJConstant;
import com.weikou.beibeivideo.util.ad.GDTConstant;
import com.weikou.beibeivideo.util.ad.SplashAdUtil;

import java.util.Timer;

 BuWanVideo/src/com/weikou/beibeivideo/ui/baidu/BaiDuNewsFragment.java

@@ -1,12 +1,12 @@
package com.weikou.beibeivideo.ui.baidu;

import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
import android.util.Log;
import android.view.View;
import android.widget.FrameLayout;
@@ -17,7 +17,6 @@
import com.baidu.mobads.nativecpu.IBasicCPUData;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.viewpagerindicator.FoundTabPageIndicator;
import com.viewpagerindicator.MainTabPageIndicator;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;

 BuWanVideo/src/com/weikou/beibeivideo/ui/baidu/BaiDuVideosFragment.java

@@ -1,11 +1,11 @@
package com.weikou.beibeivideo.ui.baidu;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
@@ -15,7 +15,6 @@
import com.baidu.mobads.nativecpu.IBasicCPUData;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.viewpagerindicator.FoundTabPageIndicator;
import com.viewpagerindicator.MainTabPageIndicator;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;

 BuWanVideo/src/com/weikou/beibeivideo/ui/category/CategoryRecommedTopAdapter.java

@@ -4,7 +4,7 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v4.view.PagerAdapter;
import androidx.viewpager.widget.PagerAdapter;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
@@ -17,7 +17,6 @@
import com.weikou.beibeivideo.entity.CategoryRecommendVideo;
import com.weikou.beibeivideo.entity.CommonAd;
import com.weikou.beibeivideo.service.DownLoadFileService;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.ui.mine.BrowserActivity;
import com.weikou.beibeivideo.R;

 BuWanVideo/src/com/weikou/beibeivideo/ui/category/CategoryRecommendAdapter.java

@@ -3,9 +3,9 @@
import android.app.Activity;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.support.annotation.NonNull;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.viewpager.widget.ViewPager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

 BuWanVideo/src/com/weikou/beibeivideo/ui/category/MVideosActivity.java

@@ -4,12 +4,11 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.FrameLayout;

 BuWanVideo/src/com/weikou/beibeivideo/ui/category/SpecificDetailActivity.java

@@ -1,17 +1,14 @@
package com.weikou.beibeivideo.ui.category;

import android.os.Build;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;

import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.TextView;
import android.widget.LinearLayout.LayoutParams;

import com.weikou.beibeivideo.R;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.ui.BaseActivity;
import com.weikou.beibeivideo.util.ui.TopStatusSettings;


 BuWanVideo/src/com/weikou/beibeivideo/ui/category/SpecificDetailFragment.java

@@ -3,14 +3,13 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;

import com.bumptech.glide.Glide;

 BuWanVideo/src/com/weikou/beibeivideo/ui/category/StarDetailActivity.java

@@ -1,16 +1,13 @@
package com.weikou.beibeivideo.ui.category;

import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.TextView;
import android.widget.LinearLayout.LayoutParams;

import com.weikou.beibeivideo.R;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.ui.BaseActivity;
import com.weikou.beibeivideo.util.ui.TopStatusSettings;


 BuWanVideo/src/com/weikou/beibeivideo/ui/category/StarDetailFragment.java

@@ -3,9 +3,9 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;

 BuWanVideo/src/com/weikou/beibeivideo/ui/category/fragment/StarFragment.java

@@ -3,7 +3,7 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.view.View;
import android.widget.ListView;
import android.widget.ProgressBar;

 BuWanVideo/src/com/weikou/beibeivideo/ui/common/FollowActivity.java

@@ -3,12 +3,9 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.ProgressBar;

 BuWanVideo/src/com/weikou/beibeivideo/ui/common/LiveBrowserActivity.java

@@ -10,7 +10,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.v4.app.NotificationCompat;
import androidx.core.app.NotificationCompat;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
@@ -20,7 +20,6 @@
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;


 BuWanVideo/src/com/weikou/beibeivideo/ui/common/MVideosActivity.java

@@ -10,16 +10,13 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.LinearLayout.LayoutParams;
import android.widget.FrameLayout;
import android.widget.GridView;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -31,12 +28,10 @@
import com.lcjian.library.util.common.DimenUtils;
import com.lcjian.library.util.common.StringUtils;
import com.weikou.beibeivideo.R;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.ui.BaseActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.util.ui.TopStatusSettings;
import com.weikou.beibeivideo.widget.MySwipeRefreshLayout;

 BuWanVideo/src/com/weikou/beibeivideo/ui/common/VideosFragment.java

@@ -1,21 +1,15 @@
package com.weikou.beibeivideo.ui.common;

import android.app.Activity;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.fragment.app.Fragment;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;

@@ -28,8 +22,6 @@
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.entity.VideoType;
import com.weikou.beibeivideo.entity.video.VideoContent;
import com.weikou.beibeivideo.ui.video.VideoCloumn1Adapter;
import com.weikou.beibeivideo.ui.video.VideoColumn2Adapter;
import com.weikou.beibeivideo.util.DimenUtils;
import com.weikou.beibeivideo.util.UserUtil;

 BuWanVideo/src/com/weikou/beibeivideo/ui/common/VideosLiveActivity.java

@@ -2,14 +2,12 @@

import android.app.ActivityManager;
import android.content.ComponentName;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.webkit.WebView;
import android.widget.LinearLayout.LayoutParams;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -19,7 +17,6 @@
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.lcjian.library.util.common.DimenUtils;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.entity.MemeLiveInfo;

 BuWanVideo/src/com/weikou/beibeivideo/ui/discover/DiscoverTopAdapter.java

@@ -4,7 +4,7 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v4.view.PagerAdapter;
import androidx.viewpager.widget.PagerAdapter;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;

 BuWanVideo/src/com/weikou/beibeivideo/ui/discover/GoodsReviewActivity.java

@@ -1,14 +1,10 @@
package com.weikou.beibeivideo.ui.discover;

import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.view.LayoutInflater;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.ProgressBar;

 BuWanVideo/src/com/weikou/beibeivideo/ui/discover/SpecificListActivity.java

@@ -1,13 +1,9 @@
package com.weikou.beibeivideo.ui.discover;

import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.LinearLayout;
import android.widget.TextView;

import com.weikou.beibeivideo.ui.BaseActivity;

 BuWanVideo/src/com/weikou/beibeivideo/ui/discover/StarsActivity.java

@@ -1,13 +1,9 @@
package com.weikou.beibeivideo.ui.discover;

import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.LinearLayout;
import android.widget.TextView;

import com.weikou.beibeivideo.ui.BaseActivity;

 BuWanVideo/src/com/weikou/beibeivideo/ui/live/Activity_LiveCateGory.java

@@ -3,13 +3,11 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.os.Build;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.support.annotation.Nullable;
import android.support.v4.widget.SwipeRefreshLayout;

import androidx.annotation.Nullable;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;

 BuWanVideo/src/com/weikou/beibeivideo/ui/login/PersonInfoActivity.java

@@ -16,7 +16,7 @@
import android.os.Build;
import android.os.Bundle;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Base64;
import android.util.Log;
import android.view.LayoutInflater;

 BuWanVideo/src/com/weikou/beibeivideo/ui/main/CategoryFragment.java

@@ -5,11 +5,10 @@
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException;
import android.graphics.Color;
import android.os.Bundle;
import android.provider.Settings;
import android.support.v4.widget.SwipeRefreshLayout;
import android.util.Log;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

import android.view.View;
import android.view.View.OnClickListener;
import android.widget.FrameLayout;
@@ -25,7 +24,6 @@
import com.lcjian.library.util.cache.DiskLruCache;
import com.lcjian.library.util.common.StorageUtils;
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.qq.e.comm.util.AdError;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.R;
@@ -33,7 +31,6 @@
import com.weikou.beibeivideo.ui.MyRetainViewFragment;
import com.weikou.beibeivideo.ui.category.CategoryAdapter;
import com.weikou.beibeivideo.ui.recommend.SearchActivity;
import com.weikou.beibeivideo.util.BeibeiConstant;

import org.apache.http.Header;
import org.json.JSONObject;

 BuWanVideo/src/com/weikou/beibeivideo/ui/main/DiscoverNowFragment.java

@@ -3,7 +3,7 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.view.View;
import android.widget.ListView;
import android.widget.ProgressBar;
@@ -12,7 +12,6 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.lcjian.library.RetainViewFragment;
import com.lcjian.library.util.SingleToast;
import com.qq.e.ads.cfg.VideoOption;
import com.qq.e.ads.nativ.ADSize;

 BuWanVideo/src/com/weikou/beibeivideo/ui/main/GuessLikeFragment.java

@@ -1,7 +1,7 @@
package com.weikou.beibeivideo.ui.main;

import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.view.View;
import android.widget.ListView;
import android.widget.ProgressBar;
@@ -10,14 +10,12 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.lcjian.library.RetainViewFragment;
import com.lcjian.library.util.SingleToast;
import com.qq.e.ads.cfg.VideoOption;
import com.qq.e.ads.nativ.ADSize;
import com.qq.e.ads.nativ.NativeExpressAD;
import com.qq.e.ads.nativ.NativeExpressADView;
import com.qq.e.comm.util.AdError;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.entity.VideoInfo;

 BuWanVideo/src/com/weikou/beibeivideo/ui/main/HomeFragment.java

@@ -1,20 +1,18 @@
package com.weikou.beibeivideo.ui.main;

import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
@@ -26,7 +24,6 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.lcjian.library.util.common.StorageUtils;
import com.lcjian.library.util.common.StringUtils;
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.viewpagerindicator.IconPagerAdapter;
@@ -40,19 +37,14 @@
import com.weikou.beibeivideo.entity.recommend.HomeClass;
import com.weikou.beibeivideo.ui.MyRetainViewFragment;
import com.weikou.beibeivideo.ui.dialog.FloatADDialog;
import com.weikou.beibeivideo.ui.dialog.UserProtocolDialog;
import com.weikou.beibeivideo.ui.recommend.RecommendFragment;
import com.weikou.beibeivideo.util.BeibeiConstant;
import com.weikou.beibeivideo.util.DimenUtils;
import com.weikou.beibeivideo.util.UmengEventUtil;
import com.weikou.beibeivideo.util.UserUtil;
import com.weikou.beibeivideo.util.cache.DiskLruCacheManager;

import org.apache.http.Header;
import org.json.JSONObject;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

 BuWanVideo/src/com/weikou/beibeivideo/ui/main/MainActivity.java

@@ -14,11 +14,11 @@
import android.net.wifi.WifiManager;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.CursorLoader;
import androidx.loader.content.Loader;
import android.view.KeyEvent;
import android.view.View;
import android.widget.FrameLayout;
@@ -35,10 +35,8 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.huawei.secure.android.common.util.ScreenUtil;
import com.lcjian.library.util.FragmentSwitchHelper;
import com.lcjian.library.util.MarketUtils;
import com.lcjian.library.util.common.ClipboardUtil;
import com.lcjian.library.util.common.StringUtils;
import com.mozillaonline.providers.downloads.DownloadService;
import com.qq.e.ads.cfg.VideoOption;
@@ -51,33 +49,23 @@
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.db.MessageTable;
import com.weikou.beibeivideo.entity.JumpDetail;
import com.weikou.beibeivideo.entity.NewComment;
import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.entity.ad.ExpressAdContainer;
import com.weikou.beibeivideo.entity.ad.RewardVideoAdContainer;
import com.weikou.beibeivideo.ui.BaseActivity;
import com.weikou.beibeivideo.ui.baidu.BaiDuNewsFragment;
import com.weikou.beibeivideo.ui.baidu.BaiDuVideosFragment;
import com.weikou.beibeivideo.ui.login.LoginActivity;
import com.weikou.beibeivideo.ui.login.PersonInfoActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.ui.mine.BrowserActivity;
import com.weikou.beibeivideo.ui.mine.SystemMessageActivity;
import com.weikou.beibeivideo.ui.mine.WatchHistoryActivity;
import com.weikou.beibeivideo.ui.push.PushOpenClickActivity;
import com.weikou.beibeivideo.ui.recommend.SearchActivity;
import com.weikou.beibeivideo.util.AlibcTradeUtil;
import com.weikou.beibeivideo.util.BeibeiConstant;
import com.weikou.beibeivideo.util.DimenUtils;
import com.weikou.beibeivideo.util.ExitDialog;
import com.weikou.beibeivideo.util.JumpActivityUtil;
import com.weikou.beibeivideo.util.LoginFirstDialog;
import com.weikou.beibeivideo.util.UserUtil;
import com.weikou.beibeivideo.util.ad.AdUtil;
import com.weikou.beibeivideo.util.ad.RewardVideoAdManager;
import com.weikou.beibeivideo.util.ad.manager.SearchResultAdManager;
import com.weikou.beibeivideo.util.browser.BWJavaInterface;
import com.weikou.beibeivideo.util.ui.TopStatusSettings;
import com.yeshi.appupdate.AppUpdate;


 BuWanVideo/src/com/weikou/beibeivideo/ui/main/MineFragment.java

@@ -8,9 +8,9 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.database.Cursor;
import android.os.Bundle;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.CursorLoader;
import androidx.loader.content.Loader;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageView;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/EpisodeFragment.java

@@ -6,14 +6,12 @@
import android.content.SharedPreferences;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
@@ -65,7 +63,6 @@
import com.weikou.beibeivideo.entity.video.FunshionPlayInfo;
import com.weikou.beibeivideo.ui.login.LoginActivity;
import com.weikou.beibeivideo.ui.video.EpisodeNewAdapter;
import com.weikou.beibeivideo.util.BeibeiConstant;
import com.weikou.beibeivideo.util.UserUtil;
import com.weikou.beibeivideo.util.VideoUtil;
import com.weikou.beibeivideo.util.ad.AdUtil;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/EpisodePagerAdapter.java

@@ -1,8 +1,8 @@
package com.weikou.beibeivideo.ui.media;

import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;

import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.util.VideoUtil;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/IQYVideoFragment.java

@@ -12,7 +12,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.v4.app.NotificationCompat;
import androidx.core.app.NotificationCompat;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity.java

@@ -11,11 +11,11 @@
import android.database.Cursor;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailActivity2.java

@@ -10,13 +10,12 @@
import android.content.res.Configuration;
import android.database.Cursor;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
@@ -68,7 +67,6 @@
import com.weikou.beibeivideo.ui.mine.PPTVPlayFragment;
import com.weikou.beibeivideo.ui.video.VideoPlayerBrowserActivity;
import com.weikou.beibeivideo.ui.video.FunshionPlayerFragment;
import com.weikou.beibeivideo.ui.video.VideoPlayerActivity;
import com.weikou.beibeivideo.util.BeibeiConstant;
import com.weikou.beibeivideo.util.UmengEventUtil;
import com.weikou.beibeivideo.util.VideoUtil;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoDetailFragment.java

@@ -3,18 +3,15 @@
import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import androidx.fragment.app.Fragment;

import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import com.lcjian.library.util.SingleToast;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
import com.umeng.analytics.MobclickAgent;
import com.viewpagerindicator.LxyPageIndicator;
import com.weikou.beibeivideo.entity.PushEpisode;
import com.weikou.beibeivideo.entity.VideoDetailInfo;
import com.weikou.beibeivideo.entity.VideoInfo;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoEpisodeFragment.java

@@ -5,8 +5,8 @@
import android.graphics.Canvas;
import android.graphics.Rect;
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Html;
import android.util.Log;
import android.view.View;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoEpisodeFragment2.java

@@ -4,15 +4,12 @@
import org.json.JSONObject;

import android.app.Dialog;
import android.content.ContentValues;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.util.Log;
import androidx.fragment.app.DialogFragment;

import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -20,7 +17,6 @@
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.GridView;
import android.widget.Toast;

import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson;
@@ -30,7 +26,6 @@
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.db.WatchHistoryTable;
import com.weikou.beibeivideo.entity.Play;
import com.weikou.beibeivideo.entity.PlayUrl;
import com.weikou.beibeivideo.entity.Playlocation;
@@ -39,9 +34,6 @@
import com.weikou.beibeivideo.entity.VideoResource;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.util.VideoUtil;

import java.util.ArrayList;
import java.util.List;

import de.greenrobot.event.EventBus;


 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoEpisodeFragment3.java

@@ -13,7 +13,7 @@
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -40,8 +40,6 @@
import com.weikou.beibeivideo.util.GetDownLoadTask;
import com.weikou.beibeivideo.util.GetRealPathTask;
import com.weikou.beibeivideo.util.SDCardUtil;
import com.weikou.beibeivideo.util.VideoPlayUrlUtil;
import com.weikou.beibeivideo.util.VideoTypeUtil;
import com.weikou.beibeivideo.util.VideoUtil;

import de.greenrobot.event.EventBus;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoEpisodeFragment4.java

@@ -11,7 +11,7 @@
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import androidx.fragment.app.DialogFragment;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoReplyAdapter.java

@@ -6,7 +6,7 @@
import com.weikou.beibeivideo.entity.CommentReply;
import com.weikou.beibeivideo.util.TimeUtils;

import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoReviewAdapter.java

@@ -2,7 +2,7 @@

import android.content.Context;
import android.content.SharedPreferences;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoReviewFragment.java

@@ -4,7 +4,7 @@
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;

 BuWanVideo/src/com/weikou/beibeivideo/ui/media/VideoReviewPopupWindow.java

@@ -8,7 +8,7 @@
import android.content.SharedPreferences;
import android.graphics.drawable.ColorDrawable;
import android.os.Handler;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.FragmentActivity;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;

 BuWanVideo/src/com/weikou/beibeivideo/ui/mine/BrowserActivity.java

@@ -17,8 +17,8 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.annotation.NonNull;
import android.support.v4.app.NotificationCompat;
import androidx.annotation.NonNull;
import androidx.core.app.NotificationCompat;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
@@ -41,7 +41,6 @@
import com.tencent.smtt.sdk.WebSettings;
import com.tencent.smtt.sdk.WebView;
import com.tencent.smtt.sdk.WebViewClient;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.ui.BaseActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;

 BuWanVideo/src/com/weikou/beibeivideo/ui/mine/DownloadActivity.java

@@ -1,20 +1,16 @@
package com.weikou.beibeivideo.ui.mine;

import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.Fragment;

import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.ToggleButton;
import android.widget.LinearLayout.LayoutParams;

import com.lcjian.library.util.FragmentSwitchHelper;
import com.weikou.beibeivideo.R;

 BuWanVideo/src/com/weikou/beibeivideo/ui/mine/MessageAdapter.java

@@ -4,7 +4,7 @@

import android.content.Context;
import android.database.Cursor;
import android.support.v4.widget.CursorAdapter;
import androidx.cursoradapter.widget.CursorAdapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

 BuWanVideo/src/com/weikou/beibeivideo/ui/mine/MyFavouriteActivity.java

@@ -3,23 +3,17 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.util.Log;
import android.view.LayoutInflater;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.FrameLayout.LayoutParams;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;

import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson;
@@ -28,7 +22,6 @@
import com.lcjian.library.dialog.DialogUtil;
import com.lcjian.library.util.SingleToast;
import com.lcjian.library.util.common.StringUtils;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.R;

 BuWanVideo/src/com/weikou/beibeivideo/ui/mine/PPTVPlayFragment.java

@@ -10,8 +10,8 @@
import android.net.http.SslError;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -69,9 +69,7 @@
import org.apache.http.Header;
import org.json.JSONObject;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class PPTVPlayFragment extends RetainViewFragment implements OnClickListener {

 BuWanVideo/src/com/weikou/beibeivideo/ui/mine/SystemMessageActivity.java

@@ -2,23 +2,20 @@

import android.content.ContentValues;
import android.database.Cursor;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.CursorLoader;
import androidx.loader.content.Loader;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.ListView;
import android.widget.TextView;

import com.lcjian.library.util.common.DateUtils;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.db.MessageTable;
import com.weikou.beibeivideo.ui.BaseActivity;

 BuWanVideo/src/com/weikou/beibeivideo/ui/mine/WatchHistoryActivity.java

@@ -1,23 +1,15 @@
package com.weikou.beibeivideo.ui.mine;

import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.util.Log;
import androidx.fragment.app.Fragment;

import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
import android.widget.LinearLayout.LayoutParams;

import com.lcjian.library.util.FragmentSwitchHelper;
import com.weikou.beibeivideo.R;

 BuWanVideo/src/com/weikou/beibeivideo/ui/recent/DownLoadActivity.java

@@ -2,11 +2,10 @@

import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.support.v4.app.Fragment;
import android.support.v4.app.ListFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.ListFragment;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
@@ -15,15 +14,12 @@
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
import android.widget.LinearLayout.LayoutParams;

import com.mozillaonline.providers.DownloadManager;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.db.DownloadTable;
import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.ui.BaseActivity;
import com.weikou.beibeivideo.ui.media.VideoEpisodeFragment3;
import com.weikou.beibeivideo.ui.recent.DownLoadAdapter.IGetDeleteCallback;
import com.weikou.beibeivideo.ui.recent.DownLoadAdapter.IGetSelectStatus;
import com.weikou.beibeivideo.util.ui.TopStatusSettings;

 BuWanVideo/src/com/weikou/beibeivideo/ui/recent/DownLoadAdapter.java

@@ -13,7 +13,7 @@
import android.content.Intent;
import android.content.res.Resources;
import android.database.Cursor;
import android.support.v4.widget.CursorAdapter;
import androidx.cursoradapter.widget.CursorAdapter;
import android.text.TextUtils;
import android.text.format.Formatter;
import android.view.LayoutInflater;
@@ -44,10 +44,8 @@
import com.weikou.beibeivideo.db.DownloadTable;
import com.weikou.beibeivideo.entity.VideoDetailInfo;
import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.util.DownloadUtils;
import com.weikou.beibeivideo.util.VideoUtil;

public class DownLoadAdapter extends CursorAdapter {
    public interface IGetDeleteCallback {

 BuWanVideo/src/com/weikou/beibeivideo/ui/recent/DownloadCursorLoader.java

@@ -5,7 +5,7 @@

import android.content.Context;
import android.database.Cursor;
import android.support.v4.content.AsyncTaskLoader;
import androidx.loader.content.AsyncTaskLoader;

import com.mozillaonline.providers.DownloadManager;
import com.mozillaonline.providers.downloads.Downloads;

 BuWanVideo/src/com/weikou/beibeivideo/ui/recent/OfflineCacheFragment2.java

@@ -9,9 +9,9 @@
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.Loader;
import androidx.fragment.app.Fragment;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;

 BuWanVideo/src/com/weikou/beibeivideo/ui/recent/WatchHistoryFragment.java

@@ -2,8 +2,8 @@

import android.app.Dialog;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.fragment.app.Fragment;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -29,7 +29,6 @@
import org.apache.http.Header;
import org.json.JSONObject;

import java.lang.reflect.Array;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;

 BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/CategoryRecommendFragment.java

@@ -3,9 +3,9 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.AbsListView;
import android.widget.FrameLayout;

 BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/RecommendFragment.java

@@ -1,17 +1,20 @@
package com.weikou.beibeivideo.ui.recommend;

import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
import android.provider.Settings;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;

import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.ViewPager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -35,6 +38,7 @@
import com.lcjian.library.util.common.StorageUtils;
import com.lcjian.library.util.common.StringUtils;
import com.lcjian.library.widget.RatioLayout;
import com.lzj.gallery.library.views.BannerViewPager;
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.umeng.analytics.MobclickAgent;
import com.viewpagerindicator.CirclePageIndicator;
@@ -47,11 +51,14 @@
import com.weikou.beibeivideo.entity.HomeVideo;
import com.weikou.beibeivideo.entity.JumpDetail;
import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.entity.VideoType;
import com.weikou.beibeivideo.entity.ad.ExpressAdContainer;
import com.weikou.beibeivideo.entity.recommend.HomeClass;
import com.weikou.beibeivideo.ui.category.bean.HotStar;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity;
import com.weikou.beibeivideo.ui.mine.BrowserActivity;
import com.weikou.beibeivideo.util.BeibeiConstant;
import com.weikou.beibeivideo.util.CustomShareDialog;
import com.weikou.beibeivideo.util.DimenUtils;
import com.weikou.beibeivideo.util.JumpActivityUtil;
import com.weikou.beibeivideo.util.ad.AdUtil;
@@ -71,6 +78,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;

public class RecommendFragment extends RetainViewFragment implements
@@ -183,10 +191,9 @@
        }
    }

    private ViewPager vp_recommend;
    private BannerViewPager vp_recommend;
    private LinearLayout ll_ad_containner;
    private RatioLayout rl_recommend_top;
    private CirclePageIndicator indicator_recommend;
    private boolean isLoad;
    private View loading;
    private View noMoreDataView;
@@ -196,9 +203,7 @@
        vp_recommend = view.findViewById(R.id.vp_recommend);
        ll_ad_containner = view.findViewById(R.id.ll_ad_containner);
        rl_recommend_top = view.findViewById(R.id.rl_recommend_top);
        indicator_recommend = view.findViewById(R.id.indicator_recommend);
        mRecommendNewAdapter.setHeaderView(view);
        autoPlayBanner(vp_recommend);
    }

    @Override
@@ -381,58 +386,104 @@
        }
    }

    private Runnable autoPlayBanner = null;

    private synchronized void autoPlayBanner(final ViewPager viewPager) {
    private void setHomeAdsData(float ratio) {
        List<String> urlList = new ArrayList<>();
        for (HomeAd ad : mHomeAds)
            urlList.add(ad.getPicture());

        if (autoPlayBanner == null) {
            autoPlayBanner = new Runnable() {

        if (!vp_recommend.hasAdapter()) {

            int width = ScreenUtils.getScreenWidth(getContext());

            vp_recommend.initBanner(urlList, false, ratio)//开启3D画廊效果
                    .addPageMargin((int) (DimenUtils.dip2px(getContext(), 1) * 1.5), DimenUtils.dip2px(getContext(), 3))//参数1page之间的间距,参数2中间item距离边界的间距
//                    .addPointMargin(5)//指示器点间距
                    .addStartTimer(3)//自动轮播3秒间隔
//                    .addPointBottom(0)//底部间距
                    .addDefaultImg(R.drawable.shape_video_list_cover_placeholder)
                    .addRoundCorners(DimenUtils.dip2px(getContext(), 8))//圆角
                    .finishConfig()//这句必须加
                    .addBannerListener(new BannerViewPager.OnClickBannerListener() {
                @Override
                public void run() {
                        public void onBannerClick(int position) {
                            if (position >= mHomeAds.size())
                                return;
                            Intent intent = null;
                            if (mHomeAds.get(position).getLinkType() == 1) {
                                intent = new Intent(getContext(),
                                        VideoDetailActivity.class);
                                intent.putExtra("video_info", mHomeAds.get(position)
                                        .getVideo());
                            } else if (mHomeAds.get(position).getLinkType() == 5) {
                    try {
                        if (viewPager.getAdapter() != null && viewPager.getAdapter().getCount() > 0) {
                            if (viewPager.getCurrentItem() >= viewPager.getAdapter().getCount() - 1) {
                                viewPager.setCurrentItem(0, true);
                            } else {
                                viewPager.setCurrentItem(viewPager.getCurrentItem() + 1, true);
                                    JSONObject object = new JSONObject(mHomeAds
                                            .get(position).getParams()
                                            .replace("\\", ""));
                                    String thumb = object.optString("thumb");
                                    String title = object.optString("title");
                                    String desc = object.optString("desc");
                                    String path = object.optString("path");
                                    String username = object.optString("username");
                                    String url = object.optString("url");

                                    CustomShareDialog.Builder builder = new CustomShareDialog.Builder(getActivity());
                                    builder.setMessage(desc);
                                    builder.setUrl(url);
                                    builder.setContentImage(thumb);
                                    builder.setTitle(title);
                                    builder.setPath(path);
                                    builder.setUserName(username);
                                    builder.setNegativeButton("取消分享", new DialogInterface.OnClickListener() {
                                        @Override
                                        public void onClick(DialogInterface dialog, int which) {
                                            dialog.dismiss();
                            }
                        }
                        autoPlayBanner(viewPager);
                                    });
                                    builder.create().show();
                    } catch (Exception e) {

                    }
                }
            };
            viewPager.postDelayed(autoPlayBanner, 3000);

        } else {
            viewPager.removeCallbacks(autoPlayBanner);
            viewPager.postDelayed(autoPlayBanner, 3000);
                                try {
                                    intent = new Intent(getContext(), Class
                                            .forName(mHomeAds.get(position).getClazz()));
                                    JSONObject object = new JSONObject(mHomeAds
                                            .get(position).getParams()
                                            .replace("\\", ""));
                                    if (mHomeAds.get(position).getClazz().contains("FXBrowserActivity") && object.optString("url").endsWith(".apk")) {
//                                        startDownLoadFile(object.optString("url"));
                                        return;
                                    }
                                    if (mHomeAds.get(position).getParams() != null) {
                                        @SuppressWarnings("unchecked")
                                        Iterator<String> its = object.keys();
                                        while (its.hasNext()) {
                                            String key = its.next();
                                            String value = object.optString(key);
                                            intent.putExtra(key, value);
                                            intent.putExtra("isPush", true);
        }
    }
                                } catch (ClassNotFoundException e) {
                                    e.printStackTrace();
                                } catch (Exception e) {
                                    e.printStackTrace();
                                }

    /**
     * 设置广告数据
     */
    private void setHomeAdsData() {
        if (vp_recommend.getAdapter() == null) {
            vp_recommend.setAdapter(new RecommendTopAdapter(mHomeAds, getActivity(), position == 0 ? false : true));
            indicator_recommend.setViewPager(vp_recommend);
            indicator_recommend.setViewPager(vp_recommend);
        } else
            vp_recommend.getAdapter().notifyDataSetChanged();
                            }
                            if (intent != null)
                                getContext().startActivity(intent);
                        }

        if (mHomeAds != null && mHomeAds.size() > 0) {
            rl_recommend_top.setVisibility(View.VISIBLE);
                    });
        } else {
            rl_recommend_top.setVisibility(View.GONE);
            vp_recommend.notifyDataSetChanged();
        }
        }

        if (vp_recommend.getChildCount() == 1) {
            indicator_recommend.setVisibility(View.GONE);
        } else
            indicator_recommend.setVisibility(View.VISIBLE);

    }

    private void loadCacheData() {
        if (cache != null && position == 0) {
@@ -478,7 +529,7 @@
                            if (adList != null && adList.size() > 0) {
                                mHomeAds.clear();
                                mHomeAds.addAll(adList);
                                setHomeAdsData();
                                setHomeAdsData(0.4375f);
                            }
                        } catch (JSONException e) {
                            e.printStackTrace();
@@ -687,7 +738,7 @@
                                mHomeAds.addAll(homeAds);
                            }

                            setHomeAdsData();
                            setHomeAdsData(new BigDecimal(bannerSizeRate).floatValue());


                            if (position == 0) {
@@ -850,8 +901,6 @@
    @Override
    public void onDestroy() {
        super.onDestroy();
        if (autoPlayBanner != null)
            vp_recommend.removeCallbacks(autoPlayBanner);
    }

    private List<HomeVideo> adList1 = new ArrayList<>();

 BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/RecommendNewAdapter.java

@@ -2,11 +2,9 @@

import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.support.v7.widget.RecyclerView;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.AbsoluteSizeSpan;

import androidx.recyclerview.widget.RecyclerView;

import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -22,7 +20,6 @@
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.DrawableImageViewTarget;
import com.bytedance.sdk.openadsdk.TTAdDislike;
import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -33,30 +30,21 @@
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.entity.HomeType;
import com.weikou.beibeivideo.entity.HomeVideo;
import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.entity.VideoType;
import com.weikou.beibeivideo.entity.ad.ExpressAdContainer;
import com.weikou.beibeivideo.entity.recommend.HomeTypeContent;
import com.weikou.beibeivideo.entity.recommend.RecommendContent;
import com.weikou.beibeivideo.entity.recommend.holder.RecommendVideoAdHolder;
import com.weikou.beibeivideo.entity.video.holder.FooterViewHolder;
import com.weikou.beibeivideo.entity.video.holder.HeaderViewHolder;
import com.weikou.beibeivideo.entity.video.holder.VideoHolder;
import com.weikou.beibeivideo.ui.common.VideosLiveActivity;
import com.weikou.beibeivideo.ui.discover.StarsActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.ui.video.VideoRecommendAdapter;
import com.weikou.beibeivideo.util.JumpActivityUtil;
import com.weikou.beibeivideo.util.VideoUtil;
import com.weikou.beibeivideo.util.ad.AdUtil;
import com.weikou.beibeivideo.util.ad.ExpressAdManager;
import com.weikou.beibeivideo.util.downutil.StringUtils;
import com.weikou.beibeivideo.util.video.VideoUIUtil;

import org.apache.http.Header;
import org.json.JSONArray;

import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

 BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/RecommendTopAdapter.java

@@ -13,8 +13,8 @@
import android.os.Build;
import android.os.Handler;
import android.os.Message;
import android.support.v4.app.NotificationCompat;
import android.support.v4.view.PagerAdapter;
import androidx.core.app.NotificationCompat;
import androidx.viewpager.widget.PagerAdapter;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
@@ -28,11 +28,8 @@
import com.lcjian.library.util.ManifestDataUtil;
import com.lcjian.library.util.glide.GlideRoundTransform;
import com.weikou.beibeivideo.entity.HomeAd;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.util.AppMarket;
import com.weikou.beibeivideo.util.CustomShareDialog;
import com.weikou.beibeivideo.util.DimenUtils;
import com.weikou.beibeivideo.util.downutil.DownFiles;
import com.weikou.beibeivideo.R;


 BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/SearchActivity.java

@@ -107,12 +107,18 @@
                if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                    Intent intent = new Intent(SearchActivity.this, SearchResultActivity.class);
                    if (StringUtils.isEmpty(et_search_key.getEditableText()
                            .toString()) && StringUtils.isEmpty(et_search_key.getHint()
                            .toString())) {
                        Toast.makeText(SearchActivity.this, "请输入搜索内容!", Toast.LENGTH_LONG).show();
                        return false;
                    } else {
                        if (!StringUtils.isEmpty(et_search_key.getEditableText()
                                .toString())) {
                        intent.putExtra("key", et_search_key.getEditableText()
                                .toString());
                        } else {
                            intent.putExtra("key", et_search_key.getHint());
                        }
                    }
                    startActivity(intent);


 BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/SearchResultActivity.java

@@ -5,9 +5,9 @@
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -49,7 +49,6 @@
import com.weikou.beibeivideo.util.UmengEventUtil;
import com.weikou.beibeivideo.util.ad.ExpressAdManager;
import com.weikou.beibeivideo.util.ad.GDTConstant;
import com.weikou.beibeivideo.util.ad.manager.SearchResultAdManager;
import com.weikou.beibeivideo.util.ui.DividerItemDecoration;
import com.weikou.beibeivideo.util.ui.TopStatusSettings;


 BuWanVideo/src/com/weikou/beibeivideo/ui/recommend/SearchSuggestFragment.java

@@ -1,25 +1,21 @@
package com.weikou.beibeivideo.ui.recommend;

import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;

import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.lcjian.library.RetainViewFragment;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.util.DimenUtils;
import com.weikou.beibeivideo.util.ui.DividerItemDecoration;

import java.lang.reflect.Type;

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/ArrayUtil.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/ControllerFactory.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/DialogUtil.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/FormatUtil.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/IntentUtil.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/LiveControllerPopWindow.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/LocalControllerPopWindow.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/OptionAdapter.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/PlayVideoHelper.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/SohuControllerWindow.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/sohuutils/UIUtil.java

File was deleted

 BuWanVideo/src/com/weikou/beibeivideo/ui/video/EpisodeNewAdapter.java

@@ -2,8 +2,8 @@

import android.content.Context;
import android.graphics.Color;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;

 BuWanVideo/src/com/weikou/beibeivideo/ui/video/FunshionPlayerFragment.java

@@ -11,8 +11,8 @@
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.SurfaceHolder;
@@ -56,7 +56,6 @@
import com.qq.e.ads.nativ.NativeUnifiedADData;
import com.qq.e.comm.constants.AdPatternType;
import com.qq.e.comm.util.AdError;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.BeibeiVideoApplication;
@@ -70,7 +69,6 @@
import com.weikou.beibeivideo.util.UmengEventUtil;
import com.weikou.beibeivideo.util.UserUtil;
import com.weikou.beibeivideo.util.VideoUtil;
import com.weikou.beibeivideo.util.downutil.StringUtils;
import com.weikou.beibeivideo.util.ui.IPageEventListener;
import com.yeshi.video.player.common.VideoDefinition;
import com.yeshi.video.player.common.VideoEpisode;
@@ -84,7 +82,6 @@
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;

import de.greenrobot.event.EventBus;

 BuWanVideo/src/com/weikou/beibeivideo/ui/video/SearchResultAdapter.java

@@ -4,8 +4,8 @@
import android.content.Intent;
import android.graphics.Color;
import android.graphics.Typeface;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.AbsoluteSizeSpan;
@@ -29,16 +29,12 @@
import com.qq.e.ads.nativ.NativeADEventListener;
import com.qq.e.ads.nativ.NativeUnifiedADData;
import com.qq.e.ads.nativ.widget.NativeAdContainer;
import com.qq.e.comm.constants.AdPatternType;
import com.qq.e.comm.util.AdError;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.entity.VideoDetailInfo;
import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.entity.ad.ExpressAdContainer;
import com.weikou.beibeivideo.entity.video.VideoContent;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.util.ad.ExpressAdManager;

import java.util.ArrayList;
import java.util.List;

 BuWanVideo/src/com/weikou/beibeivideo/ui/video/VideoCloumn1Adapter.java

@@ -2,26 +2,22 @@

import android.app.Activity;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;

import com.bumptech.glide.Glide;
import com.lcjian.library.util.common.StringUtils;
import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.entity.ad.ExpressAdContainer;
import com.weikou.beibeivideo.entity.video.VideoContent;
import com.weikou.beibeivideo.entity.video.holder.VideoHolder;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.util.ad.ExpressAdManager;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.util.video.VideoUIUtil;

import java.text.DecimalFormat;
import java.util.List;

import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;

 BuWanVideo/src/com/weikou/beibeivideo/ui/video/VideoColumn2Adapter.java

@@ -5,9 +5,9 @@
import android.content.Intent;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;

 BuWanVideo/src/com/weikou/beibeivideo/ui/video/VideoPlayerActivity.java

@@ -14,7 +14,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.v4.app.NotificationCompat;
import androidx.core.app.NotificationCompat;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
@@ -24,7 +24,6 @@
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
@@ -39,10 +38,8 @@
import com.tencent.smtt.sdk.WebSettings;
import com.tencent.smtt.sdk.WebView;
import com.tencent.smtt.sdk.WebViewClient;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.ui.BaseActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.util.browser.BWJavaInterface;
import com.weikou.beibeivideo.util.downutil.DownFiles;

 BuWanVideo/src/com/weikou/beibeivideo/ui/video/VideoPlayerBrowserActivity.java

@@ -18,7 +18,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.v4.app.NotificationCompat;
import androidx.core.app.NotificationCompat;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
@@ -44,16 +44,13 @@
import com.lcjian.library.util.ManifestDataUtil;
import com.lcjian.library.util.common.ClipboardUtil;
import com.lcjian.library.util.common.StringUtils;
import com.umeng.analytics.MobclickAgent;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.ui.BaseActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.util.ConfigUtil;
import com.weikou.beibeivideo.util.browser.BWJavaInterface;
import com.weikou.beibeivideo.util.downutil.DownFiles;
import com.weikou.beibeivideo.util.downutil.DownFiles.IProgress;
import com.weikou.beibeivideo.util.ui.TopStatusSettings;
import com.weikou.beibeivideo.widget.CustomWebView;
import com.yeshi.video.player.util.PlayerFullScreenUtil;

import java.util.Set;

 BuWanVideo/src/com/weikou/beibeivideo/ui/video/VideoRecommendAdapter.java

@@ -5,21 +5,16 @@
import android.content.Intent;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;

import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.DrawableImageViewTarget;
import com.lcjian.library.util.ScreenUtils;
import com.lcjian.library.util.common.DimenUtils;
import com.lcjian.library.util.common.StringUtils;
import com.qq.e.ads.nativ.NativeUnifiedADData;
import com.qq.e.ads.nativ.widget.NativeAdContainer;
import com.weikou.beibeivideo.R;
@@ -31,13 +26,11 @@
import com.weikou.beibeivideo.entity.video.holder.HeaderViewHolder;
import com.weikou.beibeivideo.entity.video.holder.VideoHolder;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.util.VideoUtil;
import com.weikou.beibeivideo.util.ad.ExpressAdManager;
import com.weikou.beibeivideo.util.ad.GDTConstant;
import com.weikou.beibeivideo.util.ad.GDTNativeADUnifiedManager;
import com.weikou.beibeivideo.util.video.VideoUIUtil;

import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;

@@ -100,7 +93,7 @@
            int total = parent.getAdapter().getItemCount();
            int minWidth = DimenUtils.dipToPixels(3, view.getContext());
            if (index == 0) {
                outRect.left = minWidth * 2; //第一列左边贴边
                outRect.left = 0; //第一列左边贴边
                outRect.right = minWidth;
            } else if (index == total - 1) {
                outRect.right = minWidth;

 BuWanVideo/src/com/weikou/beibeivideo/util/CircleImageView.java

@@ -15,11 +15,10 @@
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.util.AttributeSet;
import android.widget.ImageView;

import com.weikou.beibeivideo.R;

public class CircleImageView extends android.support.v7.widget.AppCompatImageView {
public class CircleImageView extends androidx.appcompat.widget.AppCompatImageView {

    private static final ScaleType SCALE_TYPE = ScaleType.CENTER_CROP;


 BuWanVideo/src/com/weikou/beibeivideo/util/FChoosePicDialog.java

@@ -10,7 +10,7 @@
import android.content.Intent;
import android.net.Uri;
import android.provider.MediaStore;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;

 BuWanVideo/src/com/weikou/beibeivideo/util/PermissionsActivity.java

@@ -8,9 +8,9 @@
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.ActivityCompat;

import com.weikou.beibeivideo.R;


 BuWanVideo/src/com/weikou/beibeivideo/util/PermissionsChecker.java

@@ -6,7 +6,7 @@

import android.content.Context;
import android.content.pm.PackageManager;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;

/**
 * 检查权限的工具类

 BuWanVideo/src/com/weikou/beibeivideo/util/PowerImageView.java

@@ -14,11 +14,10 @@
import android.util.TypedValue;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageView;

import com.weikou.beibeivideo.R;

public class PowerImageView extends android.support.v7.widget.AppCompatImageView implements OnClickListener {
public class PowerImageView extends androidx.appcompat.widget.AppCompatImageView implements OnClickListener {
    /**
     * 播放GIF动画的关键类
     */

 BuWanVideo/src/com/weikou/beibeivideo/util/browser/BWJavaInterface.java

@@ -4,12 +4,11 @@
import android.app.Dialog;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.webkit.JavascriptInterface;
import android.widget.ImageView;
import android.widget.TextView;

import com.alibaba.fastjson.JSON;
import com.lcjian.library.util.common.StringUtils;
import com.tencent.smtt.sdk.WebView;
import com.weikou.beibeivideo.entity.JumpDetail;

 BuWanVideo/src/com/weikou/beibeivideo/util/downutil/DownFiles.java

@@ -5,7 +5,7 @@
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.support.v4.content.FileProvider;
import androidx.core.content.FileProvider;
import android.util.Log;

import com.weikou.beibeivideo.BuildConfig;

 BuWanVideo/src/com/weikou/beibeivideo/util/downutil/DownLoadApks.java

@@ -5,7 +5,7 @@
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.support.v4.content.FileProvider;
import androidx.core.content.FileProvider;
import android.util.Log;

import com.weikou.beibeivideo.BuildConfig;

 BuWanVideo/src/com/weikou/beibeivideo/util/ui/DividerItemDecoration.java

@@ -7,8 +7,8 @@
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;



 BuWanVideo/src/com/weikou/beibeivideo/util/video/VideoUIUtil.java

@@ -2,9 +2,9 @@

import android.content.Context;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.AbsoluteSizeSpan;
@@ -12,18 +12,10 @@
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;

import com.bumptech.glide.Glide;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.transition.Transition;
import com.lcjian.library.util.common.DimenUtils;
import com.lcjian.library.util.common.StringUtils;
import com.lcjian.library.util.glide.GlideRoundTransform;
@@ -31,8 +23,6 @@
import com.weikou.beibeivideo.entity.HomeVideo;
import com.weikou.beibeivideo.entity.VideoInfo;
import com.weikou.beibeivideo.entity.video.holder.VideoHolder;

import java.text.DecimalFormat;

import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;


 BuWanVideo/src/com/weikou/beibeivideo/widget/BadgeView.java

@@ -19,7 +19,6 @@
import android.view.animation.DecelerateInterpolator;
import android.widget.FrameLayout;
import android.widget.TabWidget;
import android.widget.TextView;

import com.lcjian.library.util.common.DimenUtils;

@@ -29,7 +28,7 @@
 * 
 * @author Jeff Gilfelt
 */
public class BadgeView extends android.support.v7.widget.AppCompatTextView {
public class BadgeView extends androidx.appcompat.widget.AppCompatTextView {

    public static final int POSITION_TOP_LEFT = 1;
    public static final int POSITION_TOP_RIGHT = 2;

 BuWanVideo/src/com/weikou/beibeivideo/widget/CycleViewPager.java

@@ -2,8 +2,8 @@

import android.content.Context;
import android.database.DataSetObserver;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;

 BuWanVideo/src/com/weikou/beibeivideo/widget/FullyGridLayoutManager.java

@@ -1,8 +1,8 @@
package com.weikou.beibeivideo.widget;

import android.content.Context;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;


 BuWanVideo/src/com/weikou/beibeivideo/widget/FullyLinearLayoutManager.java

@@ -1,8 +1,8 @@
package com.weikou.beibeivideo.widget;

import android.content.Context;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;

 BuWanVideo/src/com/weikou/beibeivideo/widget/MyRefreshLayout.java

@@ -1,13 +1,8 @@
package com.weikou.beibeivideo.widget;

import android.content.Context;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.util.AttributeSet;
import android.util.Log;
import android.view.MotionEvent;
import android.view.ViewConfiguration;

import com.weikou.beibeivideo.R;

/**
 * Created by weikou2015 on 2016/10/24.

 BuWanVideo/src/com/weikou/beibeivideo/widget/MySwipeRefreshLayout.java

@@ -1,7 +1,7 @@
package com.weikou.beibeivideo.widget;

import android.content.Context;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
@@ -11,7 +11,6 @@
import android.widget.AbsListView;
import android.widget.ListView;

import com.lcjian.library.util.RefreshLayout;
import com.weikou.beibeivideo.R;

public class MySwipeRefreshLayout extends SwipeRefreshLayout implements AbsListView.OnScrollListener {

 BuWanVideo/src/com/weikou/beibeivideo/widget/StatusBar.java

@@ -1,7 +1,7 @@
package com.weikou.beibeivideo.widget;

import android.app.Activity;
import android.support.v4.view.ViewCompat;
import androidx.core.view.ViewCompat;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;

 gallery/.gitignore

File was deleted

 gallery/build.gradle

File was deleted

 gallery/proguard-rules.pro

File was deleted

 gallery/src/androidTest/java/com/lzj/gallery/library/ExampleInstrumentedTest.java

File was deleted

 gallery/src/main/AndroidManifest.xml

File was deleted

 gallery/src/main/java/com/lzj/gallery/library/adapter/BannerPagerAdapter.java

File was deleted

 gallery/src/main/java/com/lzj/gallery/library/transformer/CornerTransform.java

File was deleted

 gallery/src/main/java/com/lzj/gallery/library/transformer/ZoomPageTransformer.java

File was deleted

 gallery/src/main/java/com/lzj/gallery/library/views/BannerViewPager.java

File was deleted

 gallery/src/main/res/layout/banner_img_layout.xml

File was deleted

 gallery/src/main/res/layout/banner_view_layout.xml

File was deleted

 gallery/src/main/res/mipmap-xhdpi/ic_banner_error.png

Binary files differ

 gallery/src/main/res/mipmap-xhdpi/ic_banner_point.png

Binary files differ

 gallery/src/main/res/mipmap-xhdpi/ic_banner_point_press.png

Binary files differ

 gallery/src/main/res/values/strings.xml

File was deleted

 gallery/src/test/java/com/lzj/gallery/library/ExampleUnitTest.java

File was deleted

 library-APPUpdate/build.gradle

@@ -2,7 +2,7 @@

dependencies {
    api fileTree(include: '*.jar', dir: 'libs')
    api 'com.android.support:support-v4:27.1.1'
    api 'androidx.legacy:legacy-support-v4:1.0.0'
    implementation project(path: ':library-EventBus')
    implementation project(path: ':library-common')
}

 library-APPUpdate/src/com/yeshi/appupdate/AppUpdate.java

@@ -14,7 +14,7 @@
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.telephony.TelephonyManager;
import android.text.Html;
import android.widget.Toast;

 library-APPUpdate/src/com/yeshi/appupdate/download/DownLoadApks.java

@@ -9,7 +9,7 @@
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.support.v4.content.FileProvider;
import androidx.core.content.FileProvider;
import android.util.Log;

/**

 library-APPUpdate/src/com/yeshi/appupdate/util/StringUtils.java

@@ -13,7 +13,7 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Build;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.telephony.TelephonyManager;
import android.text.Spannable;
import android.text.SpannableStringBuilder;

 library-BaiduCPU/build.gradle

@@ -9,7 +9,7 @@
        versionCode 1
        versionName "1.0"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
        consumerProguardFiles "consumer-rules.pro"
    }

@@ -27,7 +27,7 @@
    implementation project(path: ':library-common')
    implementation project(path: ':library-ViewPagerIndicator')
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'com.android.support.test:runner:1.0.2'
    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'

}

 library-BaiduCPU/src/androidTest/java/com/yeshi/ec/library_baiducpu/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
package com.yeshi.ec.library_baiducpu;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

 library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/adapter/BaiduCPUContentAdapter.java

@@ -1,8 +1,8 @@
package com.yeshi.ec.library_baiducpu.adapter;

import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

 library-BaiduCPU/src/main/java/com/yeshi/ec/library_baiducpu/fragment/BaiDuCPUContentFragment.java

@@ -4,10 +4,10 @@
import android.graphics.Color;
import android.graphics.Rect;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.Gravity;
import android.view.View;

 library-BaiduCPU/src/main/res/layout/fragment_baidu_news_content.xml

@@ -4,19 +4,19 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <android.support.v4.widget.SwipeRefreshLayout
    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/srl_news"
        android:layout_width="match_parent"
        android:layout_height="match_parent">

        <android.support.v7.widget.RecyclerView
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/rv_news"
            android:layout_width="match_parent"
            android:layout_height="match_parent">

        </android.support.v7.widget.RecyclerView>
        </androidx.recyclerview.widget.RecyclerView>

    </android.support.v4.widget.SwipeRefreshLayout>
    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>


</LinearLayout>

 library-BaiduCPU/src/main/res/layout/fragment_baidu_news_root.xml

@@ -16,7 +16,7 @@
    </FrameLayout>


    <android.support.v4.view.ViewPager
    <androidx.viewpager.widget.ViewPager
        android:id="@+id/vp_news"
        android:layout_width="match_parent"
        android:layout_height="0dp"

 library-EventBus/build.gradle

@@ -2,7 +2,7 @@

dependencies {
    api fileTree(include: '*.jar', dir: 'libs')
    api 'com.android.support:support-v4:27.1.1'
    api 'androidx.legacy:legacy-support-v4:1.0.0'
    implementation files('libs/fastjson-1.2.7.jar')
}


 library-EventBus/src/de/greenrobot/event/util/ErrorDialogFragmentFactory.java

@@ -3,7 +3,7 @@
import android.annotation.TargetApi;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;

/**
 * Factory to allow injecting a more complex exception mapping; typically you would subclass one of {@link Honeycomb} or

 library-EventBus/src/de/greenrobot/event/util/ErrorDialogFragments.java

@@ -9,7 +9,7 @@
import android.content.DialogInterface.OnClickListener;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import androidx.fragment.app.DialogFragment;
import de.greenrobot.event.EventBus;

public class ErrorDialogFragments {

 library-EventBus/src/de/greenrobot/event/util/ErrorDialogManager.java

@@ -5,10 +5,10 @@
import android.app.Application;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import android.util.Log;
import de.greenrobot.event.EventBus;

@@ -76,7 +76,7 @@
                existingFragment.dismiss();
            }

            android.support.v4.app.DialogFragment errorFragment = (android.support.v4.app.DialogFragment) factory
            DialogFragment errorFragment = (DialogFragment) factory
                    .prepareErrorFragment(event, finishAfterDialog, argumentsForErrorDialog);
            if (errorFragment != null) {
                errorFragment.show(fm, TAG_ERROR_DIALOG);

 library-GDTSDK/build.gradle

@@ -2,7 +2,7 @@

dependencies {
    api fileTree(include: '*.jar', dir: 'libs')
    api 'com.android.support:support-v4:27.1.1'
    api 'androidx.legacy:legacy-support-v4:1.0.0'
    api 'com.qq.e.union:union:+'
}


 library-VideoPlayer/build.gradle

@@ -9,7 +9,7 @@
        versionCode 1
        versionName "1.0"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
        consumerProguardFiles "consumer-rules.pro"
        ndk {
            abiFilters 'armeabi'
@@ -29,6 +29,6 @@
    implementation project(path: ':library-common')
    implementation project(path: ':library-EventBus')
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'com.android.support.test:runner:1.0.2'
    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
}

 library-VideoPlayer/src/androidTest/java/com/yeshi/ec/funshion/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
package com.yeshi.ec.funshion;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

 library-VideoPlayer/src/main/java/com/yeshi/video/player/common/VideoDataNotifyDialog.java

@@ -3,7 +3,7 @@
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;

 library-VideoPlayer/src/main/java/com/yeshi/video/player/common/VideoEpisodeDialog.java

@@ -4,7 +4,7 @@
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;

 library-VideoPlayer/src/main/java/com/yeshi/video/player/common/VideoPlayerController.java

@@ -8,9 +8,9 @@
import android.media.MediaPlayer;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.util.AttributeSet;
import android.util.Log;
import android.view.GestureDetector;

 library-ViewPagerIndicator/build.gradle

@@ -2,7 +2,7 @@

dependencies {
    api fileTree(include: '*.jar', dir: 'libs')
    api 'com.android.support:support-v4:27.1.1'
    api 'androidx.legacy:legacy-support-v4:1.0.0'
    implementation project(':library-common')
}


 library-ViewPagerIndicator/src/com/viewpagerindicator/CirclePageIndicator.java

@@ -25,9 +25,9 @@
import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.ViewConfigurationCompat;
import android.support.v4.view.ViewPager;
import androidx.core.view.MotionEventCompat;
import androidx.core.view.ViewConfigurationCompat;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;

 library-ViewPagerIndicator/src/com/viewpagerindicator/FoundTabPageIndicator.java

@@ -19,9 +19,9 @@
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Color;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;

 library-ViewPagerIndicator/src/com/viewpagerindicator/IconPageIndicator.java

@@ -17,9 +17,9 @@
package com.viewpagerindicator;

import android.content.Context;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;

 library-ViewPagerIndicator/src/com/viewpagerindicator/LinePageIndicator.java

@@ -23,9 +23,9 @@
import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.ViewConfigurationCompat;
import android.support.v4.view.ViewPager;
import androidx.core.view.MotionEventCompat;
import androidx.core.view.ViewConfigurationCompat;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;

 library-ViewPagerIndicator/src/com/viewpagerindicator/LxyPageIndicator.java

@@ -6,25 +6,21 @@
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;

import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
import android.view.WindowManager;
import android.view.View.MeasureSpec;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.HorizontalScrollView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.FrameLayout.LayoutParams;

import com.lcjian.library.widget.IsPad;


 library-ViewPagerIndicator/src/com/viewpagerindicator/MTabPageIndicator.java

@@ -22,9 +22,9 @@
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Color;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;
@@ -32,8 +32,6 @@
import android.widget.HorizontalScrollView;
import android.widget.LinearLayout;
import android.widget.TextView;

import com.lcjian.library.widget.IsPad;

/**
 * This widget implements the dynamic action bar tab behavior that can change

 library-ViewPagerIndicator/src/com/viewpagerindicator/MainTabPageIndicator.java

@@ -21,16 +21,12 @@

import android.annotation.SuppressLint;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.Typeface;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.util.AttributeSet;
import android.util.Log;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.HorizontalScrollView;

 library-ViewPagerIndicator/src/com/viewpagerindicator/PageIndicator.java

@@ -17,7 +17,7 @@

package com.viewpagerindicator;

import android.support.v4.view.ViewPager;
import androidx.viewpager.widget.ViewPager;

/**
 * A PageIndicator is responsible to show an visual indicator on the total views

 library-ViewPagerIndicator/src/com/viewpagerindicator/SearchTabPageIndicator.java

@@ -19,9 +19,9 @@
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Color;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;

 library-ViewPagerIndicator/src/com/viewpagerindicator/TabPageIndicator.java

@@ -22,9 +22,9 @@
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Color;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;

 library-ViewPagerIndicator/src/com/viewpagerindicator/TitlePageIndicator.java

@@ -28,9 +28,9 @@
import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.ViewConfigurationCompat;
import android.support.v4.view.ViewPager;
import androidx.core.view.MotionEventCompat;
import androidx.core.view.ViewConfigurationCompat;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;

 library-ViewPagerIndicator/src/com/viewpagerindicator/UnderlinePageIndicator.java

@@ -23,9 +23,9 @@
import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.ViewConfigurationCompat;
import android.support.v4.view.ViewPager;
import androidx.core.view.MotionEventCompat;
import androidx.core.view.ViewConfigurationCompat;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;

 library-ViewPagerIndicator/src/com/viewpagerindicator/YTabPageIndicator.java

@@ -21,9 +21,9 @@
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Color;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;

 library-common/build.gradle

@@ -3,8 +3,8 @@
dependencies {
//    api fileTree(include: '*.jar', dir: 'libs')
    api 'com.squareup.okhttp3:okhttp:3.8.1'
    api 'com.android.support:support-v4:27.1.1'
    api 'com.android.support:recyclerview-v7:27.1.1'
    api 'androidx.legacy:legacy-support-v4:1.0.0'
    api 'androidx.recyclerview:recyclerview:1.0.0'
    api project(':library-NineOldAndroids')
    api 'com.github.bumptech.glide:glide:4.9.0'
    api 'com.google.code.gson:gson:1.7.1'

 library-common/src/com/lcjian/library/DeviceUuidFactory.java

@@ -7,7 +7,7 @@
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.provider.Settings.Secure;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.telephony.TelephonyManager;

public class DeviceUuidFactory {

 library-common/src/com/lcjian/library/RetainViewFragment.java

@@ -1,7 +1,7 @@
package com.lcjian.library;

import android.os.Bundle;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

 library-common/src/com/lcjian/library/content/CursorLoader.java

@@ -8,7 +8,7 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.support.v4.content.AsyncTaskLoader;
import androidx.loader.content.AsyncTaskLoader;

public class CursorLoader extends AsyncTaskLoader<Cursor> {
    final ForceLoadContentObserver mObserver;

 library-common/src/com/lcjian/library/emotion/EmotionGridFragment.java

@@ -1,7 +1,7 @@
package com.lcjian.library.emotion;

import android.os.Bundle;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;

 library-common/src/com/lcjian/library/emotion/EmotionsFragment.java

@@ -1,6 +1,6 @@
package com.lcjian.library.emotion;

import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;

public class EmotionsFragment extends Fragment {


 library-common/src/com/lcjian/library/permission/PermissionHelper.java

@@ -9,9 +9,9 @@
import android.net.Uri;
import android.os.Build;
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;

import java.util.ArrayList;


 library-common/src/com/lcjian/library/upgrade/UpdateService.java

@@ -11,11 +11,9 @@
import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.support.v4.content.FileProvider;
import androidx.core.content.FileProvider;
import android.util.Log;
import android.webkit.MimeTypeMap;

import com.lcjian.lcjianlibrary.BuildConfig;

import java.io.File;


 library-common/src/com/lcjian/library/util/DialogUtils.java

@@ -3,7 +3,7 @@

import android.app.Dialog;
import android.content.Context;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.view.Gravity;
import android.view.View;
import android.view.Window;

 library-common/src/com/lcjian/library/util/FragmentSwitchHelper.java

@@ -1,8 +1,8 @@
package com.lcjian.library.util;

import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.util.Log;

public class FragmentSwitchHelper {

 library-common/src/com/lcjian/library/util/ImageChooseHelper.java

@@ -17,7 +17,7 @@
import android.net.Uri;
import android.os.Environment;
import android.provider.MediaStore;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;

public class ImageChooseHelper {
    

 library-common/src/com/lcjian/library/util/RefreshLayout.java

@@ -1,7 +1,7 @@
package com.lcjian.library.util;

import android.content.Context;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;

 library-common/src/com/lcjian/library/util/cache/ImageMemoryCache.java

@@ -6,7 +6,7 @@
import android.app.ActivityManager;
import android.content.Context;
import android.graphics.Bitmap;
import android.support.v4.util.LruCache;
import androidx.collection.LruCache;

/**
 * 从内存读取数据速度是最快的，为了更大限度使用内存，这里使用了两层缓存。 硬引用缓存不会轻易被回收，用来保存常用数据，不常用的转入软引用缓存。

 library-common/src/com/lcjian/library/util/glide/GlideCircleTransform.java

@@ -5,7 +5,7 @@
import android.graphics.BitmapShader;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;

 library-common/src/com/lcjian/library/util/glide/GlideRoundTransform.java

@@ -7,7 +7,7 @@
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.RectF;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Log;

import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;

 library-common/src/com/lcjian/library/widget/MyViewPager.java

@@ -1,7 +1,7 @@
package com.lcjian.library.widget;

import android.content.Context;
import android.support.v4.view.ViewPager;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.View;


 library-common/src/com/lcjian/library/widget/ResizableImageView.java

@@ -2,7 +2,7 @@

import android.content.Context;
import android.graphics.drawable.Drawable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.widget.ImageView;


 library-common/src/com/lcjian/library/widget/myswiperefreshlayout/MySwipeRefreshLayout.java

@@ -4,9 +4,9 @@
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.ViewCompat;
import android.support.v4.widget.SwipeRefreshLayout;
import androidx.core.view.MotionEventCompat;
import androidx.core.view.ViewCompat;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.Log;

 library-common/src/com/lcjian/library/widget/myswiperefreshlayout/SwipeProgressBar.java

@@ -4,7 +4,7 @@
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.RectF;
import android.support.v4.view.ViewCompat;
import androidx.core.view.ViewCompat;
import android.view.View;
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;

 library-push/src/androidTest/java/com/yeshi/ec/push/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
package com.yeshi.ec.push;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

 settings.gradle

@@ -9,4 +9,5 @@
include ':library-DownloadProvider'
include ':library-common'
include ':library-APPUpdate'
include ':library-gallery'
include ':BuWanVideo'