From fb164ccb15549c476e381691f73e703b452fe50a Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Thu, 19 Oct 2023 14:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=9E=81=E5=85=89=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                  |   8 ++++----
 app/src/main/AndroidManifest.xml                  |   2 +-
 .../service/MakeUpService.java                    |  14 +++++++++-----
 app/src/main/{assets => res/raw}/kujp9scu.mp3     | Bin
 4 files changed, 14 insertions(+), 10 deletions(-)
 rename app/src/main/{assets => res/raw}/kujp9scu.mp3 (100%)

diff --git a/app/build.gradle b/app/build.gradle
index e7c25dc..c273203 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,8 +37,8 @@ android {
         applicationId "com.arpa.hndahesudintocctmsdriver"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 60
-        versionName "3.3.0"
+        versionCode 61
+        versionName "3.3.1"
         flavorDimensions "CHANNEL_VALUE"
         flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -101,7 +101,7 @@ android {
                                     app_icon     : "@drawable/diver_logo_text",
                                     GAODEKEY     : "6791d69f6221a0841b521763af86eb01",
                                     JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
+                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
                                     JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
             ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"")
@@ -116,7 +116,7 @@ android {
                                     app_icon     : "@drawable/diver_logo",
                                     GAODEKEY     : "78019612271411eca3af34db91930620",
                                     JPUSH_PKGNAME: applicationId,
-                                    JPUSH_APPKEY : "571d93ae5117da6dee848c92", //JPush 上注册的包名对应的 Appkey.
+                                    JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey.
                                     JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
             ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi.alct56.com\"")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4c936cd..e29c24a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -274,7 +274,7 @@
         <!-- 极光-->
         <meta-data
             android:name="JPUSH_APPKEY"
-            android:value="571d93ae5117da6dee848c92" /> <!-- </>值来自开发者平台取得的AppKey -->
+            android:value="fba6f55621c670d8c1fe9191" /> <!-- </>值来自开发者平台取得的AppKey -->
 
         <meta-data
             android:name="JPUSH_CHANNEL"
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java
index 3d34522..478e082 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/MakeUpService.java
@@ -10,6 +10,7 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.arpa.hndahesudintocctmsdriver.R;
 import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
 import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants;
@@ -27,11 +28,14 @@ public class MakeUpService extends Service {
     public void palyMp3(){
         Log.e("开始播放","-----");
         try {
-            AssetFileDescriptor fd =getAssets().openFd("kujp9scu.mp3");
-            mediaPlayer.setDataSource(fd);
-            mediaPlayer.setLooping(false);//设置为循环播放
-            mediaPlayer.prepare();//初始化播放器MediaPlayer
-            mediaPlayer.start();
+            MediaPlayer mediaPlayer = MediaPlayer.create(this, R.raw.kujp9scu);
+            mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+                @Override
+                public void onPrepared(MediaPlayer mediaPlayer) {
+                    mediaPlayer.start();
+                }
+            });
+            mediaPlayer.prepareAsync();
             Log.e("播放成功","-----");
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/app/src/main/assets/kujp9scu.mp3 b/app/src/main/res/raw/kujp9scu.mp3
similarity index 100%
rename from app/src/main/assets/kujp9scu.mp3
rename to app/src/main/res/raw/kujp9scu.mp3