diff --git a/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java b/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java
index e1b849ff3..33711c70e 100644
--- a/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java
+++ b/app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java
@@ -9,7 +9,6 @@ import android.os.Environment;
import android.text.TextUtils;
import android.util.Log;
import android.webkit.MimeTypeMap;
-import android.widget.Toast;
import com.jph.takephoto.model.TException;
import com.jph.takephoto.model.TExceptionType;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java b/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java
index ed0415877..79e3b8081 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/utils/RxNetWorkUtils.java
@@ -4,6 +4,8 @@ import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
+import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+
/**
* 网络判断工具类
*
@@ -19,7 +21,7 @@ public class RxNetWorkUtils {
* @return {@code true}: 可用
{@code false}: 不可用
*/
public static boolean isAvailable(Context context) {
- NetworkInfo info = getActiveNetworkInfo(context);
+ NetworkInfo info = getActiveNetworkInfo(BasicConfig.INSTANCE.getAppContext());
return info != null && info.isAvailable();
}
@@ -30,7 +32,7 @@ public class RxNetWorkUtils {
* @return NetworkInfo
*/
public static NetworkInfo getActiveNetworkInfo(Context context) {
- ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+ ConnectivityManager cm = (ConnectivityManager) BasicConfig.INSTANCE.getAppContext().getSystemService(Context.CONNECTIVITY_SERVICE);
return cm.getActiveNetworkInfo();
}
}
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUuidFactory.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUuidFactory.java
index d7ad7c920..871a90d31 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUuidFactory.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUuidFactory.java
@@ -2,14 +2,8 @@ package com.yizhuan.xchat_android_library.utils;
import android.content.Context;
import android.content.SharedPreferences;
-import android.os.Build;
import android.provider.Settings;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.widget.Toast;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.UUID;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/NetworkUtils.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/NetworkUtils.java
index 7f70a36d6..b8e4d4cb7 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/NetworkUtils.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/NetworkUtils.java
@@ -1,25 +1,19 @@
package com.yizhuan.xchat_android_library.utils;
-import android.annotation.SuppressLint;
import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
-import android.net.Uri;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
-import android.os.Build;
import android.telephony.TelephonyManager;
import android.util.Log;
+import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+
import java.net.Inet4Address;
import java.net.InetAddress;
-import java.net.InetSocketAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
-import java.nio.ByteBuffer;
import java.util.Enumeration;
import java.util.List;
@@ -27,58 +21,16 @@ import java.util.List;
* Created by xujiexing on 14-6-10.
*/
public class NetworkUtils {
- private static WifiManager.WifiLock sWifiLocker;
- private static final String TAG = NetworkUtils.class.toString();
- static synchronized WifiManager.WifiLock wifiLocker(Context c) {
- if (sWifiLocker == null) {
- Log.d(TAG, "Create WifiManager for " + (Build.VERSION.SDK_INT >= 9 ? "WIFI_MODE_HIPREF" : "WIFI_MODE_FULL"));
- sWifiLocker = ((WifiManager) c.getSystemService(Context.WIFI_SERVICE))
- .createWifiLock(Build.VERSION.SDK_INT >= 9 ? 3 : WifiManager.WIFI_MODE_FULL, "YY");
- }
- return sWifiLocker;
- }
+ public static final int NET_INVALID = 0; // 无网络
+ public static final int NET_WIFI = 1;
+ public static final int NET_2G = 2;
+ public static final int NET_3G = 3;
+ public static final int NET_LEGACY = 4; // legacy client
+ public static final int UNKNOW_NETWORK_TYPE = 5;
- public static void lockWifi(Context c) {
- Log.d(TAG, "lock wifi");
- if (!wifiLocker(c).isHeld())
- wifiLocker(c).acquire();
- }
-
- public static void unlockWifi(Context c) {
- Log.d(TAG, "unlock wifi");
- if (wifiLocker(c).isHeld())
- wifiLocker(c).release();
- }
-
- public static boolean isWifiActive(Context c) {
- if(c == null){
- Log.e("xuwakao", "isWifiActive is NULL");
- return false;
- }
- ConnectivityManager mgr = (ConnectivityManager) c.getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo networkInfo = mgr.getActiveNetworkInfo();
- return networkInfo != null
- && networkInfo.getType() == ConnectivityManager.TYPE_WIFI;
- }
-
- public static boolean isMobileActive(Context c) {
- if(c == null){
- Log.e("xuwakao", "isWifiActive is NULL");
- return false;
- }
- ConnectivityManager mgr = (ConnectivityManager) c.getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo networkInfo = mgr.getActiveNetworkInfo();
- return networkInfo != null
- && networkInfo.getType() == ConnectivityManager.TYPE_MOBILE;
- }
-
- public static boolean isNetworkStrictlyAvailable(Context c) {
- if(c == null){
- Log.e("xuwakao", "isNetworkStrictlyAvailable context is NULL");
- return false;
- }
- ConnectivityManager connectivityManager = (ConnectivityManager) c.getSystemService(Context.CONNECTIVITY_SERVICE);
+ public static boolean isNetworkStrictlyAvailable(@Deprecated Context c) {
+ ConnectivityManager connectivityManager = (ConnectivityManager) BasicConfig.INSTANCE.getAppContext().getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivityManager == null) {
Log.e("xuwakao", "isNetworkStrictlyAvailable connectivityManager is NULL");
return false;
@@ -100,12 +52,8 @@ public class NetworkUtils {
}
}
- public static boolean isNetworkAvailable(Context c) {
- if (null == c) {
- return false;
- }
-
- ConnectivityManager connectivityManager = (ConnectivityManager) c.getSystemService(Context.CONNECTIVITY_SERVICE);
+ public static boolean isNetworkAvailable(@Deprecated Context c) {
+ ConnectivityManager connectivityManager = (ConnectivityManager) BasicConfig.INSTANCE.getAppContext().getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo ni = connectivityManager.getActiveNetworkInfo();
if (ni == null) {
return false;
@@ -114,210 +62,14 @@ public class NetworkUtils {
|| (ni.isAvailable() && ni.isConnectedOrConnecting());
}
-// public static void showNetworkConfigDialog(final Context c, int msgId, int posStrId, int negStrId) {
-// final AlertDialog dialog = new BaseAlertDialogBuilder(c).create();
-//
-// dialog.show();
-// Window window = dialog.getWindow();
-// window.setContentView(R.layout.layout_network_error_dialog);
-//
-// TextView tip = (TextView)window.findViewById(R.id.message);
-// tip.setText(c.getString(msgId));
-//
-// TextView ok = (TextView) window.findViewById(R.id.btn_ok);
-// ok.setText(c.getString(posStrId));
-// ok.setOnClickListener(new View.OnClickListener() {
-// @Override
-// public void onClick(View v) {
-// dialog.dismiss();
-// openNetworkConfig(c);
-// }
-// });
-//
-// TextView cancel = (TextView) window.findViewById(R.id.btn_cancel);
-// cancel.setText(c.getString(negStrId));
-// cancel.setOnClickListener(new View.OnClickListener() {
-// @Override
-// public void onClick(View v) {
-// dialog.dismiss();
-// }
-// });
-// }
-//
-// public static void showNetworkConfigDialog(Context c) {
-// NetworkUtils.showNetworkConfigDialog(c,
-// R.string.network_error, R.string.set_network,
-// R.string.cancel);
-// }
-
- public static void openNetworkConfig(Context c) {
- Intent i = null;
- if (Build.VERSION.SDK_INT > 10) {
- i = new Intent(android.provider.Settings.ACTION_WIRELESS_SETTINGS);
- } else {
- i = new Intent();
- i.setClassName("com.android.settings", "com.android.settings.WirelessSettings");
- i.setAction(Intent.ACTION_MAIN);
- }
- try {
- c.startActivity(i);
- } catch (Exception e) {
- }
- }
-
- @SuppressLint("MissingPermission")
- public static String getSubscriberId(Context c) {
- TelephonyManager tm = (TelephonyManager) c.getSystemService(Context.TELEPHONY_SERVICE);
- String id = null;
- if (tm != null) {
- id = tm.getSubscriberId();
- }
- return id != null ? id : "";
- }
-
- private static final int MIN_PORT = 0;
- private static final int MAX_PORT = 65535;
- private static final int DEFAULT_PROXY_PORT = 80;
-
- public static InetSocketAddress getTunnelProxy(Context c) {
- if (c.checkCallingOrSelfPermission("android.permission.WRITE_APN_SETTINGS") ==
- PackageManager.PERMISSION_DENIED) {
- return null;
- }
- ConnectivityManager cm = (ConnectivityManager) c.getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo netInfo = cm.getActiveNetworkInfo();
- if (netInfo != null) {
- if (netInfo.getType() == ConnectivityManager.TYPE_WIFI) {
- return null;
- }
- }
- String proxy = "";
- String portStr = "";
- Uri uri = Uri.parse("content://telephony/carriers/preferapn");
- Cursor cr = c.getContentResolver().query(uri, null, null, null, null);
- if (cr != null && cr.moveToNext()) {
- proxy = cr.getString(cr.getColumnIndex("proxy"));
- portStr = cr.getString(cr.getColumnIndex("port"));
- Log.i("getTunnelProxy", TelephonyUtils.getOperator(c) + ", proxy = " + proxy + ", port = " + portStr);
- if (proxy != null && proxy.length() > 0) {
- cr.close();
- cr = null;
- int port;
- try {
- port = Integer.parseInt(portStr);
- if (port < MIN_PORT || port > MAX_PORT) {
- port = DEFAULT_PROXY_PORT;
- }
- } catch (Exception e) {
- Log.i("getTunnelProxy", "port is invalid, e = " + e);
- port = DEFAULT_PROXY_PORT;
- }
- InetSocketAddress addr = null;
- try {
- addr = new InetSocketAddress(proxy, port);
- } catch (Exception e) {
- Log.i("getTunnelProxy", "create address failed, e = " + e);
- }
- return addr;
- }
- }
- if (cr != null) {
- cr.close();
- cr = null;
- }
- return null;
- }
-
- public static byte[] getIPArray(int ip) {
- byte[] ipAddr = new byte[4];
- ipAddr[0] = (byte) ip;
- ipAddr[1] = (byte) (ip >>> 8);
- ipAddr[2] = (byte) (ip >>> 16);
- ipAddr[3] = (byte) (ip >>> 24);
- return ipAddr;
- }
-
- public static String getIpString(byte[] ip) {
- StringBuilder sb = new StringBuilder();
- sb.append(ip[0] & 0xff);
- sb.append(".");
- sb.append(ip[1] & 0xff);
- sb.append(".");
- sb.append(ip[2] & 0xff);
- sb.append(".");
- sb.append(ip[3] & 0xff);
- return sb.toString();
- }
-
- public static String getIpString(int ip) {
- StringBuilder sb = new StringBuilder();
- sb.append(ip & 0xff);
- sb.append(".");
- sb.append(ip >>> 8 & 0xff);
- sb.append(".");
- sb.append(ip >>> 16 & 0xff);
- sb.append(".");
- sb.append(ip >>> 24 & 0xff);
- return sb.toString();
- }
-
public static int getPort(List ports) {
java.util.Random random = new java.util.Random(
System.currentTimeMillis());
return ports.get(random.nextInt(ports.size()));
}
- public static int getLittleEndianInt(byte[] buffer, int start) {
- int i = buffer[start + 0] & 0xff;
- i |= (buffer[start + 1] << 8) & 0xff00;
- i |= (buffer[start + 2] << 16) & 0xff0000;
- i |= (buffer[start + 3] << 24) & 0xff000000;
- return i;
- }
-
- public static byte[] toBytes(ByteBuffer buffer) {
- if (buffer == null) {
- return new byte[0];
- }
- int savedPos = buffer.position();
- int savedLimit = buffer.limit();
- try {
- byte[] array = new byte[buffer.limit() - buffer.position()];
- if (buffer.hasArray()) {
- int offset = buffer.arrayOffset() + savedPos;
- byte[] bufferArray = buffer.array();
- System.arraycopy(bufferArray, offset, array, 0, array.length);
- return array;
- } else {
- buffer.get(array);
- return array;
- }
- } finally {
- buffer.position(savedPos);
- buffer.limit(savedLimit);
- }
- }
-
- public static String getNetwrokNameByType(Context c, int type) {
- ConnectivityManager cm = (ConnectivityManager) c.getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo[] infos = cm.getAllNetworkInfo();
- for (NetworkInfo network : infos) {
- if (network.getType() == type) {
- return network.getTypeName();
- }
- }
- return "Unknown";
- }
-
- public static final int NET_INVALID = 0 ; // 无网络
- public static final int NET_WIFI = 1;
- public static final int NET_2G = 2;
- public static final int NET_3G = 3;
- public static final int NET_LEGACY = 4; // legacy client
- public static final int UNKNOW_NETWORK_TYPE = 5;
-
public static NetworkInfo getActiveNetwork(Context c) {
- ConnectivityManager cm = (ConnectivityManager) c.getSystemService(Context.CONNECTIVITY_SERVICE);
+ ConnectivityManager cm = (ConnectivityManager) BasicConfig.INSTANCE.getAppContext().getSystemService(Context.CONNECTIVITY_SERVICE);
try {
return cm.getActiveNetworkInfo();
} catch (Exception e) {
@@ -326,23 +78,6 @@ public class NetworkUtils {
return null;
}
- /**
- * get the machine address of wifi
- *
- * @param c
- * @return
- */
- public static String getWifiMacAddr(Context c) {
- if (c != null) {
- WifiManager wifiMan = (WifiManager) c.getSystemService(Context.WIFI_SERVICE);
- WifiInfo wifiInf = wifiMan.getConnectionInfo();
- if (wifiInf != null) {
- return wifiInf.getMacAddress();
- }
- }
- return "";
- }
-
/**
* get the type of network
*
@@ -351,7 +86,7 @@ public class NetworkUtils {
*/
public static int getNetworkType(Context c) {
int networkType = UNKNOW_NETWORK_TYPE;
- NetworkInfo netInfo = getActiveNetwork(c);
+ NetworkInfo netInfo = getActiveNetwork(BasicConfig.INSTANCE.getAppContext());
if (netInfo != null) {
int type = netInfo.getType();
if (type == ConnectivityManager.TYPE_WIFI
@@ -383,7 +118,7 @@ public class NetworkUtils {
}
public static String getNetworkTypeName(Context context) {
- int type = getNetworkType(context);
+ int type = getNetworkType(BasicConfig.INSTANCE.getAppContext());
switch (type) {
case NET_WIFI:
return "WI-FI";
@@ -400,70 +135,29 @@ public class NetworkUtils {
}
}
- public static String bytesToHexString(byte[] bytes) {
- if (bytes == null) {
- return "";
- }
- StringBuffer sb = new StringBuffer();
- for (byte b : bytes) {
- int val = b & 0xff;
- if (val < 0x10) {
- sb.append("0");
- }
- sb.append(Integer.toHexString(val));
- }
- return sb.toString();
- }
-
-
public static String getSimOperator(Context c) {
- TelephonyManager tm = (TelephonyManager) c.getSystemService(Context.TELEPHONY_SERVICE);
+ TelephonyManager tm = (TelephonyManager) BasicConfig.INSTANCE.getAppContext().getSystemService(Context.TELEPHONY_SERVICE);
return tm.getSimOperator();
}
public static String getOperator(Context c) {
- String sim = getSimOperator(c);
- if(FP.empty(sim))
+ String sim = getSimOperator(BasicConfig.INSTANCE.getAppContext());
+ if (FP.empty(sim))
return ChinaOperator.UNKNOWN;
if (sim.startsWith("46003") || sim.startsWith("46005")) {
return ChinaOperator.CTL;
} else if (sim.startsWith("46001") || sim.startsWith("46006")) {
return ChinaOperator.UNICOM;
} else if (sim.startsWith("46000") || sim.startsWith("46002")
- || sim.startsWith("46007") || sim.startsWith("46020")){
+ || sim.startsWith("46007") || sim.startsWith("46020")) {
return ChinaOperator.CMCC;
- }
- else {
+ } else {
return ChinaOperator.UNKNOWN;
}
}
- public static class ChinaOperator {
- public static final String CMCC = "CMCC";
- public static final String CTL = "CTL";
- public static final String UNICOM = "UNICOM";
- public static final String UNKNOWN = "Unknown";
- }
-
- public static String getLocalIpAddress() {
- try {
- for (Enumeration en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
- NetworkInterface intf = en.nextElement();
- for (Enumeration enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();) {
- InetAddress inetAddress = enumIpAddr.nextElement();
- if (!inetAddress.isLoopbackAddress()) {
- return inetAddress.getHostAddress().toString();
- }
- }
- }
- } catch (SocketException ex) {
- Log.e("NetworkUtils getLocalIpAddress:", ex.toString());
- }
- return null;
- }
-
public static String getIPAddress(Context c) {
- NetworkInfo info = ((ConnectivityManager) c
+ NetworkInfo info = ((ConnectivityManager) BasicConfig.INSTANCE.getAppContext()
.getSystemService(Context.CONNECTIVITY_SERVICE)).getActiveNetworkInfo();
if (info != null && info.isConnected()) {
if (info.getType() == ConnectivityManager.TYPE_MOBILE) {//当前使用2G/3G/4G网络
@@ -483,7 +177,7 @@ public class NetworkUtils {
}
} else if (info.getType() == ConnectivityManager.TYPE_WIFI) {//当前使用无线网络
- WifiManager wifiManager = (WifiManager) c.getSystemService(Context.WIFI_SERVICE);
+ WifiManager wifiManager = (WifiManager) BasicConfig.INSTANCE.getAppContext().getSystemService(Context.WIFI_SERVICE);
WifiInfo wifiInfo = wifiManager.getConnectionInfo();
String ipAddress = intIP2StringIP(wifiInfo.getIpAddress());//得到IPV4地址
return ipAddress;
@@ -506,4 +200,11 @@ public class NetworkUtils {
((ip >> 16) & 0xFF) + "." +
(ip >> 24 & 0xFF);
}
+
+ public static class ChinaOperator {
+ public static final String CMCC = "CMCC";
+ public static final String CTL = "CTL";
+ public static final String UNICOM = "UNICOM";
+ public static final String UNKNOWN = "Unknown";
+ }
}
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/util/sys/NetworkUtil.java b/nim_uikit/src/com/netease/nim/uikit/common/util/sys/NetworkUtil.java
index cab247aa7..8004ecd1b 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/util/sys/NetworkUtil.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/util/sys/NetworkUtil.java
@@ -5,6 +5,8 @@ import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.telephony.TelephonyManager;
+import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+
public class NetworkUtil {
public static final String TAG = "NetworkUtil";
@@ -15,8 +17,8 @@ public class NetworkUtil {
* @param context
* @return
*/
- public static boolean isNetAvailable(Context context) {
- NetworkInfo networkInfo = getActiveNetworkInfo(context);
+ public static boolean isNetAvailable(@Deprecated Context context) {
+ NetworkInfo networkInfo = getActiveNetworkInfo(BasicConfig.INSTANCE.getAppContext());
if (networkInfo != null) {
return networkInfo.isAvailable();
} else {
@@ -30,9 +32,9 @@ public class NetworkUtil {
* @param context
* @return
*/
- private static NetworkInfo getActiveNetworkInfo(Context context) {
+ private static NetworkInfo getActiveNetworkInfo(@Deprecated Context context) {
try {
- ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+ ConnectivityManager cm = (ConnectivityManager) BasicConfig.INSTANCE.getAppContext().getSystemService(Context.CONNECTIVITY_SERVICE);
return cm.getActiveNetworkInfo();
} catch (Exception e) {
return null;
@@ -41,7 +43,7 @@ public class NetworkUtil {
public static boolean getNetworkConnectionStatus(Context context) {
- ConnectivityManager manager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+ ConnectivityManager manager = (ConnectivityManager) BasicConfig.INSTANCE.getAppContext().getSystemService(Context.CONNECTIVITY_SERVICE);
if (manager == null) {
return false;
}
@@ -51,7 +53,7 @@ public class NetworkUtil {
return false;
}
- TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+ TelephonyManager tm = (TelephonyManager) BasicConfig.INSTANCE.getAppContext().getSystemService(Context.TELEPHONY_SERVICE);
if (tm == null) {
return false;
}