1

.idea/gradle.xml

@@ -4,9 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -26,8 +24,6 @@
             <option value="$PROJECT_DIR$/view" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

WaterWaveProgress/build.gradle

@@ -25,8 +25,8 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 }

WaterWaveProgress/src/androidTest/java/com/bingfor/waterwaveprogress/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.bingfor.waterwaveprogress;
 
 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;

app/build.gradle

@@ -13,7 +13,7 @@ android {
         versionCode VERSION_CODE as int
         versionName VERSION_NAME
         multiDexEnabled true
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
             abiFilters "armeabi-v7a","arm64-v8a"//, 'x86'//, 'armeabi-v7a', 'x86_64', 'arm64-v8a'
         }
@@ -166,32 +166,50 @@ configurations.all {
 }
 
 dependencies {
+
+    // QQ 互联SDK，用于QQ分享、登录
+//    implementation files('libs/open_sdk_3.5.14.3_rc26220c_lite.jar')
+    implementation files('libs/open_sdk_r5923_lite.jar')
+
+    def miniSdkVersion = "1.57.30"
+    implementation ("com.tencent.qqmini:minigame:${miniSdkVersion}"){
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
+    implementation ("com.tencent.qqmini:minigame_external:${miniSdkVersion}"){
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
+    // 如果不使用sdk的互联模块，可以不依赖
+    implementation ("com.tencent.qqmini:minigame_open_sdk_all:${miniSdkVersion}"){
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
+
+
     //noinspection GradleCompatible
-    implementation "com.android.support:support-v4:$supportLibVersion"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     //noinspection GradleCompatible
-    implementation "com.android.support:cardview-v7:$supportLibVersion"
-    implementation("com.android.support:design:$supportLibVersion") {
-        exclude group: 'com.android.support', module: 'support-annotations'
-        exclude group: 'com.android.support', module: 'support-compat'
-        exclude group: 'com.android.support', module: 'support-core-ui'
-        exclude group: 'com.android.support', module: 'support-core-utils'
-        exclude group: 'com.android.support', module: 'support-fragment'
-        exclude group: 'com.android.support', module: 'transition'
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-        exclude group: 'com.android.support', module: 'cardview-v7'
-        exclude group: 'com.android.support', module: 'recyclerview-v7'
-    }
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation('com.google.android.material:material:1.0.0') {
+//        exclude group: 'com.android.support', module: 'support-annotations'
+//        exclude group: 'com.android.support', module: 'support-compat'
+//        exclude group: 'com.android.support', module: 'support-core-ui'
+//        exclude group: 'com.android.support', module: 'support-core-utils'
+//        exclude group: 'com.android.support', module: 'support-fragment'
+//        exclude group: 'com.android.support', module: 'transition'
+//        exclude group: 'com.android.support', module: 'appcompat-v7'
+//        exclude group: 'com.android.support', module: 'cardview-v7'
+//        exclude group: 'com.android.support', module: 'recyclerview-v7'
+    }
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
 
     implementation 'com.google.code.gson:gson:2.8.2'
 
     //    implementation 'com.shark:screencapture:1.0.0'
     implementation('com.jcodecraeer:xrecyclerview:1.5.9') {
-        exclude group: 'com.android.support', module: 'design'
-        exclude group: 'com.android.support', module: 'recyclerview'
-        exclude group: 'com.android.support', module: 'appcompat'
+//        exclude group: 'com.android.support', module: 'design'
+//        exclude group: 'com.android.support', module: 'recyclerview'
+//        exclude group: 'com.android.support', module: 'appcompat'
     }
     implementation 'com.squareup.wire:wire-runtime:3.6.0'
     implementation 'com.squareup.okhttp3:okhttp:3.11.0'
@@ -219,25 +237,28 @@ dependencies {
 
     //    implementation 'com.mylhyl:acp:1.1.7'
     implementation('cn.yipianfengye.android:zxing-library:2.2') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-        exclude group: 'com.android.support', module: 'support-v4'
+//        exclude group: 'com.android.support', module: 'appcompat-v7'
+//        exclude group: 'com.android.support', module: 'support-v4'
     }
 
     implementation(name: 'newbie-guide-2.4.0.1', ext: 'aar')
 
-    debugImplementation 'com.android.support:multidex:1.0.1'
+    debugImplementation 'androidx.multidex:multidex:2.0.0'
 
     //不要修改这里，相信我
-    releaseImplementation 'com.android.support:multidex:1.0.3'
+    releaseImplementation 'androidx.multidex:multidex:2.0.0'
     implementation(name: 'com.kfzs.safe-202403062150', ext: 'aar')
 
     //butterknife
-    implementation('com.jakewharton:butterknife:8.8.1') {
-        exclude group: 'com.android.support', module: 'support-annotations'
-        exclude group: 'com.android.support', module: 'support-compat'
-//        exclude group: 'com.jakewharton', module: 'butterknife-annotations'
-    }
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+//    implementation('com.jakewharton:butterknife:8.8.1') {
+//////        exclude group: 'com.android.support', module: 'support-annotations'
+//////        exclude group: 'com.android.support', module: 'support-compat'
+//////        exclude group: 'com.jakewharton', module: 'butterknife-annotations'
+////    }
+////    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+
+    implementation 'com.jakewharton:butterknife:10.0.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'
 
     //dagger2
 
@@ -293,9 +314,9 @@ dependencies {
 
     //获取动态权限三方库
     implementation('pub.devrel:easypermissions:1.2.0') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-        exclude group: 'com.android.support', module: 'support-compat'
-        exclude group: 'com.android.support', module: 'support-fragment'
+//        exclude group: 'com.android.support', module: 'appcompat-v7'
+//        exclude group: 'com.android.support', module: 'support-compat'
+//        exclude group: 'com.android.support', module: 'support-fragment'
     }
 
     //    implementation 'net.danlew:android.joda:2.9.3'
@@ -316,7 +337,7 @@ dependencies {
     //    implementation 'com.flipboard:bottomsheet-core:1.5.3'
 
     //    implementation 'com.flipboard:bottomsheet-commons:1.5.3'
-    implementation files('libs/open_sdk_r5923_lite.jar')
+//    implementation files('libs/open_sdk_r5923_lite.jar')
 
     //    implementation files('libs/wechat-sdk-android-with-mta-1.1.6.jar')
     implementation files('libs/umeng_social_tool.jar')
@@ -329,12 +350,12 @@ dependencies {
     implementation('com.zhy:okhttputils:2.6.2') {
         exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     }
-
-    implementation "com.android.support:support-annotations:$supportLibVersion"
-    implementation("com.android.support:recyclerview-v7:$supportLibVersion") {
-        exclude group: 'com.android.support', module: 'support-annotations'
-        exclude group: 'com.android.support', module: 'support-compat'
-        exclude group: 'com.android.support', module: 'support-core-ui'
+//    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
+    implementation 'androidx.annotation:annotation:1.0.0'
+    implementation('androidx.recyclerview:recyclerview:1.0.0') {
+//        exclude group: 'com.android.support', module: 'support-annotations'
+//        exclude group: 'com.android.support', module: 'support-compat'
+//        exclude group: 'com.android.support', module: 'support-core-ui'
     }
 
 //    implementation('com.github.ithedan:TextViewDrawable:v1.0') {
@@ -346,7 +367,7 @@ dependencies {
     //    implementation 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
     implementation(name: 'PhotoPicker-release-20200506', ext: 'aar')
     implementation('com.github.bumptech.glide:glide:4.9.0') {
-        exclude group: 'com.android.support', module: 'support-fragment'
+//        exclude group: 'com.android.support', module: 'support-fragment'
 //        exclude group: 'com.github.bumptech.glide', module: 'gifdecoder'
 //        exclude group: 'com.github.bumptech.glide', module: 'disklrucache'
 //        exclude group: 'com.github.bumptech.glide', module: 'annotations'
@@ -358,7 +379,7 @@ dependencies {
     //    implementation 'com.google.zxing:core:3.3.0'
     implementation project(':ucrop')
     implementation('com.sunfusheng:marqueeview:1.3.3') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
+//        exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
     //极光
@@ -384,8 +405,8 @@ dependencies {
     //    implementation(name: 'compresshelper-release', ext: 'aar')
     implementation files('libs/compresshelper-release.jar')
     implementation('com.haibin:calendarview:3.4.8') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-        exclude group: 'com.android.support', module: 'recyclerview-v7'
+//        exclude group: 'com.android.support', module: 'appcompat-v7'
+//        exclude group: 'com.android.support', module: 'recyclerview-v7'
     }
     implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-14'
     implementation 'org.greenrobot:greendao:3.2.2'
@@ -403,7 +424,7 @@ dependencies {
     // provide okhttp to connect to backend
     implementation 'com.liulishuo.okdownload:okhttp:1.0.5'
     implementation('com.trello.rxlifecycle2:rxlifecycle-components:2.2.2') {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
+//        exclude group: 'com.android.support', module: 'appcompat-v7'
 //        com.trello.rxlifecycle2', module: 'rxlifecycle-android
         exclude group: 'io.reactivex.rxjava2', module: 'rxjava'
     }
@@ -416,7 +437,7 @@ dependencies {
     implementation(name: 'YoumiSdk_v8.3.0_2018-09-20', ext: 'aar')
     implementation project(':WaterWaveProgress')
 
-    implementation "com.android.support:exifinterface:$supportLibVersion"
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
     implementation('com.qiniu:qiniu-android-sdk:7.3.13') {
         exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     }

app/proguard-rules.pro

@@ -424,7 +424,7 @@
 -verbose
 
 #忽略警告，避免打包时某些警告出现
--ignorewarning
+#-ignorewarning
 
 # 混淆时所采用的算法
 -optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
@@ -971,4 +971,84 @@
 -keep class org.json.**{*;}
 -keep public class com.netease.nis.sdkwrapper.Utils {public
 <methods>;}
--keep class com.zk.deviceidentifier.** { *; }
+-keep class com.zk.deviceidentifier.** { *; }
+
+#小游戏
+# Keep class members annotated with @MiniKepp
+# 保护代码中的注解不被混淆
+-keepattributes *Annotation*
+-keep,allowobfuscation @interface com.tencent.qqmini.sdk.annotation.MiniKeep
+-keep @com.tencent.qqmini.sdk.annotation.MiniKeep class *
+-keepclassmembers @com.tencent.qqmini.sdk.annotation.MiniKeep class ** {
+    public <methods>; <fields>;
+}
+-keepclassmembers class * {
+    @com.tencent.qqmini.sdk.annotation.MiniKeep *;
+}
+
+# Keep class members annotated with @JsEvent
+-keep,allowobfuscation @interface com.tencent.qqmini.sdk.annotation.JsEvent
+-keepclassmembers class * {
+    @com.tencent.qqmini.sdk.annotation.JsEvent *;
+}
+
+# Keep minigame triton
+-keep interface com.tencent.mobileqq.triton.** { *; }
+-keep class com.tencent.mobileqq.triton.** { *; }
+-keep @interface com.tencent.mobileqq.triton.jni.TTNativeModule, com.tencent.mobileqq.triton.jni.TTNativeCall
+-keep @com.tencent.mobileqq.triton.jni.TTNativeModule class ** {
+    @com.tencent.mobileqq.triton.jni.TTNativeCall <methods>;
+    @com.tencent.mobileqq.triton.jni.TTNativeCall <fields>;
+}
+-keep @interface io.github.landerlyoung.jenny.NativeClass, io.github.landerlyoung.jenny.NativeFieldProxy, io.github.landerlyoung.jenny.NativeMethodProxy
+-keep @io.github.landerlyoung.jenny.NativeClass class ** {
+    @io.github.landerlyoung.jenny.NativeFieldProxy <fields>;
+    @io.github.landerlyoung.jenny.NativeMethodProxy <methods>;
+}
+
+# Keep minigame sdk
+-keep class * extends com.tencent.qqmini.sdk.launcher.ui.MiniActivity
+-keep class com.tencent.qqmini.sdk.core.generated.** { *; }
+-keep class com.tencent.qqmini.sdk.launcher.** { *; }
+-keep class com.tencent.qqmini.sdk.MiniSDK { *; }
+-keep class com.tencent.qqmini.sdk.MiniSDK$* { *; }
+-keep class com.tencent.qqmini.sdk.BuildConfig { *; }
+-keep class com.tencent.qqmini.sdk.annotation.** {* ;}
+-keep class com.tencent.qqmini.sdk.utils.MiniSDKConst$AdConst{*;}
+-keep class com.tencent.qqmini.sdk.receiver.** {* ;}
+-keepclassmembers class com.tencent.qqmini.sdk.** {
+    @android.webkit.JavascriptInterface <methods>;
+}
+-keep class com.tencent.qqmini.sdk.core.proxy.service.ChannelProxyDefault { *; }
+
+# protocol: should keep field name because reflection
+-keep class cooperation.** { *; }
+-keep class com.tencent.mobileqq.pb.MessageMicro { *; }
+-keepclassmembers class * extends com.tencent.mobileqq.pb.MessageMicro {
+    <fields>;
+}
+
+# extra_ad
+-keep class com.tencent.qqmini.ad.** {* ;}
+
+# ad
+-keep class com.qq.e.** {* ;}
+
+# extraad模块直接引用了协议，先keep
+-keep class NS_MINI_AD.** { *; }
+-keep class NS_QWEB_PROTOCAL.**  { *; }
+-keep class com.tencent.mobileqq.pb.PBStringField {*;}
+-keep class com.tencent.qqmini.sdk.request.ProtoBufRequest {
+    public *;
+}
+
+# 微信互联登录
+-keep class com.tencent.mm.opensdk.** {
+    *;
+}
+-keep class com.tencent.wxop.** {
+    *;
+}
+-keep class com.tencent.mm.sdk.** {
+    *;
+}

app/src/developSheeptest/java/com/sheep/jiuyan/samllsheep/wxapi/WXEntryActivity.java

@@ -3,12 +3,16 @@ package com.sheep.jiuyan.samllsheep.wxapi;
 import android.content.Intent;
 import android.os.Bundle;
 
+import android.text.TextUtils;
 import android.util.Log;
 import com.sheep.gamegroup.event.WXLoginAuthEvent;
 import com.sheep.gamegroup.model.entity.MiniPayResult;
+import com.sheep.gamegroup.module.qqminigame.QQMGWXLoginEvent;
+import com.sheep.gamegroup.module.qqminigame.QQMiniGameLoginFgt;
 import com.sheep.gamegroup.util.*;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
@@ -51,13 +55,24 @@ public class WXEntryActivity extends WXCallbackActivity {//implements IWXAPIEven
     @Override
     public void onResp(BaseResp resp) {
         if (resp instanceof SendAuth.Resp) {
+            String openId = SpUtils.getToken(SheepApp.getInstance());
             if (resp.errCode == BaseResp.ErrCode.ERR_OK) {
                 String code = ((SendAuth.Resp) resp).code;
-                EventBus.getDefault().post(new WXLoginAuthEvent(code));
-                ProcessEventUtil.sendProcessEvent(this,new WXLoginAuthEvent(code),ProcessEventUtil.EVENT_WX_LOGIN_AUTH);
+                if (!TextUtils.isEmpty(openId)) {
+                    EventBus.getDefault().post(new QQMGWXLoginEvent(code));
+                } else {
+                    EventBus.getDefault().post(new WXLoginAuthEvent(code));
+                    ProcessEventUtil.sendProcessEvent(this,new WXLoginAuthEvent(code),ProcessEventUtil.EVENT_WX_LOGIN_AUTH);
+                }
+
             } else {
-                EventBus.getDefault().post( new WXLoginAuthEvent(null));
-                ProcessEventUtil.sendProcessEvent(this,new WXLoginAuthEvent(null),ProcessEventUtil.EVENT_WX_LOGIN_AUTH);
+                if (!TextUtils.isEmpty(openId)) {
+                    EventBus.getDefault().post(new QQMGWXLoginEvent(null));
+                } else {
+                    EventBus.getDefault().post( new WXLoginAuthEvent(null));
+                    ProcessEventUtil.sendProcessEvent(this,new WXLoginAuthEvent(null),ProcessEventUtil.EVENT_WX_LOGIN_AUTH);
+                }
+
             }
         } else if (resp instanceof WXLaunchMiniProgram.Resp) {
             WXLaunchMiniProgram.Resp miniResp = (WXLaunchMiniProgram.Resp) resp;

app/src/main/AndroidManifest.xml

@@ -43,10 +43,9 @@
     <uses-feature android:name="android.hardware.camera"/>
     <uses-feature android:name="android.hardware.camera.autofocus"/>
 
-    <uses-sdk
-            android:targetSdkVersion="30"
-            tools:overrideLibrary="com.bun.miitmdid"
-            tools:ignore="GradleOverrides"/>
+<!--    <uses-sd-->
+<!--            tools:overrideLibrary="com.bun.miitmdid"-->
+<!--            tools:ignore="GradleOverrides"/>-->
 
     <permission
             android:name="android.permission.FLASHLIGHT"
@@ -67,7 +66,8 @@
             android:theme="@style/AppTheme"
             android:usesCleartextTraffic="true"
             tools:replace="android:appComponentFactory"
-            android:appComponentFactory="sheep">
+            android:appComponentFactory="sheep"
+            android:testOnly="false">
 
         <provider android:name="com.tencent.klevin.utils.FileProvider"
                   android:authorities="${applicationId}.klevin.fileProvider"
@@ -136,6 +136,7 @@
                 android:name=".wxapi.WXEntryActivity"
                 android:configChanges="keyboardHidden|navigation|orientation|screenSize"
                 android:exported="true"
+                android:taskAffinity="com.tencent"
                 android:launchMode="singleTask"/>
 
         <activity
@@ -188,7 +189,7 @@
                 android:configChanges="keyboardHidden|orientation|screenSize|locale"
                 android:theme="@android:style/Theme.Translucent"/> <!-- 必须配置 fileProvider， 注意： android:authorities="${applicationId}.fileProvider" 不要直接copy，设置为你的包名.fileProvider -->
         <provider
-                android:name="android.support.v4.content.FileProvider"
+                android:name="androidx.core.content.FileProvider"
                 android:authorities="${applicationId}.fileProvider"
                 android:exported="false"
                 android:grantUriPermissions="true">
@@ -393,6 +394,15 @@
             </intent-filter>
         </receiver>
 
+<!--        <activity-->
+<!--            android:name="com.tencent.sample.wxapi.WXEntryActivity"-->
+<!--            android:label="@string/app_name"-->
+<!--            android:theme="@android:style/Theme.Translucent.NoTitleBar"-->
+<!--            android:exported="true"-->
+<!--            android:taskAffinity="${applicationId}"-->
+<!--            android:launchMode="singleTask">-->
+<!--        </activity>-->
+
         <activity
                 android:name="com.tencent.tauth.AuthActivity"
                 android:launchMode="singleTask"
@@ -406,10 +416,26 @@
                 <data android:scheme="tencent101461115"/>
             </intent-filter>
         </activity>
+<!--        <activity-->
+<!--            android:name=".JumpActivity"-->
+<!--            android:configChanges="orientation|keyboardHidden|locale"-->
+<!--            android:screenOrientation="portrait"-->
+<!--            android:theme="@android:style/Theme.Translucent"-->
+<!--            android:exported="true">-->
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
+
+<!--                <category android:name="android.intent.category.BROWSABLE" />-->
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+
+<!--                <data android:scheme="sheep://small.kfzs.com/xmy?type=mini_game" />-->
+<!--            </intent-filter>-->
+<!--        </activity>-->
         <activity
                 android:name="com.tencent.connect.common.AssistActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:screenOrientation="portrait"/>
+                android:screenOrientation="portrait"
+            tools:replace="android:configChanges,android:screenOrientation" />
         <activity
                 android:name="com.sheep.gamegroup.view.activity.CommitWxAct"
                 android:screenOrientation="portrait"

app/src/main/java/cn/finalteam/rxgalleryfinal/utils/CameraUtil.java

@@ -9,8 +9,8 @@ import android.hardware.Camera;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;

app/src/main/java/com/haibin/calendarviewproject/group/BaseRecyclerAdapter.java

@@ -16,7 +16,7 @@
 package com.haibin.calendarviewproject.group;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/haibin/calendarviewproject/group/GroupItemDecoration.java

@@ -4,8 +4,8 @@ import android.annotation.SuppressLint;
 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.text.TextUtils;
 import android.view.View;
 

app/src/main/java/com/haibin/calendarviewproject/group/GroupRecyclerView.java

@@ -2,8 +2,8 @@ package com.haibin.calendarviewproject.group;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 
 import com.sheep.jiuyan.samllsheep.R;

app/src/main/java/com/kfzs/duanduan/cardview/CardAdapter.java

@@ -1,6 +1,6 @@
 package com.kfzs.duanduan.cardview;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/kfzs/duanduan/cardview/CardAdapterHelper.java

@@ -1,6 +1,6 @@
 package com.kfzs.duanduan.cardview;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 

app/src/main/java/com/kfzs/duanduan/cardview/CardLinearSnapHelper.java

@@ -1,8 +1,8 @@
 package com.kfzs.duanduan.cardview;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearSnapHelper;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**

app/src/main/java/com/kfzs/duanduan/cardview/CardScaleHelper.java

@@ -1,7 +1,7 @@
 package com.kfzs.duanduan.cardview;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**

app/src/main/java/com/kfzs/duanduan/cardview/SpeedRecyclerView.java

@@ -1,8 +1,8 @@
 package com.kfzs.duanduan.cardview;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 
 /**

app/src/main/java/com/kfzs/duanduan/utils/ApkUtils.java

@@ -10,10 +10,9 @@ import android.content.pm.PackageManager;
 import android.content.pm.Signature;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.Base64;
-import android.view.View;
 
 import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.model.entity.ApkFileInfo;
@@ -35,7 +34,6 @@ import java.util.UUID;
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Predicate;
 import io.reactivex.schedulers.Schedulers;
 import rx.functions.Action1;
 

app/src/main/java/com/kfzs/duanduan/utils/ListViewUtil.java

@@ -1,9 +1,9 @@
 package com.kfzs.duanduan.utils;
 
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;

app/src/main/java/com/kfzs/duanduan/utils/StatusBarUtils.java

@@ -7,9 +7,9 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.ColorInt;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/kfzs/duanduan/view/DepthPageTransformer.java

@@ -1,6 +1,6 @@
 package com.kfzs.duanduan.view;
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 
 /**

app/src/main/java/com/kfzs/duanduan/view/DialogStorageLow.java

@@ -1,10 +1,8 @@
 package com.kfzs.duanduan.view;
 
-import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.provider.Settings;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
 

app/src/main/java/com/kfzs/duanduan/view/ImageGlarry.java

@@ -3,8 +3,8 @@ package com.kfzs.duanduan.view;
 import android.app.Activity;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;

app/src/main/java/com/kfzs/duanduan/view/KFProgressButton.java

@@ -11,7 +11,7 @@ import com.sheep.jiuyan.samllsheep.R;
  * 带进度按钮
  * Created by HooRang on 2017/2/17.
  */
-public class KFProgressButton extends android.support.v7.widget.AppCompatButton {
+public class KFProgressButton extends androidx.appcompat.widget.AppCompatButton {
 
 
     public static final int TAG_1 = R.id.view_tag_1;

app/src/main/java/com/kfzs/duanduan/view/ListMore.java

@@ -2,7 +2,7 @@ package com.kfzs.duanduan.view;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.AttributeSet;
 import android.widget.AbsListView;
 import android.widget.FrameLayout;

app/src/main/java/com/kfzs/duanduan/view/NoScrollViewPager.java

@@ -1,7 +1,7 @@
 package com.kfzs.duanduan.view;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 

app/src/main/java/com/kfzs/duanduan/view/ViewPagerPlus.java

@@ -1,9 +1,9 @@
 package com.kfzs.duanduan.view;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 

app/src/main/java/com/lqr/emoji/EmotionLayout.java

@@ -1,8 +1,8 @@
 package com.lqr.emoji;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;

app/src/main/java/com/lqr/emoji/ListPagerAdapter.java

@@ -1,7 +1,7 @@
 package com.lqr.emoji;
 
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -5,9 +5,9 @@ import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;

app/src/main/java/com/sheep/gamegroup/absBase/BaseContainerActivity.java

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.absBase;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 
 import com.sheep.jiuyan.samllsheep.R;
 

app/src/main/java/com/sheep/gamegroup/absBase/BaseListActivity2.java

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.absBase;
 
-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;
 
 import com.jcodecraeer.xrecyclerview.XRecyclerView;

app/src/main/java/com/sheep/gamegroup/absBase/IHomePageSearch.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.absBase;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

app/src/main/java/com/sheep/gamegroup/greendao/download/DownLoadInfoDao.java

@@ -28,7 +28,7 @@ public class DownLoadInfoDao extends AbstractDao<DownLoadInfo, Long> {
         public final static Property MGameName = new Property(3, String.class, "mGameName", false, "game_name");
         public final static Property MIconUrl = new Property(4, String.class, "mIconUrl", false, "icon_url");
         public final static Property MPercent = new Property(5, Integer.class, "mPercent", false, "percent");
-        public final static Property MGameID = new Property(6, int.class, "mGameID", false, "game_id");
+        public final static Property MGameID = new Property(6, Integer.class, "mGameID", false, "game_id");
         public final static Property MDownloadedSize = new Property(7, Double.class, "mDownloadedSize", false, "download_size");
         public final static Property MTotalSize = new Property(8, Double.class, "mTotalSize", false, "total_size");
         public final static Property MStatus = new Property(9, Integer.class, "mStatus", false, "status");

app/src/main/java/com/sheep/gamegroup/helper/CustomRoundAngleImageView.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Path;
 import android.os.Build;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.View;
 

app/src/main/java/com/sheep/gamegroup/helper/ImageListHelper.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.helper;
 
 import android.app.Activity;
-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;
 import android.widget.ImageView;
 import com.bumptech.glide.Glide;

app/src/main/java/com/sheep/gamegroup/helper/ScalableCardHelper.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.helper;
 
 import android.graphics.Rect;
-import android.support.v7.widget.PagerSnapHelper;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.PagerSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -329,6 +329,8 @@ public interface ApiService {
     Observable<BaseMessage> LoginByWX(@Body com.alibaba.fastjson.JSONObject jsonObject);
 
 
+
+
     /**
      * qq登录
      *
@@ -2024,4 +2026,8 @@ public interface ApiService {
     @POST("app/find/mobile_appointment")
     Observable<BaseMessage> appointGame(@Body JSONObject json);
 
+
+    @GET("app/auth/refresh_access_token")
+    Observable<BaseMessage> refresh_qqgame_wx_token(@Query("access_token") String access_token);
+
 }

app/src/main/java/com/sheep/gamegroup/model/api/ICallBack.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.model.api;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

app/src/main/java/com/sheep/gamegroup/model/entity/CommendApp.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.model.entity;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import com.sheep.gamegroup.util.ListUtil;
 

app/src/main/java/com/sheep/gamegroup/model/entity/DialogConfig.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.model.entity;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StringRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.StringRes;
 import android.view.Gravity;
 import android.view.View;
 

app/src/main/java/com/sheep/gamegroup/model/entity/DiscoveryVideo.java

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 

app/src/main/java/com/sheep/gamegroup/model/entity/GameInfoList.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.model.entity;
 
-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.view.View;
 import android.widget.TextView;
 

app/src/main/java/com/sheep/gamegroup/model/entity/SystemNotification.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.model.entity;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import com.alibaba.fastjson.JSONObject;
 

app/src/main/java/com/sheep/gamegroup/model/entity/TaskChild.java

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSONArray;

app/src/main/java/com/sheep/gamegroup/model/entity/TitleInfoList.java

@@ -1,10 +1,8 @@
 package com.sheep.gamegroup.model.entity;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
 

app/src/main/java/com/sheep/gamegroup/model/entity/UserFootprint.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.model.entity;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.util.string.SpannableSb;

app/src/main/java/com/sheep/gamegroup/model/entity/UserSign.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.model.entity;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;

app/src/main/java/com/sheep/gamegroup/model/util/AutoTaskListUtil.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.model.util;
 
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 /**
  * Created by realicing on 2018/6/15.

app/src/main/java/com/sheep/gamegroup/module/find/activity/ActFind.java

@@ -1,14 +1,11 @@
 package com.sheep.gamegroup.module.find.activity;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 
 import com.sheep.gamegroup.absBase.BaseContainerActivity;
-import com.sheep.gamegroup.model.entity.ArticleTag;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.fragment.BaseListFragment5;
-import com.sheep.gamegroup.view.fragment.FgtFindChild;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;

app/src/main/java/com/sheep/gamegroup/module/find/activity/ActMediaChoose.java

@@ -3,9 +3,9 @@ package com.sheep.gamegroup.module.find.activity;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 
 import com.alibaba.fastjson.JSONObject;
@@ -42,7 +42,6 @@ import cn.finalteam.rxgalleryfinal.bean.MediaBean;
 import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import cn.finalteam.rxgalleryfinal.utils.MediaUtils;
 import io.reactivex.Observable;
-import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.ObservableSource;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Function;

app/src/main/java/com/sheep/gamegroup/module/find/fragment/FgtMediaPickerImg.java

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.module.find.fragment;
 
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.util.LongSparseArray;
 import android.widget.ImageView;
 

app/src/main/java/com/sheep/gamegroup/module/find/fragment/FgtMediaPickerVideo.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.module.find.fragment;
 
 
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActDownloadManager.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.activity;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.sheep.gamegroup.absBase.BaseContainerActivity;
 import com.sheep.gamegroup.module.game.fragment.FgtDownloadManager;

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameCenterType.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.activity;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.sheep.gamegroup.absBase.BaseContainerActivity;
 import com.sheep.gamegroup.module.game.fragment.FgtGameCenterType;

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupMore.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.activity;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.sheep.gamegroup.absBase.BaseContainerActivity;
 import com.sheep.gamegroup.model.entity.GameListType;

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameGroupOrGameDetail.java

@@ -2,14 +2,14 @@ package com.sheep.gamegroup.module.game.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.AppCompatRatingBar;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.widget.AppCompatRatingBar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGameRank.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.activity;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.sheep.gamegroup.absBase.BaseContainerActivity;
 import com.sheep.gamegroup.module.game.fragment.FgtGameRank;

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActGitBagList.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.activity;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.sheep.gamegroup.absBase.BaseContainerActivity;
 import com.sheep.gamegroup.module.game.fragment.FgtGiftBagList;

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActMyGameList.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.activity;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.sheep.gamegroup.absBase.BaseContainerActivity;
 import com.sheep.gamegroup.module.game.fragment.FgtMyGameList;

app/src/main/java/com/sheep/gamegroup/module/game/activity/ActWelfareSpecialArea.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.module.game.activity;
 
 import android.app.Activity;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
+import com.google.android.material.tabs.TabLayout;
+import androidx.viewpager.widget.ViewPager;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.module.game.fragment.FgtAllWelfare;

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpAllWelfare.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 import android.widget.TextView;
 

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGameCenter4_3List.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.module.game.adapter;
 
 import android.app.Activity;
-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;
 import android.widget.TextView;
 

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGameCenterType.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 import android.widget.TextView;
 

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGameCenterTypeList.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 import android.widget.TextView;
 

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGameCenterTypeList2.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 import android.widget.TextView;
 

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGameGroupGameCompare.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatRatingBar;
-import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatRatingBar;
+
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGameWelfare.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -9,11 +9,8 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.List;
 

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGameWelfareAndMoneyReward.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 import android.widget.TextView;
 

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGiftBagGameGroup.java

@@ -1,14 +1,12 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.sheep.gamegroup.module.game.model.GameCenterType;
 import com.sheep.gamegroup.module.game.model.GameGroup;
-import com.sheep.gamegroup.module.game.model.GiftTags;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpGiftBags.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 import android.widget.TextView;
 

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpMyWelfare.java

@@ -1,11 +1,10 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.sheep.gamegroup.model.entity.Applications;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;

app/src/main/java/com/sheep/gamegroup/module/game/adapter/AdpRefreshWelfare.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -9,7 +9,6 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtAllWelfare.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.fragment;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtDownloadManager.java

@@ -2,9 +2,9 @@ package com.sheep.gamegroup.module.game.fragment;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
@@ -34,12 +34,10 @@ import com.sheep.gamegroup.view.fragment.BaseListFragment6;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.io.File;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameCenter.java

@@ -1,11 +1,10 @@
 package com.sheep.gamegroup.module.game.fragment;
 
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
+
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.widget.ImageView;
 
@@ -15,7 +14,6 @@ import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.WebViewEvent;
 import com.sheep.gamegroup.greendao.DDProviderHelper;
 import com.sheep.gamegroup.greendao.download.SheepAd;
-import com.sheep.gamegroup.model.entity.ArticleTag;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.module.guide.NewbieGuideHelper;
 import com.sheep.gamegroup.module.webview.fragment.FgtWeb;
@@ -23,15 +21,12 @@ import com.sheep.gamegroup.module.webview.fragment.FgtWebX5;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.helper.AdHelper;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
-import com.sheep.gamegroup.view.fragment.FgtFindChild;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.snail.antifake.jni.EmulatorDetectUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameComment.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.module.game.fragment;
 
 import android.app.Activity;
-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.LayoutInflater;
 import android.view.View;
 import android.widget.ProgressBar;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameDetail.java

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.module.game.fragment;
 
-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.TextUtils;
 import android.view.View;
 import android.widget.TextView;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameGift.java

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.module.game.fragment;
 
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.sheep.gamegroup.absBase.BaseRefreshLoadMoreFragment;
 import com.sheep.gamegroup.model.entity.Article;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameGroupMore.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.module.game.fragment;
 
 import android.os.Bundle;
-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.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameWelfare.java

@@ -1,30 +1,18 @@
 package com.sheep.gamegroup.module.game.fragment;
 
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.sheep.gamegroup.absBase.BaseRefreshLoadMoreFragment;
-import com.sheep.gamegroup.model.entity.Article;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.GameEntity;
-import com.sheep.gamegroup.model.entity.GameInfoList;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.game.adapter.AdpAllWelfare;
-import com.sheep.gamegroup.module.game.adapter.AdpGameWelfare;
 import com.sheep.gamegroup.module.game.adapter.AdpGameWelfareAndMoneyReward;
-import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.adapter.AdpGcGameAppActivityRecommend;
-import com.sheep.gamegroup.view.adapter.AdpGcGameAppArticleRecommend;
-import com.sheep.gamegroup.view.adapter.AdpGcGameAppGiftBag;
-import com.sheep.gamegroup.view.adapter.AdpGcGameAppInfoList;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.G;
 
 import org.afinal.simplecache.ApiKey;
 

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGiftBagList.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.module.game.fragment;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGiftCenter.java

@@ -1,20 +1,14 @@
 package com.sheep.gamegroup.module.game.fragment;
 
-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.RecyclerView;
 import android.view.View;
 import android.widget.EditText;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.GameEntity;
-import com.sheep.gamegroup.model.entity.GameListType;
-import com.sheep.gamegroup.model.entity.ListTypeList;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.game.adapter.AdpGameCenter4_3List;
-import com.sheep.gamegroup.module.game.adapter.AdpGameCenterType;
 import com.sheep.gamegroup.module.game.adapter.AdpGiftBagGameGroup;
 import com.sheep.gamegroup.module.game.adapter.AdpGiftBags;
 import com.sheep.gamegroup.module.game.model.GameGroup;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtMyWelfare.java

@@ -1,18 +1,15 @@
 package com.sheep.gamegroup.module.game.fragment;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.module.game.adapter.AdpMyWelfare;
 import com.sheep.gamegroup.view.fragment.BaseListFragment2;
-import com.sheep.jiuyan.samllsheep.R;
 
 import org.afinal.simplecache.ApiKey;
 
-import java.util.Locale;
-
 import io.reactivex.Observable;
 
 /**

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtPlayGame.java

@@ -1,9 +1,9 @@
 package com.sheep.gamegroup.module.game.fragment;
 
 import android.content.Context;
-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.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtSearchGameGroup.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.game.fragment;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.sheep.gamegroup.absBase.ISearch;
 import com.sheep.gamegroup.model.api.ApiService;

app/src/main/java/com/sheep/gamegroup/module/game/util/HpRefreshWelfareHelper.java

@@ -1,9 +1,8 @@
 package com.sheep.gamegroup.module.game.util;
-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;
 
-import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.module.game.adapter.AdpRefreshWelfare;
 import com.sheep.gamegroup.util.CommonUtil;

app/src/main/java/com/sheep/gamegroup/module/game/util/SpecialZoneHelper.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.module.game.util;
 
-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.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/sheep/gamegroup/module/home/GoodsRecommendsBarHelper.java

@@ -1,10 +1,10 @@
 package com.sheep.gamegroup.module.home;
 
 import android.content.Context;
-import android.graphics.Paint;
-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.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,7 +28,6 @@ import java.util.Locale;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import io.reactivex.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 

app/src/main/java/com/sheep/gamegroup/module/home/adapter/AdpDailyPlay.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.home.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -8,16 +8,11 @@ import android.widget.TextView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.sheep.gamegroup.model.entity.GameEntity;
-import com.sheep.gamegroup.model.entity.WebParams;
-import com.sheep.gamegroup.module.yf_shop.model.PromoteGoods;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.List;
-import java.util.Locale;
 
 /**
  * Created by realicing on 2019/3/26.

app/src/main/java/com/sheep/gamegroup/module/home/adapter/AdpHomeList.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.home.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
 

app/src/main/java/com/sheep/gamegroup/module/home/adapter/AdpNotificationOfArrival.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.home.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;

app/src/main/java/com/sheep/gamegroup/module/home/adapter/AdpPromoteGoods.java

@@ -1,8 +1,7 @@
 package com.sheep.gamegroup.module.home.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtDailyPlayList.java

@@ -1,13 +1,12 @@
 package com.sheep.gamegroup.module.home.fragment;
 
 import android.app.Activity;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.sheep.gamegroup.absBase.ILoadMore;
 import com.sheep.gamegroup.absBase.IRefresh;

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtHome.java

@@ -1,8 +1,8 @@
 package com.sheep.gamegroup.module.home.fragment;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import android.view.View;
 import android.widget.TextView;
 import com.sheep.gamegroup.event.BigEvent;

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtPromoteGoodsList.java

@@ -1,10 +1,10 @@
 package com.sheep.gamegroup.module.home.fragment;
 
 import android.app.Activity;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -12,9 +12,6 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.sheep.gamegroup.absBase.ILoadMore;
 import com.sheep.gamegroup.absBase.IRefresh;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.Release_task;
-import com.sheep.gamegroup.model.entity.RequestParamEty;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.home.adapter.AdpPromoteGoods;
 import com.sheep.gamegroup.module.yf_shop.model.GetPromoteGoodsUrl;

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtWrapper.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.home.fragment;
 
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.FragmentTransaction;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.Config;

app/src/main/java/com/sheep/gamegroup/module/home/fragment/HomeWrapperFragment.java

@@ -1,6 +1,6 @@
 package com.sheep.gamegroup.module.home.fragment;
 
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.FragmentTransaction;
 import android.view.View;
 import com.kfzs.duanduan.cardview.ScreenUtil;
 import com.sheep.gamegroup.event.BigEvent;

app/src/main/java/com/sheep/gamegroup/module/login/AccountConsistenceAct.java

@@ -1,9 +1,8 @@
 package com.sheep.gamegroup.module.login;
 
 import android.content.Intent;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
-import android.view.TextureView;
 import android.view.View;
 import android.widget.TextView;
 
@@ -15,7 +14,6 @@ import com.sheep.gamegroup.greendao.download.SdkLoginUser;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;