Android 更新SDK 8.6.10097

LiteAVSDK · Apr 30, 2021 · 115499b · 115499b
1 parent eef61b7
commit 115499b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/Android/Demo/beautysettingkit/src/main/assets/default_beauty_data.json b/Android/Demo/beautysettingkit/src/main/assets/default_beauty_data.json
@@ -9,7 +9,7 @@
     {
       "tab_id": 1,
       "tab_type": 10001,
-      "tab_name": "美颜",
+      "tab_name": "@beauty_setting_panel_beauty",
       "tab_item_name_size": 10,
       "tab_item_name_color_normal": "#ff888888",
       "tab_item_name_color_select": "#ffffffff",
@@ -244,7 +244,7 @@
     {
       "tab_id": 2,
       "tab_type": 10002,
-      "tab_name": "滤镜",
+      "tab_name": "@beauty_setting_panel_filter",
       "tab_item_name_size": 10,
       "tab_item_name_color_normal": "#ff888888",
       "tab_item_name_color_select": "#ffffffff",
@@ -442,7 +442,7 @@
     {
       "tab_id": 3,
       "tab_type": 10003,
-      "tab_name": "动效",
+      "tab_name": "@beauty_setting_panel_dynamic_effect",
       "tab_item_name_size": 10,
       "tab_item_name_color_normal": "#ff888888",
       "tab_item_name_color_select": "#ffffffff",
@@ -478,7 +478,7 @@
     {
       "tab_id": 4,
       "tab_type": 10004,
-      "tab_name": "美妆",
+      "tab_name": "@beauty_setting_panel_facebeauty",
       "tab_item_name_size": 10,
       "tab_item_name_color_normal": "#ff888888",
       "tab_item_name_color_select": "#ffffffff",
@@ -514,7 +514,7 @@
     {
       "tab_id": 5,
       "tab_type": 10005,
-      "tab_name": "手势",
+      "tab_name": "@beauty_setting_panel_gesture",
       "tab_item_name_size": 10,
       "tab_item_name_color_normal": "#ff888888",
       "tab_item_name_color_select": "#ffffffff",
@@ -550,7 +550,7 @@
     {
       "tab_id": 6,
       "tab_type": 10006,
-      "tab_name": "抠背",
+      "tab_name": "@beauty_cutout_background_ai",
       "tab_item_name_size": 10,
       "tab_item_name_color_normal": "#ff888888",
       "tab_item_name_color_select": "#ffffffff",
@@ -586,7 +586,7 @@
     {
       "tab_id": 7,
       "tab_type": 10007,
-      "tab_name": "绿幕",
+      "tab_name": "@beauty_setting_panel_green_screen",
       "tab_item_name_size": 10,
       "tab_item_name_color_normal": "#ff888888",
       "tab_item_name_color_select": "#ffffffff",

diff --git a/Android/Demo/beautysettingkit/src/main/res/values-en/strings.xml b/Android/Demo/beautysettingkit/src/main/res/values-en/strings.xml
@@ -45,6 +45,8 @@
     <string name="beauty_panel_faceshape">Face-shape</string>
 
     <string name="beauty_panel_filter_standard">Standard</string>
+    <string name="beauty_panel_filter_ziran">Natural</string>
+    <string name="beauty_panel_filter_baixi">Blond</string>
     <string name="beauty_panel_filter_cheery">Cheery</string>
     <string name="beauty_panel_filter_cloud">Cloud</string>
     <string name="beauty_panel_filter_pure">Pure</string>

diff --git a/.../Demo/ugckit/src/main/java/com/tencent/qcloud/ugckit/module/upload/impl/TVCConstants.java b/.../Demo/ugckit/src/main/java/com/tencent/qcloud/ugckit/module/upload/impl/TVCConstants.java
@@ -4,7 +4,7 @@
  * 视频上传常量定义
  */
 public class TVCConstants {
-    public static final String TVCVERSION = "8.5.10026";
+    public static final String TVCVERSION = "8.6.10097";
     public static String VOD_SERVER_HOST = "vod2.qcloud.com";
     public static String VOD_SERVER_HOST_BAK = "vod2.dnsv1.com";
 

diff --git a/...kit/src/main/java/com/tencent/qcloud/ugckit/module/upload/impl/TXUGCPublishOptCenter.java b/...kit/src/main/java/com/tencent/qcloud/ugckit/module/upload/impl/TXUGCPublishOptCenter.java
@@ -199,16 +199,21 @@ public void onFailure(Call call, IOException e) {
 
                 @Override
                 public void onResponse(Call call, Response response) throws IOException {
-                    if (response.isSuccessful()) {
-                        long endTS = System.currentTimeMillis();
-                        long timeCost = endTS - beginTS;
-                        if (minCosRespTime == 0 || timeCost < minCosRespTime) {
-                            minCosRespTime = timeCost;
-                            bestCosInfo.region = region;
-                            bestCosInfo.domain = domain;
-                        }
-                    } else {
-                        Log.i(TAG, "detect cos domain " + domain + " failed , httpcode" + response.code());
+                    // 服务器有返回认为是检测成功，不需要判断isSuccessful，因为私有域会返回403，检测也是正常的
+                    long endTS = System.currentTimeMillis();
+                    long timeCost = endTS - beginTS;
+
+                    Log.i(TAG, "detectBsetCosIP domain = " + domain + ", region = " + region + ", timeCos = " + timeCost +
+                            ", response.code = " + response.code());
+
+                    if (minCosRespTime == 0 || timeCost < minCosRespTime) {
+                        minCosRespTime = timeCost;
+                        bestCosInfo.region = region;
+                        bestCosInfo.domain = domain;
+
+                        Log.i(TAG, "detectBsetCosIP bestCosDomain = " + bestCosInfo.domain
+                                        + ", bestCosRegion = " + bestCosInfo.region
+                                        + ", timeCos = "  + minCosRespTime);
                     }
                 }
             });