diff --git a/Share/build.gradle b/Share/build.gradle index 15f70e9d7..1fcdd4857 100644 --- a/Share/build.gradle +++ b/Share/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'kotlin-parcelize' apply from: "../package_config.gradle" android { - namespace "com.pdlive.shayu" + namespace "com.newpdlive.sy" compileSdkVersion rootProject.ext.android.compileSdkVersion buildToolsVersion rootProject.ext.android.buildToolsVersion packagingOptions { diff --git a/Share/src/main/AndroidManifest.xml b/Share/src/main/AndroidManifest.xml index 3d3b90c8a..ab3505f2b 100644 --- a/Share/src/main/AndroidManifest.xml +++ b/Share/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> - + + @@ -191,9 +194,7 @@ - + /files目录 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 5d725d932..ce04f7d40 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.pdlive.shayu").execute(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); } 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.pdlive.shayu").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", "com.newpdlive.sy").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.pdlive.shayu").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", "com.newpdlive.sy").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 0464f9d7c..34f3301f9 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.pdlive.shayu.fileprovider", mCameraResult); + uri = FileProvider.getUriForFile(mContext, "com.newpdlive.sy.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.pdlive.shayu.fileprovider", mCameraResult); + uri = FileProvider.getUriForFile(mContext, "com.newpdlive.sy.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.pdlive.shayu.fileprovider", mCorpResult); + Uri resultUri = FileProvider.getUriForFile(mContext, "com.newpdlive.sy.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 41ac4bfce..1d701d2da 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.pdlive.shayu")); + i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.newpdlive.sy")); 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.pdlive.shayu")); + i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.newpdlive.sy")); 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 2f5cffffe..298186982 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.pdlive.shayu")); + i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.newpdlive.sy")); mContext.startActivity(i); mContext.finish(); } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) { //华为 - launchHwAppDetail(mContext, "com.pdlive.shayu", "com.huawei.appmarket"); + launchHwAppDetail(mContext, "com.newpdlive.sy", "com.huawei.appmarket"); } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) { //三星 - launchSmAppDetail(mContext, "com.pdlive.shayu", "com.sec.android.app.samsungapps"); + launchSmAppDetail(mContext, "com.newpdlive.sy", "com.sec.android.app.samsungapps"); } else { versionImmediateUse.setVisibility(GONE); updateLine.setVisibility(VISIBLE); diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index a8b57e1b0..6d875c355 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -648,7 +648,7 @@ 歡迎來到PDLIVE 恭喜你獲得了新人獎勵 - com.pdlive.shayu.fileprovider + com.newpdlive.sy.fileprovider 人 個 數量 diff --git a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java index 6543fec4d..4fc090ab4 100644 --- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java @@ -46,6 +46,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.blankj.utilcode.util.DeviceUtils; import com.blankj.utilcode.util.GsonUtils; +import com.blankj.utilcode.util.LogUtils; import com.facebook.AccessToken; import com.facebook.CallbackManager; import com.facebook.FacebookCallback; @@ -441,6 +442,7 @@ public class EntryActivity extends AppCompatActivity { } else if (loginType == 4) { try { // App-to-app login + LogUtils.e(CommonAppConfig.LINE_CHANNEL_ID,CommonAppConfig.BUILD_TIME); Intent loginIntent = LineLoginApi.getLoginIntent(findViewById(R.id.btn_line).getContext(), CommonAppConfig.LINE_CHANNEL_ID, new LineAuthenticationParams.Builder().scopes(Arrays.asList(Scope.PROFILE)) // .nonce("") // nonce can be used to improve security .build()); diff --git a/package_config.gradle b/package_config.gradle index e16c68e66..1234cc581 100644 --- a/package_config.gradle +++ b/package_config.gradle @@ -47,31 +47,31 @@ android { google_test { dimension 'packageApk' if (project.getPluginManager().hasPlugin("com.android.application")) { - applicationId "com.test.pd" + applicationId "com.newpdlive.sy" } manifestPlaceholders = [ serverHost : rootProject.ext.manifestPlaceholders.testServerHost, isGooglePlay : 1, isUploadLog : true, isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel, - facebook_app_id : "999999999", - facebook_client_token : "888888888", - channelId : "google" + facebook_app_id : "938330614686044", + facebook_client_token : "b1b574a2cdf0ced1ae5df7274636f65d", + lineChannelId : "2006123567" ] } google_online { dimension 'packageApk' if (project.getPluginManager().hasPlugin("com.android.application")) { - applicationId "com.test.pd" + applicationId "com.newpdlive.sy" } manifestPlaceholders = [ serverHost : rootProject.ext.manifestPlaceholders.serverHost, isGooglePlay : 1, isUploadLog : true, isPluginModel: rootProject.ext.manifestPlaceholders.isPluginModel, - facebook_app_id : "999999999", - facebook_client_token : "888888888", - channelId : "google" + facebook_app_id : "938330614686044", + facebook_client_token : "b1b574a2cdf0ced1ae5df7274636f65d", + lineChannelId : "2006123567" ] } huawei_test {