diff --git a/rubylib/build.gradle b/rubylib/build.gradle index ca1572bba373c1191f39a45670096539c08f9726..2d8bb627dfcaa75834e3b878002b1909c96a246a 100644 --- a/rubylib/build.gradle +++ b/rubylib/build.gradle @@ -7,7 +7,7 @@ publish { userOrg = 'takeya-yuki-studio' //bintray注册的用户名 groupId = 'jp.ruby.rubylib' //compile引用时的第1部分groupId artifactId = 'rubylib' //compile引用时的第2部分项目名 - publishVersion = '1.0.3' //compile引用时的第3部分版本号 + publishVersion = '1.0.4' //compile引用时的第3部分版本号 desc = 'Ruby Extended Controls' website = 'https://github.com/Takeya-Yuki/RubyLib.git' } @@ -20,8 +20,8 @@ android { defaultConfig { minSdkVersion 17 targetSdkVersion 26 - versionCode 3 - versionName "1.0.3" + versionCode 4 + versionName "1.0.4" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/rubylib/src/main/java/yuki/pm/extended/AutoUpdateManager.java b/rubylib/src/main/java/yuki/pm/extended/AutoUpdateManager.java index 62eedbdf524a3542df4b617c87ccee3eb7477774..d2562199e84395379888fd7e05e2f9bf99f31a48 100644 --- a/rubylib/src/main/java/yuki/pm/extended/AutoUpdateManager.java +++ b/rubylib/src/main/java/yuki/pm/extended/AutoUpdateManager.java @@ -42,7 +42,7 @@ public final class AutoUpdateManager { NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo(); boolean lte = false; if (NetworkManager.GetNetworkType(mContext) != NetworkManager.NO_NETWORK) { - if (NetworkManager.GetNetworkType(mContext) == NetworkManager.MOBILE) { + if (NetworkManager.GetNetworkType(mContext) == ConnectivityManager.TYPE_MOBILE) { lte = true; } } else { diff --git a/rubylib/src/main/java/yuki/pm/extended/NetworkManager.java b/rubylib/src/main/java/yuki/pm/extended/NetworkManager.java index 0126e0b8fa7c2960c78064f4d4043ed84c7bf53e..70395a2ca40b0ca5b66798edd6fe524b422e1b4c 100644 --- a/rubylib/src/main/java/yuki/pm/extended/NetworkManager.java +++ b/rubylib/src/main/java/yuki/pm/extended/NetworkManager.java @@ -7,6 +7,7 @@ import android.net.NetworkInfo; import android.net.wifi.WifiManager; import android.provider.Settings; +import java.io.IOException; import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; @@ -74,20 +75,27 @@ public class NetworkManager { ConnectivityManager mConnectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo(); if (mNetworkInfo != null && mNetworkInfo.isAvailable()) { - if (mNetworkInfo.getType() == ConnectivityManager.TYPE_WIFI || mNetworkInfo.getType() == ConnectivityManager.TYPE_WIMAX) { - return WIFI; - } else { - return MOBILE; - } + return mNetworkInfo.getType(); } else { return NO_NETWORK; } } + /** + * Get Ping Status + * @param host Host Name + * @param timeout Timeout + * @return Ping Success + * */ + public static boolean Ping(String host,int timeout){ + try { + return InetAddress.getByName(host).isReachable(timeout); + } catch (IOException e) { + return false; + } + } + /*NO Network*/ public static int NO_NETWORK = 0; - /*Wifi Connected*/ - public static int WIFI = 1; - /*Mobile Network Connected*/ - public static int MOBILE = 2; + }