替换友盟为本地aar

调整小游戏为繁体中文

app/build.gradle

@@ -10,6 +10,26 @@ android {
     project.tasks.getByName("tasks").doFirst {
 
     }
+    /* flavorDimensions "packageApk"
+     productFlavors {
+         LinkTest {
+             dimension "packageApk"
+             manifestPlaceholders = [serverHost: "https://ceshi.yaoulive.com",isGooglePlay:0,isPluginModel:true]
+         }
+         LinkOfficial {
+             dimension "packageApk"
+             manifestPlaceholders = [serverHost: "https://napi.yaoulive.com",isGooglePlay:0,isPluginModel:true]
+         }
+         GoogleTest {
+             dimension "packageApk"
+             manifestPlaceholders = [serverHost: "https://ceshi.yaoulive.com",isGooglePlay:1,isPluginModel:false]
+         }
+         GoogleOfficial{
+             dimension "packageApk"
+             manifestPlaceholders = [serverHost: "https://napi.yaoulive.com",isGooglePlay:1,isPluginModel:false]
+         }
+
+     }*/
     /*  applicationVariants.all { variant ->
           variant.mergeAssetsProvider.configure {
               doLast {
@@ -119,14 +139,27 @@ android {
         processManifestTask.doLast { pm ->
             String manifestPath = "build/intermediates/bundle_manifest/release/bundle-manifest/AndroidManifest.xml"
             def isGooglePlay = rootProject.ext.manifestPlaceholders.isGooglePlay
-            if (file(manifestPath).exists() && isGooglePlay) {
+            println "谷歌版本：" + isGooglePlay
+            println "文件存在" + file(manifestPath).exists()
+            println "" + (isGooglePlay != 0)
+            println "" + (file(manifestPath).exists() && isGooglePlay != 0)
+            if (file(manifestPath).exists() && isGooglePlay != 0) {
                 def manifestContent = file(manifestPath).getText()
-
+                println "移除权限"
                 manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />', '')
+                manifestContent = manifestContent.replace('android.permission.REQUEST_INSTALL_PACKAGES', '')
                 file(manifestPath).write(manifestContent)
             } else {
                 print "not Exists = " + manifestPath
             }
+            manifestPath = "build/intermediates/merged_manifests/release/processReleaseManifest/AndroidManifest.xml"
+            if (file(manifestPath).exists() && isGooglePlay != 0) {
+                def manifestContent = file(manifestPath).getText()
+                println "移除权限2"
+                manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />', '')
+                manifestContent = manifestContent.replace('android.permission.REQUEST_INSTALL_PACKAGES', '')
+                file(manifestPath).write(manifestContent)
+            }
         }
         variant.mergeAssetsProvider.configure {
             doLast {
@@ -171,7 +204,7 @@ android {
                 isGoogle = "谷歌"
             } else if (rootProject.ext.manifestPlaceholders.isGooglePlay == 2) {
                 isGoogle = "Huawei"
-            }else if (rootProject.ext.manifestPlaceholders.isGooglePlay == 3) {
+            } else if (rootProject.ext.manifestPlaceholders.isGooglePlay == 3) {
                 isGoogle = "Samsung"
             }
             def isPlugin = "完整"
@@ -183,7 +216,6 @@ android {
                 isTest = "正式服"
             }
             outputFileName = "[${new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${isGoogle}-${isPlugin}-${variant.buildType.name}-${isTest}.apk"
-
         }
     }
     signingConfigs {

common/build.gradle

@@ -200,9 +200,7 @@ dependencies {
     //自定义圆角图片
     api 'com.makeramen:roundedimageview:2.3.0'
     // 友盟统计SDK
-    api 'com.umeng.umsdk:common:9.6.3'// 必选
+    api(name: 'umeng-common-9.6.8+000', ext: 'aar')
-    api 'com.umeng.umsdk:asms:1.8.0'// 必选
-    api 'com.umeng.umsdk:uyumao:1.1.2'
     //高级运营分析功能依赖库，使用卸载分析、开启反作弊能力请务必集成，以免影响高级功能使用。common需搭配v9.6.3及以上版本，asms需搭配v1.7.0及以上版本。需更新隐私声明。
     // 标准版本SudMGP SDK
     api 'tech.sud.mgp:SudMGP:1.3.3.1158'

common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java

@@ -59,7 +59,7 @@ public class QuickStartGameViewModel extends BaseGameViewModel {
     /**
      * 游戏的语言代码
      */
-    public String languageCode = "zh-CN";
+    public String languageCode = "zh-TW";
 
     public final MutableLiveData<View> gameViewLiveData = new MutableLiveData<>(); // 游戏View回调
 
@@ -69,7 +69,7 @@ public class QuickStartGameViewModel extends BaseGameViewModel {
     @Override
     protected void getCode(Activity activity, String userId, String appId, GameGetCodeListener listener) {
         if (IMLoginManager.get(activity).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
-            languageCode = "zh-CN";
+            languageCode = "zh-TW";
         }else {
             languageCode = "en-US";
         }

config.gradle

@@ -4,14 +4,14 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 33,
-            versionCode      : 468,
+            versionCode      : 472,
             versionName      : "6.6.8"
     ]
     manifestPlaceholders = [
             //正式、
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
 //             测试
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //百度语音识别
 
@@ -21,10 +21,10 @@ ext {
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 
 //            true表示谷歌支付 false    0 链接包   1 谷歌包   2华为包  3 samsung包
-            isGooglePlay     : 0,
+            isGooglePlay     : 1,
             //是否上报异常日志
             isUploadLog      : true,
             //是否打包成插件包模式
-            isPluginModel    : true,
+            isPluginModel    : false,
     ]
 }

main/src/main/java/com/yunbao/main/activity/EntryActivity.java

@@ -612,7 +612,7 @@ public class EntryActivity extends AppCompatActivity {
                 Contexts.startActivity(new Intent(Contexts, BindUserActivity.class).putExtra("uid", uid).putExtra("token", token));
             }
         } else {
-            ToastUtil.show(msg + "11212");
+            ToastUtil.show(msg);
         }
     }
 

