调试

修复[官方通知-“點擊查看”-英文翻譯]

IAP6Helper/src/main/res/values-de/strings.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-/*
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-** Created with STMS Automation System
-*/ -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- MIDS_SAPPS_POP_UNKNOWN_ERROR_OCCURRED -->
-    <string name="mids_sapps_pop_unknown_error_occurred">Unbekannter Fehler aufgetreten</string>
-    <!-- MIDS_SAPPS_HEADER_SAMSUNG_IN_APP_PURCHASE_ABB -->
-    <string name="mids_sapps_header_samsung_in_app_purchase_abb">Samsung In-App Purchase</string>
-    <!-- MIDS_SAPPS_POP_UNABLE_TO_OPEN_SAMSUNG_IN_APP_PURCHASE_MSG -->
-    <string name="mids_sapps_pop_unable_to_open_samsung_in_app_purchase_msg">Samsung In-App Purchase kann nicht geöffnet werden. Wechseln Sie zu „Berechtigungen“, erteilen Sie die erforderlichen Berechtigungen und versuchen Sie es anschließend erneut.</string>
-    <!-- DREAM_SAPPS_BODY_AUTHENTICATING_ING -->
-    <string name="dream_sapps_body_authenticating_ing">Authentifizierung wird durchgeführt\u2026</string>
-    <!-- DREAM_SAPPS_BODY_CONTACT_CUSTOMER_SERVICE_TO_COMPLETE_YOUR_PURCHASE -->
-    <string name="dream_sapps_body_contact_customer_service_to_complete_your_purchase">Wenden Sie sich an den Kundendienst, um Ihren Einkauf abzuschließen.</string>
-    <!-- DREAM_SAPPS_BODY_YOUR_PURCHASE_IS_COMPLETE -->
-    <string name="dream_sapps_body_your_purchase_is_complete">Ihr Kauf ist abgeschlossen.</string>
-    <!-- DREAM_PH_PHEADER_COULDNT_COMPLETE_PURCHASE -->
-    <string name="dream_ph_pheader_couldnt_complete_purchase">Abschließen des Kaufs nicht möglich</string>
-    <!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_UPDATE_THE_GALAXY_STORE -->
-    <string name="dream_ph_body_to_complete_this_purchase_you_need_to_update_the_galaxy_store">Sie müssen Galaxy Store aktualisieren, um diesen Kauf abzuschließen.</string>
-    <!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_ENABLE_THE_GALAXY_STORE_IN_SETTINGS -->
-    <string name="dream_ph_body_to_complete_this_purchase_you_need_to_enable_the_galaxy_store_in_settings">Sie müssen Galaxy Store in den Einstellungen aktivieren, um diesen Kauf abzuschließen.</string>
-    <!-- DREAM_PH_BODY_CONTACT_P1SSCUSTOMER_SERVICEP2SS_FOR_MORE_INFORMATION_N_NERROR_CODE_C_P3SS -->
-    <string name="dream_ph_body_contact_p1sscustomer_servicep2ss_for_more_information_n_nerror_code_c_p3ss">Weitere Informationen erhalten Sie vom %1$sKundendienst%2$s.\n\nFehlercode: %3$s</string>
-    <!-- IDS_COM_BODY_ERROR_CODE_C -->
-    <string name="ids_com_body_error_code_c">Fehlercode:</string>
-    <!-- MIDS_SAPPS_POP_TO_PURCHASE_ITEMS_YOU_NEED_TO_INSTALL_SAMSUNG_IN_APP_PURCHASE_INSTALL_Q -->
-    <string name="mids_sapps_pop_to_purchase_items_you_need_to_install_samsung_in_app_purchase_install_q">Wenn Sie Artikel kaufen möchten, müssen Sie Samsung In-App-Kauf installieren. Installieren?</string>
-    <!-- MIDS_SAPPS_POP_AN_INVALID_VALUE_HAS_BEEN_PROVIDED_FOR_SAMSUNG_IN_APP_PURCHASE -->
-    <string name="mids_sapps_pop_an_invalid_value_has_been_provided_for_samsung_in_app_purchase">Es wurde ein ungültiger Wert für Samsung In-App Purchase angegeben.</string>
-    <!-- MIDS_SAPPS_BODY_WAITING_ING -->
-    <string name="mids_sapps_body_waiting_ing">Warten\u2026</string>
-    <!-- MIDS_SAPPS_POP_PAYMENT_CANCELLED -->
-    <string name="mids_sapps_pop_payment_canceled">Zahlung abgebrochen</string>
-    <!-- MIDS_SAPPS_HEADER_UPDATE_GALAXY_APPS -->
-    <string name="mids_sapps_header_update_galaxy_apps">Aktualisieren von Galaxy Apps</string>
-    <!-- MIDS_SAPPS_POP_A_NEW_VERSION_IS_AVAILABLE_GALAXY_APPS_WILL_BE_UPDATED_TO_THE_LATEST_VERSION_TO_COMPLETE_THIS_PURCHASE -->
-    <string name="mids_sapps_pop_a_new_version_is_available_galaxy_apps_will_be_updated_to_the_latest_version_to_complete_this_purchase">Eine neue Version ist verfügbar. Galaxy Apps wird auf die neueste Version aktualisiert, um diesen Kauf abzuschließen.</string>
-</resources>

