root
/
iFish7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

全面升级代码到androidX以获得更好的兼容性和可以使用android最新的特性

This commit is contained in:
Lihongda 2024-01-04 04:18:59 +08:00
parent 2df2a481a6
commit 3799e6aa42
56 changed files with 164 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
JCVideo_Library/build.gradle
View File

@ -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'
}

19
JCVideo_Library/src/main/java/fm/jiecao/jcvideoplayer_lib/JCUtils.java
View File

@ -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);

2
JCVideo_Library/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java
View File

@ -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;

4
build.gradle
View File

@ -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 {

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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

4
iFish7/build.gradle
View File

@ -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'

3
iFish7/src/main/AndroidManifest.xml
View File

@ -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">
<meta-data
android:name="android.max_aspect"
android:value="2.1" />
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="com.ifish.activity.fileprovider"
android:exported="false"
android:grantUriPermissions="true">

3
iFish7/src/main/java/com/ifish/activity/DeviceConnectTutorialActivity.java
View File

@ -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;

5
iFish7/src/main/java/com/ifish/activity/DeviceReSetActivity.java
View File

@ -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是否开启");

3
iFish7/src/main/java/com/ifish/activity/DeviceRestartActivity.java
View File

@ -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;

36
iFish7/src/main/java/com/ifish/activity/HotSpotConnentActivity.java
View File

@ -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;

23
iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java
View File

@ -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;

15
iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceCameraActivity.java
View File

@ -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 {

4
iFish7/src/main/java/com/ifish/activity/HotSpotConnentPetDeviceActivity.java
View File

@ -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;

2
iFish7/src/main/java/com/ifish/activity/HotSpotConnentSetWIFIActivity.java
View File

@ -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;

6
iFish7/src/main/java/com/ifish/activity/LoadingActivity.java
View File

@ -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;

11
iFish7/src/main/java/com/ifish/activity/LookFishListActivity.java
View File

@ -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;

21
iFish7/src/main/java/com/ifish/activity/MainTabActivity.java
View File

@ -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<TabInfo> tabInfos = new ArrayList<TabInfo>();
private FragmentManager fragmentManager;

11
iFish7/src/main/java/com/ifish/activity/MyGoldActivity.java
View File

@ -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;

18
iFish7/src/main/java/com/ifish/activity/VideoRecordingActivity.java
View File

@ -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;

5
iFish7/src/main/java/com/ifish/activity/WelcomeActivity.java
View File

@ -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;

2
iFish7/src/main/java/com/ifish/activity/wxapi/WXEntryActivity.java
View File

@ -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;

3
iFish7/src/main/java/com/ifish/adapter/RecyclingPagerAdapter.java
View File

@ -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.

4
iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java
View File

@ -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;

3
iFish7/src/main/java/com/ifish/baseclass/BaseFragmentActivity.java
View File

@ -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;

5
iFish7/src/main/java/com/ifish/baseclass/BaseV4Fragment.java
View File

@ -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");
}

5
iFish7/src/main/java/com/ifish/baseclass/LazyLoadingFragment.java
View File

@ -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
*/

2
iFish7/src/main/java/com/ifish/baseclass/UriForFile.java
View File

@ -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;

6
iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
View File

@ -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;

12
iFish7/src/main/java/com/ifish/fragment/LookFishListFragment.java
View File

@ -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);
}

3
iFish7/src/main/java/com/ifish/fragment/MenuLeftFragment.java
View File

@ -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;

9
iFish7/src/main/java/com/ifish/fragment/MenuRightFragment.java
View File

