From 55b53fb9555bd64c9213e245c8fa85e1d0bf0e45 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Thu, 5 Sep 2024 18:10:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E4=B8=BA=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=20=E9=9D=9E=E5=86=99=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Share/src/main/AndroidManifest.xml                          | 2 +-
 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  | 2 +-
 gradle.properties                                           | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Share/src/main/AndroidManifest.xml b/Share/src/main/AndroidManifest.xml
index 5cbbcc96d..3bb420a51 100644
--- a/Share/src/main/AndroidManifest.xml
+++ b/Share/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     >
 
     <queries>
-        <package android:name="com.newpandora.yo"/>
+        <package android:name="${applicationId}"/>
         <package android:name="com.facebook.orca"/>
 
         <package
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 956866406..259970b64 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.newpandora.yo.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 0681ef840..3ea053468 100644
--- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
+++ b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
@@ -417,7 +417,7 @@ public class CommonHttpUtil {
                 .params("purchaseToken", purchaseToken)
                 .params("productId", productId)
                 .params("orderno", orderno)
-                .params("package_name", "com.newpandora.yo")
+                .params("package_name", CommonAppContext.sInstance.getPackageName())
                 .execute(callback);
     }
 
@@ -425,7 +425,7 @@ public class CommonHttpUtil {
         HttpClient.getInstance().get(CommonHttpConsts.NOTIFY_GOOGLE, CommonHttpConsts.NOTIFY_GOOGLE)
                 .params("purchaseToken", purchaseToken)
                 .params("productId", productId)
-                .params("package_name", "com.newpandora.yo")
+                .params("package_name", CommonAppContext.sInstance.getPackageName())
                 .execute(callback);
     }
 
@@ -434,7 +434,7 @@ public class CommonHttpUtil {
                 .params("purchaseToken", purchaseToken)
                 .params("orderno", orderNo)
                 .params("trade_no", tradeNo)
-                .params("package_name", "com.newpandora.yo")
+                .params("package_name", CommonAppContext.sInstance.getPackageName())
                 .execute(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 86fee0d3a..541d223c6 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.newpandora.yo.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.newpandora.yo.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.newpandora.yo.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 90cd72c12..64682556c 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.newpandora.yo"));
+                                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.newpandora.yo"));
+                                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 4552663be..5e70defa0 100644
--- a/common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java
@@ -128,7 +128,7 @@ 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.newpandora.yo"));
+                    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) {
diff --git a/gradle.properties b/gradle.properties
index 6f233b2b9..03703df08 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,6 +24,6 @@ android.nonTransitiveRClass=false
 
 systemProp.http.proxyHost=127.0.0.1
 systemProp.https.proxyHost=127.0.0.1
-systemProp.https.proxyPort=10809
-systemProp.http.proxyPort=10809
+systemProp.https.proxyPort=9098
+systemProp.http.proxyPort=9098
 android.enableR8.fullMode=true
\ No newline at end of file