IAP6Helper/src/main/res/values-mk-rMK/strings.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-/*
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-** Created with STMS Automation System
-*/ -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- MIDS_SAPPS_POP_UNKNOWN_ERROR_OCCURRED -->
-    <string name="mids_sapps_pop_unknown_error_occurred">Дојде до непозната грешка.</string>
-    <!-- MIDS_SAPPS_HEADER_SAMSUNG_IN_APP_PURCHASE_ABB -->
-    <string name="mids_sapps_header_samsung_in_app_purchase_abb">Samsung In-App Purchase</string>
-    <!-- MIDS_SAPPS_POP_UNABLE_TO_OPEN_SAMSUNG_IN_APP_PURCHASE_MSG -->
-    <string name="mids_sapps_pop_unable_to_open_samsung_in_app_purchase_msg">Не може да се отвори Samsung In-App Purchase. Одете во Дозволи, а потоа овозможете ги бараните дозволи и обидете се повторно.</string>
-    <!-- DREAM_SAPPS_BODY_AUTHENTICATING_ING -->
-    <string name="dream_sapps_body_authenticating_ing">Се потврдува\u2026</string>
-    <!-- DREAM_SAPPS_BODY_CONTACT_CUSTOMER_SERVICE_TO_COMPLETE_YOUR_PURCHASE -->
-    <string name="dream_sapps_body_contact_customer_service_to_complete_your_purchase">Контактирајте со Службата за корисници за да го завршите Вашето купување.</string>
-    <!-- DREAM_SAPPS_BODY_YOUR_PURCHASE_IS_COMPLETE -->
-    <string name="dream_sapps_body_your_purchase_is_complete">Купувањето Ви е завршено.</string>
-    <!-- DREAM_PH_PHEADER_COULDNT_COMPLETE_PURCHASE -->
-    <string name="dream_ph_pheader_couldnt_complete_purchase">Не може да се заврши купувањето</string>
-    <!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_UPDATE_THE_GALAXY_STORE -->
-    <string name="dream_ph_body_to_complete_this_purchase_you_need_to_update_the_galaxy_store">За да го завршите ова купување, треба да го ажурирате Galaxy Store.</string>
-    <!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_ENABLE_THE_GALAXY_STORE_IN_SETTINGS -->
-    <string name="dream_ph_body_to_complete_this_purchase_you_need_to_enable_the_galaxy_store_in_settings">За да го завршите ова купување, треба да го овозможите Galaxy Store во Поставувања.</string>
-    <!-- DREAM_PH_BODY_CONTACT_P1SSCUSTOMER_SERVICEP2SS_FOR_MORE_INFORMATION_N_NERROR_CODE_C_P3SS -->
-    <string name="dream_ph_body_contact_p1sscustomer_servicep2ss_for_more_information_n_nerror_code_c_p3ss">Контактирајте со %1$sУслугите за корисниците%2$s за повеќе информации.\n\nШифра на грешка: %3$s</string>
-    <!-- IDS_COM_BODY_ERROR_CODE_C -->
-    <string name="ids_com_body_error_code_c">Шифра на грешка:</string>
-    <!-- MIDS_SAPPS_POP_TO_PURCHASE_ITEMS_YOU_NEED_TO_INSTALL_SAMSUNG_IN_APP_PURCHASE_INSTALL_Q -->
-    <string name="mids_sapps_pop_to_purchase_items_you_need_to_install_samsung_in_app_purchase_install_q">За да купувате ставки, треба да го инсталирате Samsung купување во апликација. Да се инсталира?</string>
-    <!-- MIDS_SAPPS_POP_AN_INVALID_VALUE_HAS_BEEN_PROVIDED_FOR_SAMSUNG_IN_APP_PURCHASE -->
-    <string name="mids_sapps_pop_an_invalid_value_has_been_provided_for_samsung_in_app_purchase">Дадена е неважечка вредност за Samsung In-App Purchase.</string>
-    <!-- MIDS_SAPPS_BODY_WAITING_ING -->
-    <string name="mids_sapps_body_waiting_ing">Се чека\u2026</string>
-    <!-- MIDS_SAPPS_POP_PAYMENT_CANCELLED -->
-    <string name="mids_sapps_pop_payment_canceled">Плаќањето е одложено.</string>
-    <!-- MIDS_SAPPS_HEADER_UPDATE_GALAXY_APPS -->
-    <string name="mids_sapps_header_update_galaxy_apps">Ажурирање на Galaxy Apps</string>
-    <!-- MIDS_SAPPS_POP_A_NEW_VERSION_IS_AVAILABLE_GALAXY_APPS_WILL_BE_UPDATED_TO_THE_LATEST_VERSION_TO_COMPLETE_THIS_PURCHASE -->
-    <string name="mids_sapps_pop_a_new_version_is_available_galaxy_apps_will_be_updated_to_the_latest_version_to_complete_this_purchase">Достапна е нова верзија. Galaxy Apps ќе се ажурира на најновата верзија за да го завршите купувањево.</string>
-</resources>

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

