diff --git a/JCVideo_Library/build.gradle b/JCVideo_Library/build.gradle index 981bfbdce..2e84d1f26 100644 --- a/JCVideo_Library/build.gradle +++ b/JCVideo_Library/build.gradle @@ -7,8 +7,6 @@ android { defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 59 - versionName "5.5.4" ndk { abiFilters 'armeabi','arm64-v8a' } @@ -25,8 +23,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:26.1.0' + api fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.12' + api 'androidx.appcompat:appcompat:1.0.0' } diff --git a/JCVideo_Library/src/main/java/fm/jiecao/jcvideoplayer_lib/JCUtils.java b/JCVideo_Library/src/main/java/fm/jiecao/jcvideoplayer_lib/JCUtils.java index f66986e51..cf7d9a089 100644 --- a/JCVideo_Library/src/main/java/fm/jiecao/jcvideoplayer_lib/JCUtils.java +++ b/JCVideo_Library/src/main/java/fm/jiecao/jcvideoplayer_lib/JCUtils.java @@ -6,9 +6,8 @@ import android.content.ContextWrapper; import android.content.SharedPreferences; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.view.ContextThemeWrapper; import android.text.TextUtils; +import android.view.ContextThemeWrapper; import java.util.Formatter; import java.util.Locale; @@ -66,22 +65,6 @@ public class JCUtils { return null; } - /** - * Get AppCompatActivity from context - * - * @param context - * @return AppCompatActivity if it's not null - */ - public static AppCompatActivity getAppCompActivity(Context context) { - if (context == null) return null; - if (context instanceof AppCompatActivity) { - return (AppCompatActivity) context; - } else if (context instanceof ContextThemeWrapper) { - return getAppCompActivity(((ContextThemeWrapper) context).getBaseContext()); - } - return null; - } - public static int dip2px(Context context, float dpValue) { final float scale = context.getResources().getDisplayMetrics().density; return (int) (dpValue * scale + 0.5f); diff --git a/JCVideo_Library/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java b/JCVideo_Library/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java index 32e086a7a..d0bab764e 100644 --- a/JCVideo_Library/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java +++ b/JCVideo_Library/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java @@ -9,8 +9,6 @@ import android.hardware.SensorManager; import android.media.AudioManager; import android.media.MediaPlayer; import android.os.Handler; -import android.provider.Settings; -import android.support.v7.app.ActionBar; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; diff --git a/build.gradle b/build.gradle index 313ba4f17..9d0a93885 100644 --- a/build.gradle +++ b/build.gradle @@ -4,10 +4,11 @@ buildscript { jcenter() mavenCentral() maven {url 'https://dl.google.com/dl/android/maven2/'} + google() } dependencies { // classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2' - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:4.2.2' } } allprojects { @@ -20,6 +21,7 @@ allprojects { maven { url 'http://maven.aliyun.com/nexus/content/repositories/releases/' } + google() } } ext { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 843a66af6..63dc3645e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Sep 21 11:53:04 CST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/iFish7/build.gradle b/iFish7/build.gradle index 9b9d426bd..bf3f166e6 100644 --- a/iFish7/build.gradle +++ b/iFish7/build.gradle @@ -94,7 +94,7 @@ dependencies { implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' implementation 'com.google.zxing:core:3.3.0' //云信聊天 - implementation 'com.android.support:multidex:1.0.3' + implementation 'androidx.multidex:multidex:2.0.0' implementation files('libs/AMap_Services_V2.3.1.jar') //定位 implementation files('libs/Android_2DMap_V2.4.0.jar') @@ -110,7 +110,7 @@ dependencies { //友盟微社区 implementation 'jp.wasabeef:picasso-transformations:2.1.0' //Picasso 显示圆形图片 - implementation 'com.android.support:design:28.0.0' + implementation 'com.google.android.material:material:1.0.0' implementation 'com.github.bumptech.glide:glide:3.7.0' //Glide implementation 'cn.bingoogolapple:bga-refreshlayout:1.1.7@aar' diff --git a/iFish7/src/main/AndroidManifest.xml b/iFish7/src/main/AndroidManifest.xml index 1e55640ac..b77d82009 100644 --- a/iFish7/src/main/AndroidManifest.xml +++ b/iFish7/src/main/AndroidManifest.xml @@ -283,12 +283,13 @@ android:icon="@drawable/app_icon" android:label="@string/app_name" android:theme="@style/MyAppTheme" + android:usesCleartextTraffic="true" tools:replace="android:icon,android:theme,android:allowBackup"> diff --git a/iFish7/src/main/java/com/ifish/activity/DeviceConnectTutorialActivity.java b/iFish7/src/main/java/com/ifish/activity/DeviceConnectTutorialActivity.java index a08b44acb..8cc194048 100644 --- a/iFish7/src/main/java/com/ifish/activity/DeviceConnectTutorialActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/DeviceConnectTutorialActivity.java @@ -1,9 +1,10 @@ package com.ifish.activity; import android.os.Bundle; -import android.support.annotation.Nullable; import android.widget.ImageView; +import androidx.annotation.Nullable; + import com.bumptech.glide.Glide; import com.ifish.baseclass.BaseActivity; diff --git a/iFish7/src/main/java/com/ifish/activity/DeviceReSetActivity.java b/iFish7/src/main/java/com/ifish/activity/DeviceReSetActivity.java index cc1327ffd..44d041186 100644 --- a/iFish7/src/main/java/com/ifish/activity/DeviceReSetActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/DeviceReSetActivity.java @@ -9,7 +9,6 @@ import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; -import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -40,6 +39,8 @@ import de.greenrobot.event.EventBus; import static com.ifish.activity.MainTabActivity.sp; +import androidx.annotation.Nullable; + public class DeviceReSetActivity extends BaseActivity { private HttpManager hm = HttpManager.getInstance(); DatagramSocket ds; @@ -62,7 +63,7 @@ public class DeviceReSetActivity extends BaseActivity { findViewById(R.id.bt_setconnect).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE); WifiInfo wifiInfo = wifiManager.getConnectionInfo(); if (!wifiManager.isWifiEnabled()) { ToastUtil.show(getApplicationContext(), "请检查WiFi是否开启"); diff --git a/iFish7/src/main/java/com/ifish/activity/DeviceRestartActivity.java b/iFish7/src/main/java/com/ifish/activity/DeviceRestartActivity.java index ad4175a19..6faddd0a2 100644 --- a/iFish7/src/main/java/com/ifish/activity/DeviceRestartActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/DeviceRestartActivity.java @@ -4,11 +4,12 @@ import android.content.Intent; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Bundle; -import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.Log; import android.view.View; +import androidx.annotation.Nullable; + import com.ifish.baseclass.BaseActivity; import com.ifish.tcp.BackFunctionCode7_11; import com.ifish.tcp.ModelCodec; diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentActivity.java index 919d6b3b9..482f5a948 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentActivity.java @@ -1,73 +1,41 @@ package com.ifish.activity; import android.app.Activity; -import android.app.AlertDialog; import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; import android.net.wifi.ScanResult; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Bundle; -import android.os.CountDownTimer; import android.os.Handler; import android.os.Message; -import android.provider.Settings; -import android.support.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.view.Window; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; -import android.widget.TextView; -import com.ifish.basebean.BaseBean; +import androidx.annotation.Nullable; + import com.ifish.basebean.ConnectMessageEvent; -import com.ifish.basebean.Device; -import com.ifish.basebean.PopHealth; import com.ifish.baseclass.BaseActivity; -import com.ifish.baseclass.BaseGradeActivity; -import com.ifish.tcp.BackFunctionCode7_11; -import com.ifish.tcp.ModelCodec; -import com.ifish.tcp.OrderDeviceConnectModel; -import com.ifish.tcp.OrderModel; import com.ifish.utils.AnimationUtil; -import com.ifish.utils.ByteUtil; -import com.ifish.utils.Commons; -import com.ifish.utils.Commons.LoginSPKey; -import com.ifish.utils.Commons.NetWork; -import com.ifish.utils.Commons.Text; -import com.ifish.utils.HttpListener; -import com.ifish.utils.HttpManager; -import com.ifish.utils.L; import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; import com.ifish.utils.WifiAdmin; import com.ifish.utils.WifiUtil; -import com.ifish.view.SelectorImageView; import com.ifish.view.WifiDialog; import com.ifish.wheelview.adapter.ArrayWheelAdapter; import com.ifish.wheelview.view.WheelView; import java.io.BufferedReader; -import java.io.IOException; import java.io.InputStreamReader; -import java.lang.reflect.Field; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import de.greenrobot.event.EventBus; -import de.greenrobot.event.ThreadMode; public class HotSpotConnentActivity extends BaseActivity { private EditText et_wifiname, et_wifipwd; diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java index 400b6c72e..2279228a1 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java @@ -1,27 +1,16 @@ package com.ifish.activity; import android.app.Activity; -import android.app.Dialog; -import android.content.Context; import android.content.Intent; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.net.wifi.ScanResult; -import android.net.wifi.WifiInfo; -import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; import android.os.Message; -import android.support.annotation.Nullable; -import android.text.TextUtils; import android.util.Log; -import android.view.View; -import android.view.Window; -import android.widget.Button; -import android.widget.EditText; import android.widget.ImageView; +import androidx.annotation.Nullable; + import com.bumptech.glide.Glide; import com.ifish.basebean.BaseBean; import com.ifish.basebean.ConnectMessageEvent; @@ -43,11 +32,6 @@ import com.ifish.utils.HttpManager; import com.ifish.utils.L; import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; -import com.ifish.utils.WifiAdmin; -import com.ifish.utils.WifiUtil; -import com.ifish.view.WifiDialog; -import com.ifish.wheelview.adapter.ArrayWheelAdapter; -import com.ifish.wheelview.view.WheelView; import java.io.BufferedReader; import java.io.IOException; @@ -56,9 +40,6 @@ import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetAddress; import java.net.InetSocketAddress; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; import de.greenrobot.event.EventBus; diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceCameraActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceCameraActivity.java index 60c38a0bb..470658177 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceCameraActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceCameraActivity.java @@ -6,34 +6,25 @@ import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; import android.os.Message; -import android.support.annotation.Nullable; import android.util.Log; import android.widget.ImageView; +import androidx.annotation.Nullable; + import com.bumptech.glide.Glide; import com.ifish.basebean.BaseBean; import com.ifish.basebean.ConnectMessageEvent; -import com.ifish.basebean.Device; import com.ifish.basebean.FinishWaitActivity; import com.ifish.basebean.RefreshCamera; import com.ifish.baseclass.BaseActivity; -import com.ifish.baseclass.BaseGradeActivity; import com.ifish.baseclass.BaseGradeMonitorActivity; import com.ifish.geewe.Camera; -import com.ifish.geewe.Constants; -import com.ifish.tcp.BackFunctionCode7_11; -import com.ifish.tcp.ModelCodec; -import com.ifish.tcp.OrderDeviceConnectModel; -import com.ifish.tcp.OrderModel; -import com.ifish.utils.AnimationUtil; -import com.ifish.utils.ByteUtil; import com.ifish.utils.Commons; import com.ifish.utils.Commons.LoginSPKey; import com.ifish.utils.Commons.NetWork; import com.ifish.utils.Commons.Text; import com.ifish.utils.HttpListener; import com.ifish.utils.HttpManager; -import com.ifish.utils.L; import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; import com.jwkj.device.apmode.APManager; @@ -41,8 +32,10 @@ import com.jwkj.device.apmode.ResultCallback; import com.jwkj.device.entity.APDeviceConfig; import com.p2p.core.P2PHandler; import com.p2p.core.global.P2PConstants; + import java.io.BufferedReader; import java.io.InputStreamReader; + import de.greenrobot.event.EventBus; public class HotSpotConnentDeviceCameraActivity extends BaseActivity { diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentPetDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentPetDeviceActivity.java index 035c0ed26..bd8f9b3cc 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentPetDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentPetDeviceActivity.java @@ -6,15 +6,15 @@ import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; import android.os.Message; -import android.support.annotation.Nullable; import android.util.Log; import android.widget.ImageView; +import androidx.annotation.Nullable; + import com.bumptech.glide.Glide; import com.ifish.basebean.BaseBean; import com.ifish.basebean.ConnectMessageEvent; import com.ifish.basebean.Device; -import com.ifish.basebean.StoreName; import com.ifish.baseclass.BaseActivity; import com.ifish.baseclass.BaseGradeActivity; import com.ifish.tcp.BackFunctionCode7_11; diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentSetWIFIActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentSetWIFIActivity.java index eb075126e..a6e637829 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentSetWIFIActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentSetWIFIActivity.java @@ -14,7 +14,7 @@ import android.os.CountDownTimer; import android.os.Handler; import android.os.Message; import android.provider.Settings; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; import android.view.View; diff --git a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java index f88ee8e3c..67e1a99ed 100644 --- a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java @@ -10,7 +10,6 @@ import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; import android.os.Message; -import android.support.annotation.NonNull; import android.text.SpannableStringBuilder; import android.text.TextPaint; import android.text.TextUtils; @@ -28,6 +27,8 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.NonNull; + import com.alibaba.sdk.android.httpdns.HttpDns; import com.alibaba.sdk.android.httpdns.HttpDnsService; import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory; @@ -58,13 +59,14 @@ import com.ifish.view.SuperTextView; import com.squareup.picasso.Picasso; import com.tencent.mm.sdk.openapi.IWXAPI; import com.tencent.mm.sdk.openapi.WXAPIFactory; -import java.net.InetAddress; + import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Timer; import java.util.TimerTask; + import io.reactivex.Observable; import io.reactivex.ObservableEmitter; import io.reactivex.ObservableOnSubscribe; diff --git a/iFish7/src/main/java/com/ifish/activity/LookFishListActivity.java b/iFish7/src/main/java/com/ifish/activity/LookFishListActivity.java index 120cb2ce9..ca20457c9 100644 --- a/iFish7/src/main/java/com/ifish/activity/LookFishListActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/LookFishListActivity.java @@ -1,13 +1,14 @@ package com.ifish.activity; import android.os.Bundle; -import android.support.design.widget.TabLayout; -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 android.view.View; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; + +import com.google.android.material.tabs.TabLayout; import com.ifish.basebean.MyLiveRoomInfo; import com.ifish.baseclass.BaseFragmentActivity; import com.ifish.baseclass.BaseV4Fragment; diff --git a/iFish7/src/main/java/com/ifish/activity/MainTabActivity.java b/iFish7/src/main/java/com/ifish/activity/MainTabActivity.java index ae72ac34e..0c5cc155e 100644 --- a/iFish7/src/main/java/com/ifish/activity/MainTabActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MainTabActivity.java @@ -1,5 +1,7 @@ package com.ifish.activity; +import static com.ifish.activity.R.id.bageview; + import android.app.AlertDialog; import android.app.Dialog; import android.app.NotificationManager; @@ -14,12 +16,6 @@ import android.net.NetworkInfo; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v4.view.ViewPager.OnPageChangeListener; import android.text.TextUtils; import android.util.Log; import android.util.SparseArray; @@ -32,6 +28,12 @@ import android.widget.TabHost.OnTabChangeListener; import android.widget.TabHost.TabContentFactory; import android.widget.TextView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; + import com.ifish.basebean.BaseBean; import com.ifish.basebean.ErrorReceiveObj; import com.ifish.basebean.ErrorReceiveToast; @@ -66,7 +68,6 @@ import com.ifish.utils.ConfigUtil; import com.ifish.utils.HttpListener; import com.ifish.utils.HttpManager; import com.ifish.utils.L; -import com.ifish.utils.PushTypeEnum; import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; import com.ifish.utils.UnreadCount; @@ -74,20 +75,16 @@ import com.ifish.view.DisplayUtil; import com.lidroid.xutils.http.HttpHandler; import com.p2p.core.P2PHandler; import com.umeng.socialize.UMShareAPI; -import com.ut.mini.UTAnalytics; import java.net.Socket; import java.util.ArrayList; import java.util.List; -import java.util.Map; import cn.bingoogolapple.badgeview.BGABadgeImageView; import cn.bingoogolapple.badgeview.BGABadgeable; import cn.bingoogolapple.badgeview.BGADragDismissDelegate; import de.greenrobot.event.EventBus; -import static com.ifish.activity.R.id.bageview; - /** * @author Jacky dada @@ -588,7 +585,7 @@ public class MainTabActivity extends BaseFragmentActivity { } public class TabAdapter extends FragmentPagerAdapter implements - OnPageChangeListener, OnTabChangeListener { + ViewPager.OnPageChangeListener, OnTabChangeListener { private Context context; private List tabInfos = new ArrayList(); private FragmentManager fragmentManager; diff --git a/iFish7/src/main/java/com/ifish/activity/MyGoldActivity.java b/iFish7/src/main/java/com/ifish/activity/MyGoldActivity.java index 07b4c31c9..7003ef19b 100644 --- a/iFish7/src/main/java/com/ifish/activity/MyGoldActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MyGoldActivity.java @@ -1,17 +1,18 @@ package com.ifish.activity; import android.os.Bundle; -import android.support.design.widget.TabLayout; -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 android.text.SpannableString; import android.text.Spanned; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; + +import com.google.android.material.tabs.TabLayout; import com.ifish.baseclass.BaseFragmentActivity; import com.ifish.baseclass.BaseV4Fragment; import com.ifish.fragment.GoldExpendRecordFragment; diff --git a/iFish7/src/main/java/com/ifish/activity/VideoRecordingActivity.java b/iFish7/src/main/java/com/ifish/activity/VideoRecordingActivity.java index a992199ce..0d6e86c01 100644 --- a/iFish7/src/main/java/com/ifish/activity/VideoRecordingActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/VideoRecordingActivity.java @@ -4,13 +4,7 @@ import android.app.Activity; import android.app.Dialog; import android.os.Bundle; import android.os.CountDownTimer; -import android.support.design.widget.TabLayout; -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 android.text.TextUtils; -import android.util.Log; import android.view.View; import android.view.Window; import android.widget.Button; @@ -19,31 +13,19 @@ import android.widget.TextView; import com.ifish.basebean.CameraBean; import com.ifish.basebean.CameraType; import com.ifish.basebean.CameraVideoType; -import com.ifish.basebean.CustomIcon; -import com.ifish.basebean.MyLiveRoomInfo; import com.ifish.basebean.RetGetRemoteRecordResult; import com.ifish.basebean.RetSetRecordTypeResult; import com.ifish.baseclass.BaseActivity; -import com.ifish.baseclass.BaseFragmentActivity; -import com.ifish.baseclass.BaseV4Fragment; -import com.ifish.fragment.LookFishCenterFragment; -import com.ifish.fragment.LookFishLeftFragment; -import com.ifish.fragment.LookFishRightFragment; import com.ifish.geewe.Camera; -import com.ifish.tcp.BackInfoMode2F_TimeItem; import com.ifish.utils.AnimationUtil; -import com.ifish.utils.ByteUtil; import com.ifish.utils.Commons; import com.ifish.utils.HttpManager; import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; import com.ifish.view.SelectorImageView; import com.p2p.core.P2PHandler; -import com.p2p.core.P2PSpecial.P2PSpecial; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import de.greenrobot.event.EventBus; diff --git a/iFish7/src/main/java/com/ifish/activity/WelcomeActivity.java b/iFish7/src/main/java/com/ifish/activity/WelcomeActivity.java index 3e612dd96..893165709 100644 --- a/iFish7/src/main/java/com/ifish/activity/WelcomeActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/WelcomeActivity.java @@ -2,14 +2,15 @@ package com.ifish.activity; import android.content.Intent; import android.os.Bundle; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; import android.widget.Button; import android.widget.ImageView; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; + import com.ifish.baseclass.BaseActivityNotAnim; import com.ifish.utils.Commons.LoginSPKey; import com.ifish.utils.ConfigUtil; diff --git a/iFish7/src/main/java/com/ifish/activity/wxapi/WXEntryActivity.java b/iFish7/src/main/java/com/ifish/activity/wxapi/WXEntryActivity.java index 41145b492..7b9c5997e 100644 --- a/iFish7/src/main/java/com/ifish/activity/wxapi/WXEntryActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/wxapi/WXEntryActivity.java @@ -3,7 +3,7 @@ package com.ifish.activity.wxapi; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.ifish.basebean.ConnectMessageEvent; diff --git a/iFish7/src/main/java/com/ifish/adapter/RecyclingPagerAdapter.java b/iFish7/src/main/java/com/ifish/adapter/RecyclingPagerAdapter.java index 7a6cafdc3..059c4a281 100644 --- a/iFish7/src/main/java/com/ifish/adapter/RecyclingPagerAdapter.java +++ b/iFish7/src/main/java/com/ifish/adapter/RecyclingPagerAdapter.java @@ -1,10 +1,11 @@ package com.ifish.adapter; -import android.support.v4.view.PagerAdapter; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; +import androidx.viewpager.widget.PagerAdapter; + /** * {@link PagerAdapter} which behaves like an {@link android.widget.Adapter} with view types and * view recycling. diff --git a/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java b/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java index d1504eed3..da21fcd1a 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java +++ b/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java @@ -7,8 +7,10 @@ */ package com.ifish.baseclass; -import android.support.multidex.MultiDexApplication; import android.util.Log; + +import androidx.multidex.MultiDexApplication; + import com.alibaba.sdk.android.push.CloudPushService; import com.alibaba.sdk.android.push.CommonCallback; import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory; diff --git a/iFish7/src/main/java/com/ifish/baseclass/BaseFragmentActivity.java b/iFish7/src/main/java/com/ifish/baseclass/BaseFragmentActivity.java index ed6e039a0..245041a2d 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/BaseFragmentActivity.java +++ b/iFish7/src/main/java/com/ifish/baseclass/BaseFragmentActivity.java @@ -7,7 +7,6 @@ import android.content.Intent; import android.content.pm.ActivityInfo; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.FragmentActivity; import android.view.View; import android.view.View.OnClickListener; import android.view.Window; @@ -15,6 +14,8 @@ import android.view.inputmethod.InputMethodManager; import android.widget.TextView; import android.widget.Toast; +import androidx.fragment.app.FragmentActivity; + import com.ifish.activity.R; import com.ifish.basebean.BaseBean; import com.ifish.basebean.UserAsset; diff --git a/iFish7/src/main/java/com/ifish/baseclass/BaseV4Fragment.java b/iFish7/src/main/java/com/ifish/baseclass/BaseV4Fragment.java index 9fb755501..da851becf 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/BaseV4Fragment.java +++ b/iFish7/src/main/java/com/ifish/baseclass/BaseV4Fragment.java @@ -11,13 +11,14 @@ import android.app.Activity; import android.app.ProgressDialog; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import com.ifish.basebean.BaseBean; import com.ifish.basebean.ChangeWater; import com.ifish.basebean.UserAsset; @@ -43,7 +44,7 @@ public class BaseV4Fragment extends Fragment implements OnClickListener { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - toast = Toast.makeText(getActivity(), "", 0); + toast = Toast.makeText(getActivity(), "", Toast.LENGTH_SHORT); EventBus.getDefault().register(this); L.i(this.getClass().getName()+"----------------onCreate"); } diff --git a/iFish7/src/main/java/com/ifish/baseclass/LazyLoadingFragment.java b/iFish7/src/main/java/com/ifish/baseclass/LazyLoadingFragment.java index 279ad0e3c..e9fa822ee 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/LazyLoadingFragment.java +++ b/iFish7/src/main/java/com/ifish/baseclass/LazyLoadingFragment.java @@ -1,10 +1,11 @@ package com.ifish.baseclass; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.View; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + /** * Created by jay on 2017/1/16 下午6:51 */ diff --git a/iFish7/src/main/java/com/ifish/baseclass/UriForFile.java b/iFish7/src/main/java/com/ifish/baseclass/UriForFile.java index 5ed6f5060..12f0f9ad5 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/UriForFile.java +++ b/iFish7/src/main/java/com/ifish/baseclass/UriForFile.java @@ -3,8 +3,8 @@ package com.ifish.baseclass; import android.content.Context; import android.net.Uri; import android.os.Build; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import java.io.File; diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java index f7b140c21..5e732f88d 100644 --- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java @@ -26,8 +26,6 @@ import android.os.Environment; import android.os.Handler; import android.os.Message; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.v4.content.FileProvider; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; @@ -46,12 +44,13 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.NonNull; + import com.bumptech.glide.Glide; import com.ifish.activity.BindTwoDeviceActivity; import com.ifish.activity.BlackListActivity; import com.ifish.activity.DeviceInstructionActivity; import com.ifish.activity.InformationListActivity; -import com.ifish.activity.LoadingActivity; import com.ifish.activity.MainEightControlActivity; import com.ifish.activity.MainFiveBDControlActivity; import com.ifish.activity.MainFiveControlActivity; @@ -73,7 +72,6 @@ import com.ifish.activity.MyLevelValueActivity; import com.ifish.activity.R; import com.ifish.activity.RecentContactsActivity; import com.ifish.activity.SignActivity; -import com.ifish.activity.WebViewActivity; import com.ifish.activity.WebViewMessageActivity; import com.ifish.activity.WebViewTaobaoActivity; import com.ifish.adapter.CameraFragmentAdapter; diff --git a/iFish7/src/main/java/com/ifish/fragment/LookFishListFragment.java b/iFish7/src/main/java/com/ifish/fragment/LookFishListFragment.java index faca64f8e..3ca6b43e3 100644 --- a/iFish7/src/main/java/com/ifish/fragment/LookFishListFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/LookFishListFragment.java @@ -2,16 +2,16 @@ package com.ifish.fragment; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.TabLayout; -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 android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; + +import com.google.android.material.tabs.TabLayout; import com.ifish.activity.LookFishMineActivity; import com.ifish.activity.R; import com.ifish.basebean.MyLiveRoomInfo; @@ -93,7 +93,7 @@ public class LookFishListFragment extends BaseV4Fragment{ } @Override - public Fragment getItem(int position) { + public BaseV4Fragment getItem(int position) { return fragmentList.get(position); } diff --git a/iFish7/src/main/java/com/ifish/fragment/MenuLeftFragment.java b/iFish7/src/main/java/com/ifish/fragment/MenuLeftFragment.java index 953bd913c..5dcf75fcd 100644 --- a/iFish7/src/main/java/com/ifish/fragment/MenuLeftFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/MenuLeftFragment.java @@ -8,7 +8,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -16,6 +15,8 @@ import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import com.ifish.activity.CaptureActivity; import com.ifish.activity.MineActivity; import com.ifish.activity.R; diff --git a/iFish7/src/main/java/com/ifish/fragment/MenuRightFragment.java b/iFish7/src/main/java/com/ifish/fragment/MenuRightFragment.java index 036abbb79..c305ba837 100644 --- a/iFish7/src/main/java/com/ifish/fragment/MenuRightFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/MenuRightFragment.java @@ -7,9 +7,6 @@ */ package com.ifish.fragment; -import java.util.ArrayList; -import java.util.List; - import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; @@ -19,7 +16,6 @@ import android.content.Intent; import android.database.Cursor; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -33,6 +29,8 @@ import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import com.ifish.activity.ChangeCameraNameActivity; import com.ifish.activity.LoadingActivity; import com.ifish.activity.NextBindActivity; @@ -66,6 +64,9 @@ import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; import com.ifish.view.GridViewFooter; +import java.util.ArrayList; +import java.util.List; + import de.greenrobot.event.EventBus; /** diff --git a/iFish7/src/main/java/com/ifish/geewe/BasePagerAdapter.java b/iFish7/src/main/java/com/ifish/geewe/BasePagerAdapter.java index 491e3942c..456b1daeb 100644 --- a/iFish7/src/main/java/com/ifish/geewe/BasePagerAdapter.java +++ b/iFish7/src/main/java/com/ifish/geewe/BasePagerAdapter.java @@ -21,7 +21,7 @@ import java.util.List; import android.content.Context; import android.os.Parcelable; -import android.support.v4.view.PagerAdapter; +import androidx.viewpager.widget.PagerAdapter; import android.view.View; import android.view.ViewGroup; diff --git a/iFish7/src/main/java/com/ifish/geewe/GalleryViewPager.java b/iFish7/src/main/java/com/ifish/geewe/GalleryViewPager.java index 157466a58..e9fedf92a 100644 --- a/iFish7/src/main/java/com/ifish/geewe/GalleryViewPager.java +++ b/iFish7/src/main/java/com/ifish/geewe/GalleryViewPager.java @@ -21,11 +21,12 @@ import android.annotation.TargetApi; import android.content.Context; import android.graphics.PointF; import android.os.Build; -import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; +import androidx.viewpager.widget.ViewPager; + /** * * @ClassName: GalleryViewPager diff --git a/iFish7/src/main/java/com/ifish/permission/PermissionHelper.java b/iFish7/src/main/java/com/ifish/permission/PermissionHelper.java index 7c36d3585..b61617eb7 100644 --- a/iFish7/src/main/java/com/ifish/permission/PermissionHelper.java +++ b/iFish7/src/main/java/com/ifish/permission/PermissionHelper.java @@ -1,6 +1,8 @@ package com.ifish.permission; +import static androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale; + import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -8,16 +10,15 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.Uri; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; + +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; import java.util.ArrayList; import java.util.List; -import static android.support.v4.app.ActivityCompat.shouldShowRequestPermissionRationale; - public class PermissionHelper { private static PermissionHelper permissionHelper; diff --git a/iFish7/src/main/java/com/ifish/swipemenulistview/SwipeMenuLayout.java b/iFish7/src/main/java/com/ifish/swipemenulistview/SwipeMenuLayout.java index 5e24365e5..20ccda43a 100644 --- a/iFish7/src/main/java/com/ifish/swipemenulistview/SwipeMenuLayout.java +++ b/iFish7/src/main/java/com/ifish/swipemenulistview/SwipeMenuLayout.java @@ -1,8 +1,6 @@ package com.ifish.swipemenulistview; import android.content.Context; -import android.support.v4.view.GestureDetectorCompat; -import android.support.v4.widget.ScrollerCompat; import android.util.AttributeSet; import android.util.Log; import android.util.TypedValue; @@ -10,12 +8,13 @@ import android.view.GestureDetector.OnGestureListener; import android.view.GestureDetector.SimpleOnGestureListener; import android.view.MotionEvent; import android.view.View; -import android.view.ViewGroup; -import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.animation.Interpolator; import android.widget.AbsListView; import android.widget.FrameLayout; +import androidx.core.view.GestureDetectorCompat; +import androidx.core.widget.ScrollerCompat; + /** * * @author baoyz diff --git a/iFish7/src/main/java/com/ifish/swipemenulistview/SwipeMenuListView.java b/iFish7/src/main/java/com/ifish/swipemenulistview/SwipeMenuListView.java index 25c02709c..535e403d5 100644 --- a/iFish7/src/main/java/com/ifish/swipemenulistview/SwipeMenuListView.java +++ b/iFish7/src/main/java/com/ifish/swipemenulistview/SwipeMenuListView.java @@ -1,7 +1,7 @@ package com.ifish.swipemenulistview; import android.content.Context; -import android.support.v4.view.MotionEventCompat; +import androidx.core.view.MotionEventCompat; import android.util.AttributeSet; import android.util.TypedValue; import android.view.MotionEvent; diff --git a/iFish7/src/main/java/com/ifish/tcp/FishFeedType.java b/iFish7/src/main/java/com/ifish/tcp/FishFeedType.java index f9bf6e4cb..b5b526809 100644 --- a/iFish7/src/main/java/com/ifish/tcp/FishFeedType.java +++ b/iFish7/src/main/java/com/ifish/tcp/FishFeedType.java @@ -2,7 +2,9 @@ package com.ifish.tcp; import static com.ifish.tcp.FishFeedType.CLOSE_FISH_FEED; import static com.ifish.tcp.FishFeedType.OPEN_FISH_FEED; -import android.support.annotation.IntDef; + +import androidx.annotation.IntDef; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; /** diff --git a/iFish7/src/main/java/com/ifish/timecheck/DatePickerView.java b/iFish7/src/main/java/com/ifish/timecheck/DatePickerView.java index 9ad74680e..a73cf9c18 100644 --- a/iFish7/src/main/java/com/ifish/timecheck/DatePickerView.java +++ b/iFish7/src/main/java/com/ifish/timecheck/DatePickerView.java @@ -8,11 +8,12 @@ import android.graphics.Paint.FontMetricsInt; import android.graphics.Paint.Style; import android.os.Handler; import android.os.Message; -import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; +import androidx.core.content.ContextCompat; + import com.ifish.activity.R; import java.util.ArrayList; diff --git a/iFish7/src/main/java/com/ifish/utils/RichCompat.java b/iFish7/src/main/java/com/ifish/utils/RichCompat.java index ccbb80b48..f7b97489d 100644 --- a/iFish7/src/main/java/com/ifish/utils/RichCompat.java +++ b/iFish7/src/main/java/com/ifish/utils/RichCompat.java @@ -1,6 +1,5 @@ package com.ifish.utils; -import android.support.annotation.DrawableRes; import android.text.Spannable; import android.text.SpannableString; import android.text.Spanned; @@ -13,6 +12,8 @@ import android.text.style.SubscriptSpan; import android.text.style.SuperscriptSpan; import android.widget.TextView; +import androidx.annotation.DrawableRes; + /** * 富文本工具类 diff --git a/iFish7/src/main/java/com/ifish/view/CirclePageIndicator.java b/iFish7/src/main/java/com/ifish/view/CirclePageIndicator.java index b5bb75b3f..50f89ea67 100644 --- a/iFish7/src/main/java/com/ifish/view/CirclePageIndicator.java +++ b/iFish7/src/main/java/com/ifish/view/CirclePageIndicator.java @@ -1,5 +1,9 @@ package com.ifish.view; +import static android.graphics.Paint.ANTI_ALIAS_FLAG; +import static android.widget.LinearLayout.HORIZONTAL; +import static android.widget.LinearLayout.VERTICAL; + import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -9,19 +13,16 @@ import android.graphics.Paint.Style; 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 android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; import android.view.ViewConfiguration; -import com.ifish.activity.R; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.ViewConfigurationCompat; +import androidx.viewpager.widget.ViewPager; -import static android.graphics.Paint.ANTI_ALIAS_FLAG; -import static android.widget.LinearLayout.HORIZONTAL; -import static android.widget.LinearLayout.VERTICAL; +import com.ifish.activity.R; /** * * @ClassName: CirclePageIndicator diff --git a/iFish7/src/main/java/com/ifish/view/ClipViewPager.java b/iFish7/src/main/java/com/ifish/view/ClipViewPager.java index 304bab8e5..b95906778 100644 --- a/iFish7/src/main/java/com/ifish/view/ClipViewPager.java +++ b/iFish7/src/main/java/com/ifish/view/ClipViewPager.java @@ -1,11 +1,12 @@ package com.ifish.view; import android.content.Context; -import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; +import androidx.viewpager.widget.ViewPager; + /** * --------------------------- * 丨你存在 我某一行代码里丨 diff --git a/iFish7/src/main/java/com/ifish/view/CustomSwipeProgressBar.java b/iFish7/src/main/java/com/ifish/view/CustomSwipeProgressBar.java index b31abd0ab..d91c109cc 100644 --- a/iFish7/src/main/java/com/ifish/view/CustomSwipeProgressBar.java +++ b/iFish7/src/main/java/com/ifish/view/CustomSwipeProgressBar.java @@ -6,10 +6,11 @@ import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Rect; -import android.support.v4.view.ViewCompat; import android.view.View; import android.view.animation.AnimationUtils; +import androidx.core.view.ViewCompat; + /** * * @ClassName: SwipeProgressBar diff --git a/iFish7/src/main/java/com/ifish/view/CustomSwipeRefreshLayout.java b/iFish7/src/main/java/com/ifish/view/CustomSwipeRefreshLayout.java index fe3cee98e..4d35c7623 100644 --- a/iFish7/src/main/java/com/ifish/view/CustomSwipeRefreshLayout.java +++ b/iFish7/src/main/java/com/ifish/view/CustomSwipeRefreshLayout.java @@ -1,15 +1,9 @@ package com.ifish.view; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.Log; @@ -23,8 +17,15 @@ import android.view.animation.DecelerateInterpolator; import android.view.animation.Transformation; import android.widget.AbsListView; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.ViewCompat; + import com.ifish.activity.R; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; + /** * * @ClassName: SwipeRefreshLayout diff --git a/iFish7/src/main/java/com/ifish/view/PageIndicator.java b/iFish7/src/main/java/com/ifish/view/PageIndicator.java index 35a31dcff..b0c17a18b 100644 --- a/iFish7/src/main/java/com/ifish/view/PageIndicator.java +++ b/iFish7/src/main/java/com/ifish/view/PageIndicator.java @@ -17,7 +17,8 @@ package com.ifish.view; -import android.support.v4.view.ViewPager; + +import androidx.viewpager.widget.ViewPager; /** * PageIndicator is responsible to show an visual indicator on the total views diff --git a/iFish7/src/main/java/com/ifish/view/ScalePageTransformer.java b/iFish7/src/main/java/com/ifish/view/ScalePageTransformer.java index b0ac9a1ba..dc6836df6 100644 --- a/iFish7/src/main/java/com/ifish/view/ScalePageTransformer.java +++ b/iFish7/src/main/java/com/ifish/view/ScalePageTransformer.java @@ -1,9 +1,10 @@ package com.ifish.view; import android.os.Build; -import android.support.v4.view.ViewPager; import android.view.View; +import androidx.viewpager.widget.ViewPager; + /** * --------------------------- * 丨你存在 我某一行代码里丨 diff --git a/iFish7/src/main/java/com/ifish/view/SwipeBackLayout.java b/iFish7/src/main/java/com/ifish/view/SwipeBackLayout.java index f519e9e75..5243924b2 100644 --- a/iFish7/src/main/java/com/ifish/view/SwipeBackLayout.java +++ b/iFish7/src/main/java/com/ifish/view/SwipeBackLayout.java @@ -3,9 +3,6 @@ package com.ifish.view; import android.app.Activity; import android.content.Context; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.ViewDragHelper; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -13,6 +10,11 @@ import android.view.ViewGroup; import android.webkit.WebView; import android.widget.AbsListView; import android.widget.ScrollView; + +import androidx.core.view.ViewCompat; +import androidx.customview.widget.ViewDragHelper; +import androidx.viewpager.widget.ViewPager; + /** * * @ClassName: SwipeBackLayout diff --git a/iFish7/src/main/java/com/ifish/view/SwipeProgressBar.java b/iFish7/src/main/java/com/ifish/view/SwipeProgressBar.java index acdc01d08..83622da23 100644 --- a/iFish7/src/main/java/com/ifish/view/SwipeProgressBar.java +++ b/iFish7/src/main/java/com/ifish/view/SwipeProgressBar.java @@ -6,7 +6,7 @@ import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.Rect; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.view.View; import android.view.animation.AnimationUtils; diff --git a/iFish7/src/main/java/com/ifish/view/SwipeRefreshLayout.java b/iFish7/src/main/java/com/ifish/view/SwipeRefreshLayout.java index 9be00822d..c7218a9a6 100644 --- a/iFish7/src/main/java/com/ifish/view/SwipeRefreshLayout.java +++ b/iFish7/src/main/java/com/ifish/view/SwipeRefreshLayout.java @@ -4,8 +4,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.Log; @@ -19,12 +17,15 @@ import android.view.animation.DecelerateInterpolator; import android.view.animation.Transformation; import android.widget.AbsListView; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.ViewCompat; + +import com.ifish.activity.R; + import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import com.ifish.activity.R; - /** * * @ClassName: SwipeRefreshLayout diff --git a/iFish7/src/main/java/com/ifish/view/TabPageIndicator.java b/iFish7/src/main/java/com/ifish/view/TabPageIndicator.java index 3f1523c97..83076dd89 100644 --- a/iFish7/src/main/java/com/ifish/view/TabPageIndicator.java +++ b/iFish7/src/main/java/com/ifish/view/TabPageIndicator.java @@ -16,10 +16,10 @@ */ package com.ifish.view; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; +import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; + import android.content.Context; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v4.view.ViewPager.OnPageChangeListener; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; @@ -27,10 +27,10 @@ import android.widget.HorizontalScrollView; import android.widget.LinearLayout; import android.widget.TextView; -import com.ifish.activity.R; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; -import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; -import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; +import com.ifish.activity.R; /** * This widget implements the dynamic action bar tab behavior that can change @@ -69,7 +69,7 @@ public class TabPageIndicator extends HorizontalScrollView implements PageIndica private final IcsLinearLayout mTabLayout; private ViewPager mViewPager; - private OnPageChangeListener mListener; + private ViewPager.OnPageChangeListener mListener; private int mMaxTabWidth; private int mSelectedTabIndex; @@ -256,7 +256,7 @@ public class TabPageIndicator extends HorizontalScrollView implements PageIndica } @Override - public void setOnPageChangeListener(OnPageChangeListener listener) { + public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) { mListener = listener; } diff --git a/iFish7/src/main/java/com/ifish/view/WifiDialog.java b/iFish7/src/main/java/com/ifish/view/WifiDialog.java index 4142bfd8b..d803dc65c 100644 --- a/iFish7/src/main/java/com/ifish/view/WifiDialog.java +++ b/iFish7/src/main/java/com/ifish/view/WifiDialog.java @@ -1,14 +1,10 @@ package com.ifish.view; -import android.app.Dialog; import android.content.Context; import android.content.Intent; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.Gravity; import android.view.LayoutInflater; diff --git a/iFish7/src/main/res/layout/lookifishlist_activity.xml b/iFish7/src/main/res/layout/lookifishlist_activity.xml index efeeb73b6..3c3697ae4 100644 --- a/iFish7/src/main/res/layout/lookifishlist_activity.xml +++ b/iFish7/src/main/res/layout/lookifishlist_activity.xml @@ -10,7 +10,7 @@ - - - - - -