fix online version issue

ccjeng · May 24, 2017 · f989052 · f989052
1 parent a2601c9
commit f989052
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 45 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -97,51 +97,51 @@
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="butterknife-7.0.1" level="project" />
-    <orderEntry type="library" exported="" name="firebase-analytics-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="firebase-core-10.2.0" level="project" />
     <orderEntry type="library" exported="" name="mopub-sdk-native-video-4.13.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-tagmanager-v4-impl-10.2.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-gass-10.2.6" level="project" />
     <orderEntry type="library" exported="" name="exoplayer-r2.0.3" level="project" />
-    <orderEntry type="library" exported="" name="play-services-tasks-10.2.0" level="project" />
+    <orderEntry type="library" exported="" name="firebase-analytics-10.2.6" level="project" />
     <orderEntry type="library" exported="" name="mopub-sdk-4.13.0" level="project" />
-    <orderEntry type="library" exported="" name="design-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="transition-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-gass-10.2.0" level="project" />
+    <orderEntry type="library" exported="" name="transition-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-tagmanager-v4-impl-10.2.6" level="project" />
+    <orderEntry type="library" exported="" name="design-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-25.2.0" level="project" />
     <orderEntry type="library" exported="" name="FacebookAdapter" level="project" />
-    <orderEntry type="library" exported="" name="play-services-clearcut-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-core-ui-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-ads-lite-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="firebase-iid-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-core-utils-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-fragment-25.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-10.2.6" level="project" />
+    <orderEntry type="library" exported="" name="firebase-iid-10.2.6" level="project" />
+    <orderEntry type="library" exported="" name="firebase-core-10.2.6" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="mopub-sdk-interstitial-4.13.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-ads-lite-10.2.6" level="project" />
+    <orderEntry type="library" exported="" name="play-services-clearcut-10.2.6" level="project" />
     <orderEntry type="library" exported="" name="mopub-sdk-banner-4.13.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-ads-10.2.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-analytics-impl-10.2.6" level="project" />
     <orderEntry type="library" exported="" name="mopub-volley-1.1.0" level="project" />
     <orderEntry type="library" exported="" name="libAdapterSDKMoPub" level="project" />
+    <orderEntry type="library" exported="" name="firebase-analytics-impl-10.2.6" level="project" />
+    <orderEntry type="library" exported="" name="play-services-ads-10.2.6" level="project" />
     <orderEntry type="library" exported="" name="audience-network-sdk-4.20.0" level="project" />
-    <orderEntry type="library" exported="" name="firebase-analytics-impl-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="firebase-common-10.2.0" level="project" />
+    <orderEntry type="library" exported="" name="firebase-common-10.2.6" level="project" />
     <orderEntry type="library" exported="" name="mopub-sdk-native-static-4.13.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-analytics-impl-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-basement-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="support-compat-25.3.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-10.2.6" level="project" />
+    <orderEntry type="library" exported="" name="firebase-ads-10.2.6" level="project" />
+    <orderEntry type="library" exported="" name="play-services-tasks-10.2.6" level="project" />
     <orderEntry type="library" exported="" name="fastadapter-2.1.7" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-media-compat-25.3.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="aboutlibraries-5.9.4" level="project" />
-    <orderEntry type="library" exported="" name="play-services-analytics-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="firebase-ads-10.2.0" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-25.3.0" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="mopub-sdk-rewardedvideo-4.13.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-25.3.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-analytics-10.2.6" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="iconics-core-2.8.0" level="project" />
     <orderEntry type="library" exported="" name="mopub-sdk-base-4.13.0" level="project" />
     <orderEntry type="library" exported="" name="swipe-back-1.0.0-alpha2" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.0" level="project" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.oddsoft.buddhavoice2"
         minSdkVersion 16
         targetSdkVersion 21