@@ -4,6 +4,7 @@
     <string name="com.twitter.sdk.android.CONSUMER_SECRET">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
 
     <string name="dialog_share_title">分享</string>
+    <string name="dialog_share_app_internal">站內好友</string>
     <string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
     <string name="dialog_share_app_facebook">Facebook</string>
     <string name="dialog_share_app_line">Line</string>

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

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+        <string name="dialog_share_title">Share</string>
+        <string name="dialog_share_info">Come and watch %s live on PDLIVE and meet more interesting people!</string>
+        <string name="dialog_invite_title">Invite Friends</string>
+        <string name="dialog_invite_info">Come to PDLIVE to discover more and better live streams.</string>
+        <string name="dialog_share_copy">Copy</string>
+        <string name="dialog_share_app_internal">Site friends</string>
+        <string name="dialog_share_internal_title">Share To</string>
+        <string name="dialog_share_internal_cancel">cancel</string>
+        <string name="dialog_share_internal_search">Search nickname</string>
+        <string name="dialog_share_internal_list_btn">Send</string>
+        <string name="dialog_share_success">Share success</string>
+        <string name="dialog_share_success_btn">Go chat</string>
+        <string name="dialog_share_failure_not_select">Please select friends</string>
 
-    <string name="dialog_share_title">分享</string>
+        <string name="dialog_share_app_facebook" >Facebook</string>
-    <string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
+        <string name="dialog_share_app_line" >Line</string>
-    <string name="dialog_share_app_facebook" translatable="false">Facebook</string>
+        <string name="dialog_share_app_twitter">Twitter</string>
-    <string name="dialog_share_app_line" translatable="false">Line</string>
+        <string name="dialog_share_app_whatsapp" >WhatsApp</string>
-    <string name="dialog_share_app_twitter" translatable="false">Twitter</string>
+        <string name="dialog_share_app_messenger">Messenger</string>
-    <string name="dialog_share_app_whatsapp" translatable="false">WhatsApp</string>
+        <string name="dialog_share_app_instagram" >Instagram</string>
-    <string name="dialog_share_app_messenger" translatable="false">Messenger</string>
-    <string name="dialog_share_app_instagram" translatable="false">Instagram</string>
-    <string name="dialog_share_app_internal">站內好友</string>
-
-    <string name="dialog_invite_title">邀請好友</string>
-    <string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
-    <string name="dialog_share_copy">複製</string>
-    <string name="dialog_share_internal_title">分享至</string>
-    <string name="dialog_share_internal_search">搜索昵稱</string>
-    <string name="dialog_share_internal_list_btn">發送</string>
-    <string name="dialog_share_success">分享成功</string>
-    <string name="dialog_share_success_btn">去聊聊</string>
-    <string name="dialog_share_failure_not_select">请选择好友</string>
 
 </resources>

app/proguard-rules.pro

@@ -319,3 +319,17 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.qiniu.**{*;}
 -keep class com.qiniu.**{public <init>();}
 -ignorewarnings
+
+#Adjust SDK
+-keep class com.adjust.sdk.** { *; }
+-keep class com.google.android.gms.common.ConnectionResult {
+   int SUCCESS;
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
+   com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context);
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {
+   java.lang.String getId();
+   boolean isLimitAdTrackingEnabled();
+}
+-keep public class com.android.installreferrer.** { *; }

