Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊

# Conflicts:
#	OneToOne/src/main/res/values/strings.xml

OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java

@@ -18,8 +18,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.shayu.onetoone.bean.UserItemBean;
-
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -38,6 +36,7 @@ import com.shayu.onetoone.activity.setting.SettingActivity;
 import com.shayu.onetoone.adapter.MainMeAdapter;
 import com.shayu.onetoone.bean.PeopleNum;
 import com.shayu.onetoone.bean.SlideBean;
+import com.shayu.onetoone.bean.UserItemBean;
 import com.shayu.onetoone.manager.OTONetManager;
 import com.shayu.onetoone.manager.RouteManager;
 import com.shayu.onetoone.utils.MainHttpConsts;
@@ -59,6 +58,7 @@ import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.SVGAViewUtils;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
 import java.net.MalformedURLException;
@@ -367,13 +367,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
         }
         String singnature = u.getSignature();
         if (TextUtils.equals(singnature, "這個人很懶，什麼也沒留下") || TextUtils.equals(singnature, "这家伙很懒，什么都没留下") || TextUtils.isEmpty(singnature)) {
-            String ct = Locale.getDefault().getCountry();
-            ct = TextUtils.equals("CN", ct) ? "HK" : ct;
-            if (TextUtils.equals(ct, "CN")) {
-                singnature = "這個人很懶，什麼也沒留下";
-            } else {
-                singnature = "The guy was lazy and didn't write anything.";
-            }
+            singnature = WordUtil.isNewZh() ? "這個人很懶，什麼也沒留下" : "The guy was lazy and didn't write anything.";
         }
         signature.setText(getResources().getString(R.string.user_sign) + ":" + singnature);
         CommonAppConfig appConfig = CommonAppConfig.getInstance();

OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java

@@ -3,6 +3,7 @@ package com.shayu.onetoone.activity.login;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -25,6 +26,7 @@ import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.HttpCallbackModel;
 import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.utils.ToastUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -172,6 +174,10 @@ public class ChooseLabelActivity extends AbsOTOActivity {
                 labels.append("," + myLabelList.get(i).getId());
             }
         }
+        if (TextUtils.isEmpty(labels)){
+            ToastUtil.show("請設置標籤");
+            return;
+        }
         OTONetManager.getInstance(mContext).setLabels(labels.toString(), new HttpCallback<HttpCallbackModel>() {
             @Override
             public void onSuccess(HttpCallbackModel data) {

OneToOne/src/main/res/layout/dialog_end_call.xml

@@ -8,13 +8,14 @@
 
     <ImageView
         android:id="@+id/bg"
-        android:scaleType="fitXY"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:scaleType="fitXY"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
     <ImageView
         android:id="@+id/close"
         android:layout_width="wrap_content"
@@ -24,6 +25,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@mipmap/ic_call_close" />
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -35,6 +37,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="18dp"
+            android:text="@string/end_of_the_call"
+            android:textColor="#333333"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="80dp"
@@ -62,12 +74,12 @@
                 android:ellipsize="end"
                 android:maxEms="6"
                 android:singleLine="true"
-                tools:text="小柒"
                 android:textColor="#333333"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="@+id/avatar"
                 app:layout_constraintStart_toEndOf="@+id/avatar"
-                app:layout_constraintTop_toTopOf="@+id/avatar" />
+                app:layout_constraintTop_toTopOf="@+id/avatar"
+                tools:text="小柒" />
 
             <Button
                 android:id="@+id/follow"
@@ -88,12 +100,12 @@
                 android:layout_width="125dp"
                 android:layout_height="26dp"
                 android:background="@drawable/bg_dialog_end_call_timer"
-                tools:text="通话时长:01:06"
                 android:textColor="#4A4A4A"
                 android:textSize="14dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                tools:text="通话时长:01:06" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
 

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

@@ -271,5 +271,7 @@
 
     <string name="dialog_call_prop_apply">收下獎勵</string>
     <string name="toast_call_not_unlock">發送任意禮物后即可解鎖</string>
+    <string name="gift_not_money">余额不足，请充值后再进行尝试吧~</string>
+    <string name="end_of_the_call">通话结束</string>
     <string name="gift_not_money">餘額不足，請充值后再進行嘗試吧~</string>
 </resources>