main/src/main/res/layout/activity_feedback_success.xml

@@ -3,16 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:background="#FFFFFF"
+    android:layout_height="match_parent"
-    android:layout_height="match_parent">
+    android:background="#FFFFFF">
 
     <TextView
         android:id="@+id/textView14"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="50dp"
+        android:layout_marginEnd="50dp"
+        android:gravity="center"
+        android:maxLines="2"
         android:text="@string/activity_feedback_success_tips"
-        android:textSize="13sp"
         android:textColor="#333333"
+        android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -30,13 +34,13 @@
 
     <TextView
         android:id="@+id/textView15"
-        android:textSize="24sp"
-        android:textColor="#777777"
         android:layout_width="wrap_content"
-        android:gravity="center"
         android:layout_height="wrap_content"
         android:layout_marginBottom="19dp"
+        android:gravity="center"
         android:text="@string/activity_feedback_success_title"
+        android:textColor="#777777"
+        android:textSize="24sp"
         app:layout_constraintBottom_toTopOf="@+id/imageView11"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
@@ -45,10 +49,10 @@
         android:id="@+id/sub"
         android:layout_width="132dp"
         android:layout_height="50dp"
+        android:layout_marginTop="70dp"
+        android:background="@drawable/bg_btn_feedback_success"
         android:text="@string/activity_feedback_success_sub"
         android:textAllCaps="false"
-        android:background="@drawable/bg_btn_feedback_success"
-        android:layout_marginTop="70dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView14" />

main/src/main/res/values-zh/strings.xml

@@ -23,7 +23,7 @@
     <string name="activity_feedback_customer_service">智能客服</string>
     <string name="activity_feedback_feedback">意見反餽</string>
     <string name="activity_feedback_success_title">提交成功</string>
-    <string name="activity_feedback_success_tips">感謝您的反饋!</string>
+    <string name="activity_feedback_success_tips">感謝您的反饋，我們將盡快進行處理！</string>
     <string name="activity_feedback_success_sub">確定</string>
     <string name="activity_feedback_edit_feedback_top">意見反饋</string>
     <string name="activity_feedback_edit_feedback_title">問題描述</string>

main/src/main/res/values/strings.xml

@@ -23,7 +23,7 @@
     <string name="activity_feedback_customer_service">Intelligent\nCustomer Service</string>
     <string name="activity_feedback_feedback">Feedback</string>
     <string name="activity_feedback_success_title">Submitted\nSuccessfully</string>
-    <string name="activity_feedback_success_tips">Thank You For Your Feedback!</string>
+    <string name="activity_feedback_success_tips">Thank you for your feedback, we will process it as soon as possible!</string>
     <string name="activity_feedback_success_sub">Confirm</string>
     <string name="activity_feedback_edit_feedback_top">Feedback</string>
     <string name="activity_feedback_edit_feedback_title">Problem Description</string>