@ -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;
/**

2
iFish7/src/main/java/com/ifish/geewe/BasePagerAdapter.java
View File

@ -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;

3
iFish7/src/main/java/com/ifish/geewe/GalleryViewPager.java
View File

@ -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

13
iFish7/src/main/java/com/ifish/permission/PermissionHelper.java
View File

@ -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;

7
iFish7/src/main/java/com/ifish/swipemenulistview/SwipeMenuLayout.java
View File

@ -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

2
iFish7/src/main/java/com/ifish/swipemenulistview/SwipeMenuListView.java
View File

@ -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;

4
iFish7/src/main/java/com/ifish/tcp/FishFeedType.java
View File

@ -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;
/**

3
iFish7/src/main/java/com/ifish/timecheck/DatePickerView.java
View File

@ -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;

3
iFish7/src/main/java/com/ifish/utils/RichCompat.java
View File

@ -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;
/**
* 富文本工具类

15
iFish7/src/main/java/com/ifish/view/CirclePageIndicator.java
View File

@ -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

3
iFish7/src/main/java/com/ifish/view/ClipViewPager.java
View File

@ -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;
/**
* ---------------------------
* 丨你存在 我某一行代码里丨

3
iFish7/src/main/java/com/ifish/view/CustomSwipeProgressBar.java
View File

@ -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

13
iFish7/src/main/java/com/ifish/view/CustomSwipeRefreshLayout.java
View File

@ -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

3
iFish7/src/main/java/com/ifish/view/PageIndicator.java
View File

@ -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

3
iFish7/src/main/java/com/ifish/view/ScalePageTransformer.java
View File

@ -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;
/**
* ---------------------------
* 丨你存在 我某一行代码里丨

8
iFish7/src/main/java/com/ifish/view/SwipeBackLayout.java
View File

@ -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

2
iFish7/src/main/java/com/ifish/view/SwipeProgressBar.java
View File

@ -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;

9
iFish7/src/main/java/com/ifish/view/SwipeRefreshLayout.java
View File

@ -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

16
iFish7/src/main/java/com/ifish/view/TabPageIndicator.java
View File

@ -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;
}

4
iFish7/src/main/java/com/ifish/view/WifiDialog.java
View File

@ -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;

4
iFish7/src/main/res/layout/lookifishlist_activity.xml
View File

@ -10,7 +10,7 @@
<include
android:id="@+id/in_daohang"
layout="@layout/title_layout_img_fill"/>
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:layout_below="@+id/in_daohang"
android:layout_width="match_parent"
@ -28,7 +28,7 @@
style="@style/line_color"
android:layout_height="12dp"
/>
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_below="@+id/view_line"
android:layout_width="fill_parent"

2
iFish7/src/main/res/layout/maintab_activity.xml
View File

@ -13,7 +13,7 @@
android:layout_height="0dip"
android:layout_weight="0"
/>
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/tabs_pager"
android:overScrollMode="never"
android:layout_width="match_parent"

4
iFish7/src/main/res/layout/mygold_activity.xml
View File

@ -36,7 +36,7 @@
<include
android:id="@+id/in_daohang"
layout="@layout/title_layout_device_alpha" />
<android.support.design.widget.TabLayout
<TabLayout
android:id="@+id/tabLayout"
android:layout_below="@+id/rl_banner"
android:layout_width="match_parent"
@ -54,7 +54,7 @@
style="@style/line_color"
android:layout_height="17dp"
/>
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_below="@+id/view_line"
android:layout_width="fill_parent"

2
iFish7/src/main/res/layout/splash_activity.xml
View File

@ -5,7 +5,7 @@
android:orientation="vertical"
xmlns:app="http://schemas.android.com/apk/res-auto"
>
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:overScrollMode="never"

14
umeng_sharesdk_library/build.gradle
View File

@ -21,11 +21,11 @@ android {
}
dependencies {
compile files('libs/mta-sdk-1.6.2.jar')
compile files('libs/open_sdk_r5756.jar')
compile files('libs/SocialSDK_QQZone_3.jar')
compile files('libs/SocialSDK_Sina.jar')
compile files('libs/SocialSDK_WeiXin_1.jar')
compile files('libs/SocialSDK_WeiXin_2.jar')
compile files('libs/weiboSDKCore_3.1.4.jar')
api files('libs/mta-sdk-1.6.2.jar')
api files('libs/open_sdk_r5756.jar')
api files('libs/SocialSDK_QQZone_3.jar')
api files('libs/SocialSDK_Sina.jar')
api files('libs/SocialSDK_WeiXin_1.jar')
api files('libs/SocialSDK_WeiXin_2.jar')
api files('libs/weiboSDKCore_3.1.4.jar')
}