app/src/main/AndroidManifest.xml

@@ -94,6 +94,9 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
 
+    <!--appsflyer新增-->
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
+
     <queries>
         <package android:name="com.twitter.android" />
         <package android:name="jp.naver.line.android" />

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -21,6 +21,9 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.adjust.sdk.Adjust;
+import com.adjust.sdk.AdjustConfig;
+import com.adjust.sdk.LogLevel;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -121,6 +124,8 @@ public class AppContext extends CommonAppContext {
     private static final class AdjustLifecycleCallbacks implements ActivityLifecycleCallbacks {
         @Override
         public void onActivityResumed(@NonNull Activity activity) {
+            Adjust.onResume();
+
             Log.e("打招呼定时器", "onActivityResumed: " + activity);
             MessageChatNotifyManager.getInstance().restart(activity);
             if (activity instanceof LiveActivity) {
@@ -172,6 +177,7 @@ public class AppContext extends CommonAppContext {
 
         @Override
         public void onActivityPaused(@NonNull Activity activity) {
+            Adjust.onPause();
         }
 
         @Override
@@ -443,6 +449,12 @@ public class AppContext extends CommonAppContext {
         configSPApp();
         //初始化美颜SDK
         // FaceManager.initFaceUnity(this);
+        //初始化Adjust
+        String appToken = "d6m0zj5a3k00";
+        String environment = AdjustConfig.ENVIRONMENT_SANDBOX;
+        AdjustConfig config = new AdjustConfig(this, appToken, environment);
+        config.setLogLevel(LogLevel.VERBOSE);
+        Adjust.onCreate(config);
     }
 
     /**

common/build.gradle

@@ -264,4 +264,15 @@ dependencies {
 
     //下标切换器  https://github.com/angcyo/DslTabLayout
     api project(':TabLayout')
+
+    //Adjust SDK
+    api 'com.adjust.sdk:adjust-android:4.38.5'
+    api 'com.android.installreferrer:installreferrer:2.2'
+    // Add the following if you're using the Adjust SDK inside web views on your app
+    api 'com.adjust.sdk:adjust-android-webbridge:4.38.5'
+    api 'com.google.android.gms:play-services-appset:16.0.2'
+
+    //appsflyer SDK
+    api 'com.appsflyer:af-android-sdk:6.12.1'
+    implementation "com.android.installreferrer:installreferrer:2.2"
 }

common/proguard-rules.pro

@@ -29,3 +29,21 @@
 -keep class com.qiniu.**{*;}
 -keep class com.qiniu.**{public <init>();}
 -ignorewarnings
+
+#adjust.sdk
+-keep class com.adjust.sdk.** { *; }
+-keep class com.google.android.gms.common.ConnectionResult {
+   int SUCCESS;
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
+   com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context);
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {
+   java.lang.String getId();
+   boolean isLimitAdTrackingEnabled();
+}
+-keep public class com.android.installreferrer.** { *; }
+#appsflyer
+-keep class com.appsflyer.** { *; }
+-keep class kotlin.jvm.internal.** { *; }
+-keep public class com.android.installreferrer.** { *; }

common/src/main/java/com/yunbao/common/adapter/MainConversationListAdapter.java

@@ -19,6 +19,7 @@ import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.message.content.MessageChatCardContent;
 import com.yunbao.common.utils.AppManager;
+import com.yunbao.common.utils.ChatMsgTypeUtils;
 import com.yunbao.common.utils.DateFormatUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ViewUtils;
@@ -39,8 +40,11 @@ import io.rong.imkit.widget.adapter.ViewHolder;
 import io.rong.imlib.RongIMClient;
 import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.Message;
+import io.rong.message.HQVoiceMessage;
+import io.rong.message.ImageMessage;
 import io.rong.message.SightMessage;
 import io.rong.message.TextMessage;
+import io.rong.message.VoiceMessage;
 
 public class MainConversationListAdapter extends ConversationListAdapter {
     public static final int TYPE_SEARCH_TITLE = 500;
@@ -134,6 +138,7 @@ public class MainConversationListAdapter extends ConversationListAdapter {
         Log.i("列表", "bindDefault: 用户名字:" + conversation.mCore.getConversationTitle());
         ImgLoader.display(holder.getContext(), conversation.mCore.getPortraitUrl(), holder.getView(R.id.rc_conversation_portrait));
         holder.setText(R.id.rc_conversation_title, conversation.mCore.getConversationTitle());
+        ((TextView) holder.getView(R.id.rc_conversation_content)).setText(ChatMsgTypeUtils.getMsg(conversation.mConversationContent.toString()));
         if (conversation.mCore.getSentTime() != -1 && holder.getView(R.id.rc_conversation_date) != null) {
             holder.setText(R.id.rc_conversation_date, DateFormatUtil.getDateTimeString(conversation.mCore.getSentTime(), true, holder.getContext()));
             holder.getView(R.id.rc_conversation_date).setVisibility(View.VISIBLE);
@@ -337,10 +342,15 @@ public class MainConversationListAdapter extends ConversationListAdapter {
                 conversation.mCore.setUnreadMessageCount(integer);
                 if(bean.getContent() instanceof SightMessage){
                     conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[小視頻]":"[Video]");
+                }else if(bean.getContent() instanceof HQVoiceMessage){
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[語音]":"[Voice]");
+                } else if(bean.getContent() instanceof ImageMessage){
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[圖片]":"[picture]");
+                }else if(bean.getContent() instanceof MessageChatCardContent){
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[站內分享]":"[In-app sharing]");
                 } else{
                     conversation.mConversationContent = new SpannableString(((TextMessage) bean.getContent()).getContent());
                 }
-
                 mDataList.set(id, conversation);
                 notifyItemChanged(id);
             }

common/src/main/java/com/yunbao/common/bean/LiveTaskModel.java

@@ -87,7 +87,7 @@ public class LiveTaskModel extends BaseModel {
 
         public String getEndTime() {
             if (!StringUtil.isEmpty(endTime)) {
-                endTime =WordUtil.getString(R.string.live_task_new_user_timer) + new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
+                endTime = new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.getDefault()).format(new Date(Long.parseLong(endTime) * 1000));
             }
             return endTime;
         }

common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java

@@ -277,7 +277,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
 
     void initData() {
         adapter.setList_type(list_type);
-        if (isAnchor) {
+        if (isAnchor || (isTab2Enter && isStar)) {
             if (isStar) {
                 gift_hall_type = 2;
             } else {

common/src/main/java/com/yunbao/common/dialog/MessageChatNotifyDialog.java

@@ -14,6 +14,7 @@ import com.yunbao.common.R;
 import com.yunbao.common.bean.MessageUserInfoBean;
 import com.yunbao.common.custom.RatioRoundImageView;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.ChatMsgTypeUtils;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.StringUtil;
 
@@ -93,7 +94,7 @@ public class MessageChatNotifyDialog extends AbsDialogPositionPopupWindow {
         if (StringUtil.isEmpty(liveBean.getExtras())) {
             ((TextView) findViewById(R.id.description)).setText(liveBean.getUser().getSignature());
         } else {
-            ((TextView) findViewById(R.id.description)).setText(liveBean.getExtras());
+            ((TextView) findViewById(R.id.description)).setText(ChatMsgTypeUtils.getMsg(liveBean.getExtras()));
         }
         new Handler(Looper.getMainLooper()).postDelayed(() -> {
             dismiss();

common/src/main/java/com/yunbao/common/fragment/AbsMainMessageChatListFragment.java

@@ -2,6 +2,7 @@ package com.yunbao.common.fragment;
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.SpannableString;
 import android.util.Log;
 import android.view.View;
 
@@ -23,6 +24,7 @@ import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
 import com.yunbao.common.adapter.MainConversationListAdapter;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.InstructorRemarkManager;
+import com.yunbao.common.utils.ChatMsgTypeUtils;
 import com.yunbao.common.utils.StringUtil;
 
 import org.greenrobot.eventbus.EventBus;
@@ -158,7 +160,7 @@ public abstract class AbsMainMessageChatListFragment extends Fragment {
                                 break;
                             }
                         }
-
+                        srcList.get(i).mConversationContent =new SpannableString(ChatMsgTypeUtils.getMsg(srcList.get(i).mConversationContent.toString()));
                     }
                     onRefreshListener.onFinish(srcList);
                     isNet = false;

common/src/main/java/com/yunbao/common/fragment/MainMessageChatListFragment.java

@@ -3,6 +3,7 @@ package com.yunbao.common.fragment;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.SpannableString;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -23,6 +24,7 @@ import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.InstructorRemarkManager;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.ChatMsgTypeUtils;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.StringUtil;
 
@@ -39,6 +41,7 @@ import io.rong.imkit.widget.refresh.listener.OnRefreshListener;
 import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.Message;
 import io.rong.imlib.model.UserInfo;
+import io.rong.message.VoiceMessage;
 
 public class MainMessageChatListFragment extends AbsMainMessageChatListFragment {
     private static final String TAG = "MainMessageChatListFragment";
@@ -72,6 +75,9 @@ public class MainMessageChatListFragment extends AbsMainMessageChatListFragment
             @Override
             public void onFinish(List<BaseUiConversation> baseUiConversations) {
                 InstructorRemarkManager.get(mContext).getNetInstructorRemark();
+                for (int i = 0; i <baseUiConversations.size(); i++) {
+                    baseUiConversations.get(i).mCore.getMessage();
+                }
                 loadLiveLookTime(baseUiConversations, new OnRecyclerListRefreshListener<Map<String, Integer>>() {
                     @Override
                     public void onFinish(Map<String, Integer> stringIntegerMap) {

common/src/main/java/com/yunbao/common/utils/ChatMsgTypeUtils.java

@@ -0,0 +1,22 @@
+package com.yunbao.common.utils;
+
+/**
+ * 消息类型翻译管理器
+ */
+public class ChatMsgTypeUtils {
+    public static String getMsg(String msg) {
+        String rsult = msg;
+        switch (msg) {
+            case "[小视频]":
+                rsult = WordUtil.isNewZh() ? "[小視頻]" : "[Video]";
+                break;
+            case "[语音]":
+                rsult = WordUtil.isNewZh() ? "[語音]" : "[Voice]";
+                break;
+            case "[图片]":
+                rsult = WordUtil.isNewZh() ? "[圖片]" : "[Image]";
+                break;
+        }
+        return rsult;
+    }
+}

common/src/main/res/layout/item_comment_view.xml

@@ -11,7 +11,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:orientation="horizontal">
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <com.makeramen.roundedimageview.RoundedImageView
                 android:id="@+id/avatar"
@@ -21,33 +25,16 @@
                 android:src="@mipmap/icon_data_empty"
                 app:riv_oval="true" />
 
-        <LinearLayout
+            <TextView
+                android:id="@+id/name"
+                android:layout_weight="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-            android:layout_marginTop="7dp"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:text="栗子栗子🌰zzz"
                 android:textColor="#777777"
                 android:textSize="12dp" />
 
-            <TextView
-                android:id="@+id/content"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:text="栗子栗子🌰zzz"
-                android:textColor="#333333"
-                android:textSize="12dp" />
-
-        </LinearLayout>
-
             <TextView
                 android:id="@+id/author"
                 android:layout_width="45dp"
@@ -62,11 +49,6 @@
                 android:textSize="10dp"
                 android:visibility="gone" />
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-
             <TextView
                 android:id="@+id/del"
                 android:layout_width="wrap_content"
@@ -99,6 +81,19 @@
 
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="15dp"
+            android:layout_marginStart="40dp"
+            android:layout_marginTop="5dp"
+            android:text="栗子栗子🌰栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子zzz"
+            android:textColor="#333333"
+            android:textSize="12dp" />
+    </LinearLayout>
+
+
     <LinearLayout
         android:id="@+id/replyLayout"
         android:layout_width="match_parent"

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

@@ -812,6 +812,7 @@ Limited ride And limited avatar frame</string>
 
     <string name="random_pk_dialog_apply">accept</string>
     <string name="random_pk_dialog_refuse">refuse</string>
+    <string name="random_pk_dialog_refuse_again">Persist in refusing</string>
     <string name="random_pk_dialog_title">Random PK hint</string>
 
     <string name="speech_robot_setup">Automatic speech robot setup</string>
@@ -1279,41 +1280,41 @@ Limited ride And limited avatar frame</string>
     <string name="dialog_message_chat_notify_btn">Reply</string>
     <string name="activity_msg_chat_top_status_online">Online</string>
     <string name="activity_msg_chat_top_status_offline">Offline</string>
-    <string name="commen_user_active">个人动态</string>
+    <string name="commen_user_active">Personal updates</string>
     <string name="real_person">Real person</string>
-    <string name="trade_union">工会</string>
+    <string name="trade_union">tradeUnion</string>
     <string name="praise">Liked</string>
-    <string name="cancel_back">取消黑名单</string>
+    <string name="cancel_back">Cancel blacklist</string>
-    <string name="user_home_img_del_dialog">確定刪除圖片？</string>
+    <string name="user_home_img_del_dialog">Are you sure you want to delete the picture?？</string>
-    <string name="upload_success">上传成功</string>
+    <string name="upload_success">Upload successful</string>
-    <string name="upload_failed">上傳成功</string>
+    <string name="upload_failed">upload failed</string>
-    <string name="_9">最多添加9張圖片</string>
+    <string name="_9">Add up to 9 pictures</string>
-    <string name="not_interested">不感興趣</string>
+    <string name="not_interested">not interested</string>
-    <string name="person_like">人覺得很讚</string>
+    <string name="person_like">people liked it</string>
-    <string name="fan_group_name">主播守護團</string>
+    <string name="fan_group_name">Fan group name</string>
-    <string name="user_home_anchor">主播粉絲團</string>
+    <string name="user_home_anchor">Anchor fan group</string>
-    <string name="main_active_type_01">美圖</string>
+    <string name="main_active_type_01">Beauty</string>
-    <string name="main_active_type_02">新秀</string>
+    <string name="main_active_type_02">Rookie</string>
-    <string name="main_active_type_03">身材</string>
+    <string name="main_active_type_03">Figure</string>
-    <string name="main_active_type_04">直播</string>
+    <string name="main_active_type_04">Live</string>
-    <string name="main_active_type_05">生活</string>
+    <string name="main_active_type_05">Life</string>
-    <string name="send_active_time">選擇時間</string>
+    <string name="send_active_time">Selection period</string>
-    <string name="now_send">立即發表</string>
+    <string name="now_send">Now</string>
-    <string name="choose_topic">選擇話題</string>
+    <string name="choose_topic">Select topic</string>
-    <string name="pricture">圖文</string>
+    <string name="pricture">picture</string>
-    <string name="_200">请输入200字以内的文字</string>
+    <string name="_200">Please enter text within 200 words</string>
-    <string name="focus_on">關注</string>
+    <string name="focus_on">Focus on</string>
-    <string name="see_more">查看更多</string>
+    <string name="see_more">See more</string>
-    <string name="close">收起</string>
+    <string name="close">close</string>
-    <string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string>
+    <string name="time_cannot_be_greater_than_the_current_time">Time cannot be greater than the current time</string>
-    <string name="msg_del_sure">是否確認刪除？</string>
+    <string name="msg_del_sure">Do you confirm deletion?</string>
-    <string name="not_blackmail">不能拉黑自己</string>
+    <string name="not_blackmail">Cannot blackmail oneself</string>
-    <string name="active_author">作者</string>
+    <string name="active_author">author</string>
-    <string name="active_count">共%1$s條回復></string>
+    <string name="active_count">altogether %1$s strip reply></string>
-    <string name="uploading">上傳中...</string>
+    <string name="uploading">Uploading...</string>
-    <string name="upload_fail">上傳失敗</string>
+    <string name="upload_fail">Upload failed</string>
-    <string name="please_input_content">請填寫發佈內容</string>
+    <string name="please_input_content">Please fill in the publication content</string>
-    <string name="comm_details">詳情</string>
+    <string name="comm_details">Details</string>
 
     <string name="guard_buy_type_1">【Star Guardian】</string>
 

config.gradle

@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 23,
             targetSdkVersion : 34,
-            versionCode      : 546,
+            versionCode      : 548,
             versionName      : "6.8.0",
             namespace        : "com.pandoralive.shayu"
     ]

live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java

@@ -289,23 +289,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
             }
         });
 
-        /*DebugDialog.getInstance(new DebugDialog.DebugDialogRunnable() {
+
-            @Override
-            public void run(DebugDialog dialog) {
-                dialog.setShowPattern(ShowPattern.ALL_TIME);
-                dialog.show();
-                dialog.setView("测试", new Button(mContext), new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        android.os.Message msg = android.os.Message.obtain();
-                        msg.what = Constants.SOCKET_WHAT_BROADCAST;
-                        String json = "{\"msg\":[{\"_method_\":\"StartEndLive\",\"action\":\"18\",\"ct\":\"直播关闭\",\"touid\":\"\",\"equipment\":\"app\",\"msgtype\":\"1\",\"uname\":\"1\",\"timestamp\":\"\",\"touname\":\"\",\"uid\":\"98274\",\"tougood\":\"\",\"ugood\":\"\",\"roomnum\":\"98274\",\"riskDescription\":\"色情:性行为:中度色情\",\"enRiskDescription\":\"Pornography: Sexual behavior: Moderate pornography\",\"riskhType\":\"封禁1分钟\",\"enRiskhType\":\"Banned for 1 minute\",\"date\":\"2024-07-30 15:03:11\"}],\"retcode\":\"000000\",\"retmsg\":\"OK\"}";
-                        msg.obj = json;
-                        SocketSwClient.mSocketHandler.sendMessage(msg);
-                    }
-                });
-            }
-        });*/
     }
 
     private void initFaceManager() {
@@ -894,9 +878,8 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
         getAiRobotStatus();
         MicedUserManager.get().removeAllMicUserList();
         MicUserManager.get().removeAllMicUserList();
-
-        if(mLiveRoomViewHolder!=null){
         //加载整蛊
+        if(mLiveRoomViewHolder!=null){
             mLiveRoomViewHolder.initPrankProgress(2);
             mLiveRoomViewHolder.sendMsgPrank();
 
@@ -1916,6 +1899,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
                 .setIcon("https://downs.yaoulive.com/xzs_tab.png")
                 .setNameColor("#f19ec2")
                 .setSystemBubble("https://downs.yaoulive.com/xzs_qipao.9.png")
+                .setIconEn("https://downs.yaoulive.com/Robot_en.png")
                 .setUserName("")
                 .setContent(content);
         SocketSendBean msg =
@@ -1990,6 +1974,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
 
 
     }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onAllServerNotifyFFGGGDJANEvent(AllServerNotifyFFGGGDJANEvent event) {
         if (mLiveRoomViewHolder != null) {

live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java

@@ -836,7 +836,11 @@ public class LiveGiftPopup extends AbsDialogFragment {
                         @Override
                         public void onSuccess(GiftNamingInfoModel data) {
                             if (TextUtils.equals(data.getNamingStatus(), "1")) {
+                                boolean isPageGift = liveGiftModel.isPageGift();
                                 liveGiftModel = JSONObject.parseObject(GsonUtils.toJson(data), LiveGiftBean.class);
+                                liveGiftModel.setPageGift(isPageGift);
+                                liveGiftModel.setGift_id(giftId);
+                                liveGiftModel.setId(giftId);
                                 if (!TextUtils.isEmpty(liveGiftModel.getNamingLiveuid()) &&
                                         !TextUtils.isEmpty(liveGiftModel.getNamingUid()) &&
                                         !TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") &&

live/src/main/java/com/yunbao/live/dialog/LiveTaskDialog.java

@@ -147,7 +147,7 @@ public class LiveTaskDialog extends AbsDialogPopupWindow {
         if (task.isNew()) {
             newStarImg.setVisibility(VISIBLE);
             newStarTime.setVisibility(VISIBLE);
-            newStarTime.setText(task.getEndTime());
+            newStarTime.setText(WordUtil.isNewZh()?"新秀主播時效截止至 ":"The statute of limitations for new anchors expires " +task.getEndTime());
         }
     }
 

live/src/main/java/com/yunbao/live/dialog/LiveUserAnchorMsgPopDialog.java

@@ -83,6 +83,7 @@ public class LiveUserAnchorMsgPopDialog extends AbsDialogFragment {
         mIndicator = (MagicIndicator) findViewById(R.id.indicator);
         viewPager = (ViewPager2) findViewById(R.id.viewPager);
         titleCount= (TextView) findViewById(R.id.titleCount);
+        titleCount.setText(getResources().getString(R.string.message_chat_msg_all_an_a)+"(0)");
         fragmentList = new ArrayList<>();
         fragmentList.add(new MainMessageChatListFragment(AppManager.getInstance().getLiveActivity()));
         viewPager.setAdapter(new FragmentStateAdapter((FragmentActivity) AppManager.getInstance().getLiveActivity()) {

live/src/main/res/layout/dialog_live_data.xml

@@ -36,9 +36,9 @@
                 android:textSize="16sp" />
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="0.1"
+                android:layout_weight="1"
                 android:gravity="end|center"
                 android:orientation="horizontal">
 
@@ -46,12 +46,15 @@
                     android:id="@+id/live_data_img"
                     android:layout_width="13dp"
                     android:layout_height="13dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginEnd="5dp"
                     tools:srcCompat="@mipmap/icon_free_pk_waring" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:textSize="14dp"
                     android:text="@string/live_data_msg2"
                     android:textColor="#595959" />
             </LinearLayout>

live/src/main/res/layout/dialog_live_task.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="600dp"
-
     android:background="#000002">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -24,11 +23,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:layout_marginEnd="14dp"
             android:textColor="#FFFFFF"
             android:textSize="12sp"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView

live/src/main/res/layout/item_sys_msg.xml

@@ -83,7 +83,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="點擊查看"
+                android:text="@string/click_to_view"
                 android:textColor="#ffaaaaaa"
                 android:textSize="12sp" />