From daf881f6a7c72db57152411b1a35b12bf7771493 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 22 Aug 2024 10:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E4=B8=AD?=
 =?UTF-8?q?=E5=8C=85=E5=90=8D=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F=20681?=
 =?UTF-8?q?=E9=80=81=E5=AE=A1=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/AndroidManifest.xml                         | 2 +-
 .../main/java/com/yunbao/common/http/CommonHttpUtil.java    | 6 +++---
 .../main/java/com/yunbao/common/utils/ProcessImageUtil.java | 6 +++---
 .../src/main/java/com/yunbao/common/utils/VersionUtil.java  | 4 ++--
 .../java/com/yunbao/common/views/APKUpdateCustomPopup.java  | 6 +++---
 config.gradle                                               | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 2b470c520..912b64498 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.newpdlive.sy.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
index ce04f7d40..b03530634 100644
--- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
+++ b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
@@ -397,15 +397,15 @@ public class CommonHttpUtil {
      * 谷歌支付成功后，通知自己服务器
      */
     public static void notifyMeGoogle(String purchaseToken, String productId, String orderno, HttpCallback callback) {
-        HttpClient.getInstance().get(CommonHttpConsts.NOTIFY_GOOGLE, CommonHttpConsts.NOTIFY_GOOGLE).params("purchaseToken", purchaseToken).params("productId", productId).params("orderno", orderno).params("package_name", "com.newpdlive.sy").execute(callback);
+        HttpClient.getInstance().get(CommonHttpConsts.NOTIFY_GOOGLE, CommonHttpConsts.NOTIFY_GOOGLE).params("purchaseToken", purchaseToken).params("productId", productId).params("orderno", orderno).params("package_name", AppManager.getInstance().getMainActivity().getPackageName()).execute(callback);
     }
 
     public static void notifyGoogle(String purchaseToken, String orderNo, String tradeNo, String allData, String gps_adid, HttpCallback callback) {
-        HttpClient.getInstance().get(CommonHttpConsts.NOTIFY_GOOGLE, CommonHttpConsts.NOTIFY_GOOGLE).params("purchaseToken", purchaseToken).params("orderno", orderNo).params("trade_no", tradeNo).params("allData", allData).params("gps_adid", gps_adid).params("package_name", "com.newpdlive.sy").execute(callback);
+        HttpClient.getInstance().get(CommonHttpConsts.NOTIFY_GOOGLE, CommonHttpConsts.NOTIFY_GOOGLE).params("purchaseToken", purchaseToken).params("orderno", orderNo).params("trade_no", tradeNo).params("allData", allData).params("gps_adid", gps_adid).params("package_name", AppManager.getInstance().getMainActivity().getPackageName()).execute(callback);
     }
 
     public static void Google_sec_pay(String purchaseToken, String orderNo, String tradeNo, HttpCallback callback) {
-        HttpClient.getInstance().get("Charge.Google_sec_pay", "Charge.Google_sec_pay").params("purchaseToken", purchaseToken).params("orderno", orderNo).params("trade_no", tradeNo).params("package_name", "com.newpdlive.sy").execute(callback);
+        HttpClient.getInstance().get("Charge.Google_sec_pay", "Charge.Google_sec_pay").params("purchaseToken", purchaseToken).params("orderno", orderNo).params("trade_no", tradeNo).params("package_name", AppManager.getInstance().getMainActivity().getPackageName()).execute(callback);
     }
 
     public static void notifySamsung(String purchaseId, String selfOrderId,HttpCallback callback) {
diff --git a/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java b/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java
index 34f3301f9..05f096263 100644
--- a/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java
+++ b/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java
@@ -83,7 +83,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
                 if (mNeedCrop) {
                     Uri uri = null;
                     if (Build.VERSION.SDK_INT >= 24) {
-                        uri = FileProvider.getUriForFile(mContext, "com.newpdlive.sy.fileprovider", mCameraResult);
+                        uri = FileProvider.getUriForFile(mContext, mContext.getPackageName()+".fileprovider", mCameraResult);
                     } else {
                         uri = Uri.fromFile(mCameraResult);
                     }
@@ -195,7 +195,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
             mCameraResult = getNewFile();
             Uri uri = null;
             if (Build.VERSION.SDK_INT >= 24) {
-                uri = FileProvider.getUriForFile(mContext, "com.newpdlive.sy.fileprovider", mCameraResult);
+                uri = FileProvider.getUriForFile(mContext, mContext.getPackageName()+".fileprovider", mCameraResult);
                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
             } else {
                 uri = Uri.fromFile(mCameraResult);
@@ -255,7 +255,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
             startActivityForResult(intent, mCropResultCallback);
         } catch (Exception e) {
             try {
-                Uri resultUri = FileProvider.getUriForFile(mContext, "com.newpdlive.sy.fileprovider", mCorpResult);
+                Uri resultUri = FileProvider.getUriForFile(mContext, mContext.getPackageName()+".fileprovider", mCorpResult);
                 if (resultUri == null || mFragment == null || mContext == null) {
                     return;
                 }
diff --git a/common/src/main/java/com/yunbao/common/utils/VersionUtil.java b/common/src/main/java/com/yunbao/common/utils/VersionUtil.java
index 1d701d2da..ac681d277 100644
--- a/common/src/main/java/com/yunbao/common/utils/VersionUtil.java
+++ b/common/src/main/java/com/yunbao/common/utils/VersionUtil.java
@@ -63,7 +63,7 @@ public class VersionUtil {
                             @Override
                             public void onConfirmClick(Dialog dialog, String content) {
                                 Intent i = new Intent(android.content.Intent.ACTION_VIEW);
-                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.newpdlive.sy"));
+                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id="+context.getPackageName()));
                                 context.startActivity(i);
                                 context.finish();
                             }
@@ -85,7 +85,7 @@ public class VersionUtil {
                             @Override
                             public void onConfirmClick(Dialog dialog, String content) {
                                 Intent i = new Intent(android.content.Intent.ACTION_VIEW);
-                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.newpdlive.sy"));
+                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id="+context.getPackageName()));
                                 context.startActivity(i);
                                 context.finish();
                             }
diff --git a/common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java b/common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java
index 298186982..d21669e56 100644
--- a/common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java
@@ -125,15 +125,15 @@ public class APKUpdateCustomPopup extends CenterPopupView {
             public void onViewClicks() {
                 if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
                     Intent i = new Intent(android.content.Intent.ACTION_VIEW);
-                    i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.newpdlive.sy"));
+                    i.setData(Uri.parse("https://play.google.com/store/apps/details?id="+mContext.getPackageName()));
                     mContext.startActivity(i);
                     mContext.finish();
                 } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
                     //华为
-                    launchHwAppDetail(mContext, "com.newpdlive.sy", "com.huawei.appmarket");
+                    launchHwAppDetail(mContext, mContext.getPackageName(), "com.huawei.appmarket");
                 } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
                     //三星
-                    launchSmAppDetail(mContext, "com.newpdlive.sy", "com.sec.android.app.samsungapps");
+                    launchSmAppDetail(mContext, mContext.getPackageName(), "com.sec.android.app.samsungapps");
                 } else {
                     versionImmediateUse.setVisibility(GONE);
                     updateLine.setVisibility(VISIBLE);
diff --git a/config.gradle b/config.gradle
index 3399b6bd2..e8445a08f 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,8 +4,8 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 23,
             targetSdkVersion : 34,
-            versionCode      : 664,
-            versionName      : "6.6.1"
+            versionCode      : 694,
+            versionName      : "6.8.1"
     ]
     manifestPlaceholders = [
             //正式、