-        versionCode 38
-        versionName '2.5.4.032617BV'
+        versionCode 39
+        versionName '2.5.5.052417BV'
     }
     buildTypes {
         release {
@@ -26,12 +26,12 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:25.3.0'
-    compile 'com.android.support:design:25.3.0'
-    compile 'com.google.android.gms:play-services-analytics:10.2.0'
-    compile 'com.google.firebase:firebase-core:10.2.0'
-    compile 'com.google.firebase:firebase-ads:10.2.0'
-    releaseCompile 'com.google.firebase:firebase-crash:10.2.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.google.android.gms:play-services-analytics:10.2.6'
+    compile 'com.google.firebase:firebase-core:10.2.6'
+    compile 'com.google.firebase:firebase-ads:10.2.6'
+    releaseCompile 'com.google.firebase:firebase-crash:10.2.6'
     compile('com.mikepenz:aboutlibraries:5.9.4@aar') {
         transitive = true
     }

diff --git a/app/src/main/java/com/oddsoft/buddhavoice2/view/VoiceListener.java b/app/src/main/java/com/oddsoft/buddhavoice2/view/VoiceListener.java
@@ -227,40 +227,41 @@ private void playMusic(int itemnumber, String itemname) {
 
             switch (itemnumber) {
                 case 0:
-                    mp3 = "Prajnaparamita.mp3";
+                    mp3 = "glscjg724kuvc3w/Prajnaparamita.mp3?dl=0";
                     //	PATH="http://sites.google.com/site/androidbuddhavoice/Prajnaparamita.mp3?attredirects=0&d=1";
                     //  PATH="http://dl.dropbox.com/u/128583/Prajnaparamita.mp3";
                     break;
                 case 1:
-                    mp3 = "XJ0502.mp3";
+                    mp3 = "lbd1h01nlsw6n48/XJ0502.mp3?dl=0";
                     //	PATH="http://sites.google.com/site/androidbuddhavoice/XJ0502.mp3?attredirects=0&d=1";
                     //  PATH="http://dl.dropbox.com/u/128583/XJ0502.mp3";
                     break;
                 case 2:
-                    mp3 = "great1.mp3";
+                    mp3 = "7u8gschi6wksmow/great1.mp3?dl=0";
                     //	PATH="http://sites.google.com/site/androidbuddhavoice/great1.mp3?attredirects=0&d=1";
                     //	PATH="http://dl.dropbox.com/u/128583/great1.mp3";
                     break;
                 case 3:
-                    mp3 = "great2.mp3";
+                    mp3 = "2q1341am5zrrn8r/great2.mp3?dl=0";
                     //	PATH="http://sites.google.com/site/androidbuddhavoice/great2.mp3?attredirects=0&d=1";
                     //	PATH="http://dl.dropbox.com/u/128583/great2.mp3";
                     break;
                 case 4:
-                    mp3 = "Menla_Mantra.mp3";
+                    mp3 = "mfdpfxhunba2rf7/Menla_Mantra.mp3?dl=0";
                     //	PATH="http://sites.google.com/site/androidbuddhavoice/Menla_Mantra.mp3?attredirects=0&d=1";
                     //	PATH="http://dl.dropbox.com/u/128583/Menla_Mantra.mp3";
                     break;
                 case 5:
-                    mp3 = "LJM093-02-Nian.Mp3";
+                    mp3 = "2znpghtgtct87i5/LJM093-02-Nian.Mp3?dl=0";
                     //	PATH="http://sites.google.com/site/androidbuddhavoice/LJM093-02-Nian.Mp3?attredirects=0&d=1";
                     //	PATH="http://dl.dropbox.com/u/128583/LJM093-02-Nian.Mp3";
                     break;
             }
             //if (onlinePreference.equals("google"))
             //    PATH = "http://sites.google.com/site/androidbuddhavoice/" + mp3 + "?attredirects=0&d=1";
             //if (onlinePreference.equals("dropbox"))
-                PATH = "https://dl.dropboxusercontent.com/s/7u8gschi6wksmow/" + mp3;
+                PATH = "https://dl.dropboxusercontent.com/s/" + mp3;
+                //PATH="http://sites.google.com/site/androidbuddhavoice/"+mp3+"?attredirects=0&d=1";
                 //PATH = "http://www.filefactory.com/stream/23fccglfek8d/great1.mp3";
         }
         stopMusic();
@@ -283,6 +284,7 @@ private void startMusic(int resourceID) {
                         public void run() {
                             try {
                                 //play music
+                                Log.d(TAG, "PATH=" +PATH);
                                 mp.setDataSource(PATH);
                                 mp.prepare();
                                 mp.setLooping(true);

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.2'
         classpath 'com.google.gms:google-services:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong