diff --git a/JCVideo_Library/src/androidTest/java/fm/jiecao/jcvideoplayer_lib/ApplicationTest.java b/JCVideo_Library/src/androidTest/java/fm/jiecao/jcvideoplayer_lib/ApplicationTest.java deleted file mode 100644 index ee42cccf7..000000000 --- a/JCVideo_Library/src/androidTest/java/fm/jiecao/jcvideoplayer_lib/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package fm.jiecao.jcvideoplayer_lib; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} diff --git a/iFish7/src/main/java/com/ifish/activity/BindCameraActivity.java b/iFish7/src/main/java/com/ifish/activity/BindCameraActivity.java index f2ba91ec4..ab3030bb2 100644 --- a/iFish7/src/main/java/com/ifish/activity/BindCameraActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/BindCameraActivity.java @@ -305,7 +305,7 @@ public class BindCameraActivity extends BaseActivity { unKnowSsidDialog(); return; } - WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE); List scanResults = wifiManager.getScanResults(); for (ScanResult scanResult : scanResults) { if (wifiname.equals(scanResult.SSID)) { diff --git a/iFish7/src/main/java/com/ifish/activity/BindTankActivity.java b/iFish7/src/main/java/com/ifish/activity/BindTankActivity.java index 68aef9d75..3f360db13 100644 --- a/iFish7/src/main/java/com/ifish/activity/BindTankActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/BindTankActivity.java @@ -592,7 +592,7 @@ public class BindTankActivity extends BaseActivity { unKnowSsidDialog(); return; } - WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE); List scanResults = wifiManager.getScanResults(); for (ScanResult scanResult : scanResults) { if (wifiname.equals(scanResult.SSID)) { diff --git a/iFish7/src/main/java/com/ifish/activity/BindTankPetActivity.java b/iFish7/src/main/java/com/ifish/activity/BindTankPetActivity.java index e3bf3c0ea..a26f3ca02 100644 --- a/iFish7/src/main/java/com/ifish/activity/BindTankPetActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/BindTankPetActivity.java @@ -615,7 +615,7 @@ public class BindTankPetActivity extends BaseActivity { unKnowSsidDialog(); return; } - WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE); List scanResults = wifiManager.getScanResults(); for (ScanResult scanResult : scanResults) { if (wifiname.equals(scanResult.SSID)) { diff --git a/iFish7/src/main/java/com/ifish/activity/DeviceRestartActivity.java b/iFish7/src/main/java/com/ifish/activity/DeviceRestartActivity.java index 6faddd0a2..ca044e116 100644 --- a/iFish7/src/main/java/com/ifish/activity/DeviceRestartActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/DeviceRestartActivity.java @@ -42,7 +42,7 @@ public class DeviceRestartActivity 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/HotSpotConnentActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentActivity.java index 482f5a948..729b97563 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentActivity.java @@ -66,7 +66,7 @@ public class HotSpotConnentActivity extends BaseActivity { public void onClick(View v) { // device_mac="5ccf7f99e929"; // doPostBindDevice(); - WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE); WifiInfo wifiInfo = wifiManager.getConnectionInfo(); if (!wifiManager.isWifiEnabled()) { ToastUtil.show(getApplicationContext(), "请检查WiFi是否开启"); @@ -194,7 +194,7 @@ public class HotSpotConnentActivity extends BaseActivity { } public List getWifiList() { - WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE); + WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE); List scanWifiList = wifiManager.getScanResults(); List wifiList = new ArrayList<>(); if (scanWifiList != null && scanWifiList.size() > 0) { diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentSetWIFIActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentSetWIFIActivity.java index a6e637829..ba3f34c08 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentSetWIFIActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentSetWIFIActivity.java @@ -1,66 +1,23 @@ 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.provider.Settings; -import androidx.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.bumptech.glide.Glide; -import com.ifish.basebean.BaseBean; -import com.ifish.basebean.ConnectMessageEvent; -import com.ifish.basebean.Device; -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.WifiDialog; -import com.ifish.wheelview.adapter.ArrayWheelAdapter; -import com.ifish.wheelview.view.WheelView; +import androidx.annotation.Nullable; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -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 com.bumptech.glide.Glide; +import com.ifish.basebean.ConnectMessageEvent; +import com.ifish.baseclass.BaseActivity; +import com.ifish.utils.AnimationUtil; +import com.ifish.utils.ToastUtil; import de.greenrobot.event.EventBus; @@ -105,7 +62,7 @@ public class HotSpotConnentSetWIFIActivity extends BaseActivity { protected void onResume() { super.onResume(); if (isjump) { - 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/NewBindDeviceChoiceActivity.java b/iFish7/src/main/java/com/ifish/activity/NewBindDeviceChoiceActivity.java index 9a908c43c..5653db954 100644 --- a/iFish7/src/main/java/com/ifish/activity/NewBindDeviceChoiceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/NewBindDeviceChoiceActivity.java @@ -602,7 +602,7 @@ public class NewBindDeviceChoiceActivity extends BaseActivity implements View.On protected void onResume() { super.onResume(); if (isjump) { - 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/ReStartDeviceUtil.java b/iFish7/src/main/java/com/ifish/activity/ReStartDeviceUtil.java index 0365b0b5d..558a426e4 100644 --- a/iFish7/src/main/java/com/ifish/activity/ReStartDeviceUtil.java +++ b/iFish7/src/main/java/com/ifish/activity/ReStartDeviceUtil.java @@ -39,7 +39,7 @@ public class ReStartDeviceUtil { } public void startDs() { - WifiManager wifiManager = (WifiManager) act.getSystemService(WIFI_SERVICE); + WifiManager wifiManager = (WifiManager) act.getApplicationContext().getSystemService(WIFI_SERVICE); WifiInfo wifiInfo = wifiManager.getConnectionInfo(); if (!wifiManager.isWifiEnabled()) { ToastUtil.show(act, "请检查WiFi是否开启");