From f762eea2a9bb1c37ab0370632084f6e0982ca0a2 Mon Sep 17 00:00:00 2001 From: Yuki Takeya Date: Wed, 24 Jan 2018 16:51:08 +0900 Subject: [PATCH] Update Network Manager --- README.md | 2 +- .../java/jp/ruby/rubylibrary/MainActivity.java | 16 +++++++++++++++- gradle.bat | 2 +- gradle.properties | 1 + pm/build.gradle | 4 ++-- .../java/yuki/pm/extended/NetworkManager.java | 4 ++-- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b7086c0..9ecb35a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Volume Control Features
Yuki Push Service
## Current Version -2.0.1-git-20171204
+2.0.2-git-20180124
All-in-One Package(Depreciated): [ ![Download](https://api.bintray.com/packages/takeya-yuki-studio/maven/rubylib/images/download.svg) ](https://bintray.com/takeya-yuki-studio/maven/rubylib/_latestVersion) AjaxLib Package: [ ![Download](https://api.bintray.com/packages/takeya-yuki-studio/maven/ajaxlib/images/download.svg) ](https://bintray.com/takeya-yuki-studio/maven/ajaxlib/_latestVersion) Add Gson for JSON Ajax diff --git a/app/src/main/java/jp/ruby/rubylibrary/MainActivity.java b/app/src/main/java/jp/ruby/rubylibrary/MainActivity.java index 846c846..619f748 100644 --- a/app/src/main/java/jp/ruby/rubylibrary/MainActivity.java +++ b/app/src/main/java/jp/ruby/rubylibrary/MainActivity.java @@ -3,9 +3,12 @@ package jp.ruby.rubylibrary; import android.app.Activity; import android.app.Notification; import android.app.PendingIntent; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.PermissionInfo; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; import android.net.Uri; import android.os.Bundle; import android.webkit.WebView; @@ -15,9 +18,12 @@ import java.util.Locale; import yuki.control.extended.WebViewEx; import yuki.msg.extended.NotificationController; +import yuki.pm.extended.NetworkManager; import yuki.pm.extended.pm; import yuki.tts.extended.TTSComplexController; +import static yuki.pm.extended.NetworkManager.NO_NETWORK; + public class MainActivity extends Activity { @@ -33,7 +39,7 @@ public class MainActivity extends Activity { //wv.addJavascriptInterface(new JS(getApplicationContext()), "tts"); Intent i=new Intent(Intent.ACTION_VIEW,Uri.parse("http://www.baidu.com/")); PendingIntent pi=PendingIntent.getActivity(getApplicationContext(),0,i,PendingIntent.FLAG_UPDATE_CURRENT); - + int y=NetworkManager.GetNetworkType(MainActivity.this); Intent srv=new Intent("AAA"); srv.setPackage(getPackageName()); startService(srv); @@ -47,6 +53,14 @@ public class MainActivity extends Activity { data+=Pi.name+":"+Pi.loadDescription(packageManager)+"
"; } wv.loadData(data,"text/html","utf-8"); + + ConnectivityManager mConnectivityManager = (ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo(); + if (mNetworkInfo != null && mNetworkInfo.isConnectedOrConnecting()) { + int x= mNetworkInfo.getType(); + } else { + int x= NO_NETWORK; + } } } diff --git a/gradle.bat b/gradle.bat index 5a4f153..203aac1 100644 --- a/gradle.bat +++ b/gradle.bat @@ -1 +1 @@ -gradlew clean build bintrayUpload -PbintrayUser=takeya-yuki -PbintrayKey=%1 -PdryRun=%2 -p %3 \ No newline at end of file +gradlew clean build bintrayUpload -PbintrayUser=takeya-yuki -PbintrayKey=%1 -PdryRun=%2 -p %3 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d6d0c31..c651144 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,3 +20,4 @@ systemProp.https.proxyHost=127.0.0.1 systemProp.https.proxyPort=1080 #systemProp.http.nonProxyHost=*.google.com #systemProp.https.nonProxyHost=*.google.com +org.gradle.java.home=A:\\JDK\\1.8.0\\152 diff --git a/pm/build.gradle b/pm/build.gradle index d34cd25..13897c0 100644 --- a/pm/build.gradle +++ b/pm/build.gradle @@ -5,7 +5,7 @@ publish { userOrg = 'takeya-yuki-studio' //bintray注册的用户名 groupId = 'jp.ruby.rubylib' //compile引用时的第1部分groupId artifactId = 'packagemanager' //compile引用时的第2部分项目名 - publishVersion = '2.0.1' //compile引用时的第3部分版本号 + publishVersion = '2.0.2' //compile引用时的第3部分版本号 desc = 'Ruby Extended Controls - PackageManager' website = 'https://github.com/Takeya-Yuki/RubyLib.git' } @@ -17,7 +17,7 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 26 - versionCode 1 + versionCode 2 versionName "2.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/pm/src/main/java/yuki/pm/extended/NetworkManager.java b/pm/src/main/java/yuki/pm/extended/NetworkManager.java index 70395a2..0181429 100644 --- a/pm/src/main/java/yuki/pm/extended/NetworkManager.java +++ b/pm/src/main/java/yuki/pm/extended/NetworkManager.java @@ -74,7 +74,7 @@ public class NetworkManager { public static int GetNetworkType(Context context) { ConnectivityManager mConnectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo mNetworkInfo = mConnectivityManager.getActiveNetworkInfo(); - if (mNetworkInfo != null && mNetworkInfo.isAvailable()) { + if (mNetworkInfo != null && mNetworkInfo.isConnectedOrConnecting()) { return mNetworkInfo.getType(); } else { return NO_NETWORK; @@ -96,6 +96,6 @@ public class NetworkManager { } /*NO Network*/ - public static int NO_NETWORK = 0; + public static int NO_NETWORK = -1; } -- GitLab