diff --git a/README.md b/README.md index 58c6287b42af64b2a01d2ab2078a2a4d31953dbf..b5417a44e7ec66e7e660e6e68f9ff72cb6e78cfa 100644 --- a/README.md +++ b/README.md @@ -12,5 +12,5 @@ Volume Control Features
Yuki Push Service
## Current Version -1.0.9-git-201709041527
-[ ![Download](https://api.bintray.com/packages/takeya-yuki-studio/maven/rubylib/images/download.svg?version=1.0.9) ](https://bintray.com/takeya-yuki-studio/maven/rubylib/1.0.9/link) +1.0.10-git-201709101131
+[ ![Download](https://api.bintray.com/packages/takeya-yuki-studio/maven/rubylib/images/download.svg?version=1.0.10) ](https://bintray.com/takeya-yuki-studio/maven/rubylib/1.0.10/link) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 79f7fac519eab5537f9a08c7a2cee888244fecce..0df08ba0db6f213616f71b5324108847d2df3732 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,7 @@ - + diff --git a/app/src/main/java/jp/ruby/rubylibrary/MainActivity.java b/app/src/main/java/jp/ruby/rubylibrary/MainActivity.java index 6f643c2528fbe9a215695f9fa91624f4e3c2cc7e..4fcda5f3b154885543cc60a0e191d7d7e4f98f30 100644 --- a/app/src/main/java/jp/ruby/rubylibrary/MainActivity.java +++ b/app/src/main/java/jp/ruby/rubylibrary/MainActivity.java @@ -64,7 +64,6 @@ public class MainActivity extends Activity { data+=Pi.name+":"+Pi.loadDescription(packageManager)+"
"; } wv.loadData(data,"text/html","utf-8"); - ActivityCompat.requestPermissions(this,null,0); } } diff --git a/app/src/main/java/jp/ruby/rubylibrary/TestService.java b/app/src/main/java/jp/ruby/rubylibrary/TestService.java index a33a243a51740b39f0ec6f3c76338e75948e114e..4901896ffd87e38b9b0dd47b32b23316d301ccfb 100644 --- a/app/src/main/java/jp/ruby/rubylibrary/TestService.java +++ b/app/src/main/java/jp/ruby/rubylibrary/TestService.java @@ -18,7 +18,7 @@ import yuki.msg.extended.YukiPushService; public class TestService extends YukiPushService { @Override public String GetRemoteEndPoint() { - return "10.1.1.134:10086"; + return "10.1.1.134:8134"; } @Override @@ -40,5 +40,9 @@ public class TestService extends YukiPushService { Intent j=new Intent(Intent.ACTION_VIEW, Uri.parse(msg)); j.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(j); + /*Intent i=new Intent(Intent.ACTION_VIEW, Uri.parse("msg://msg")); + PendingIntent pi=PendingIntent.getActivity(getApplicationContext(),0,i,PendingIntent.FLAG_UPDATE_CURRENT); + NotificationController.Notify(getApplicationContext(),GetServiceID(),GetIcon(),pi, + "Yuki Push Service","Yuki Push Service",msg, Notification.FLAG_NO_CLEAR|Notification.FLAG_AUTO_CANCEL);*/ } } diff --git a/rubylib/build.gradle b/rubylib/build.gradle index 0c1436c2218c8d950a237bbe8b5c07a923308e0a..a3b2f33fc6ed1d278edcc064ce288d8b4943408f 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.9' //compile引用时的第3部分版本号 + publishVersion = '1.0.10' //compile引用时的第3部分版本号 desc = 'Ruby Extended Controls' website = 'https://github.com/Takeya-Yuki/RubyLib.git' } @@ -21,7 +21,7 @@ android { minSdkVersion 21 targetSdkVersion 26 versionCode 9 - versionName "1.0.9" + versionName "1.0.10" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/rubylib/src/main/java/yuki/msg/extended/YukiPushService.java b/rubylib/src/main/java/yuki/msg/extended/YukiPushService.java index e980dba05fb2b1e24bcfefbd85a4ccee24bd2555..8cd7463aaa41de6d66606a5f5317d43fe50c22cb 100644 --- a/rubylib/src/main/java/yuki/msg/extended/YukiPushService.java +++ b/rubylib/src/main/java/yuki/msg/extended/YukiPushService.java @@ -60,15 +60,16 @@ public abstract class YukiPushService extends Service { String readline; readline=sin.readLine(); - while(readline!=null){ + while(true){ readline=sin.readLine(); if(readline.isEmpty()){continue;} if(readline==null){ - break; + continue; + } + else { + MessagePushed(readline); } - MessagePushed(readline); } - socket.close(); } catch(IOException ex) {