Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支

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

@@ -5,7 +5,7 @@ import com.google.gson.annotations.SerializedName;
 public class MessageSayHiStartBean extends BaseModel{
     @SerializedName("time")
     private int nextTime;
-
+    private int status;
     public int getNextTime() {
         return nextTime;
     }
@@ -13,4 +13,20 @@ public class MessageSayHiStartBean extends BaseModel{
     public void setNextTime(int nextTime) {
         this.nextTime = nextTime;
     }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    @Override
+    public String toString() {
+        return "MessageSayHiStartBean{" +
+                "nextTime=" + nextTime +
+                ", status=" + status +
+                '}';
+    }
 }

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

@@ -97,11 +97,12 @@ public class MessageSayHiNotifyDialog extends AbsDialogCenterPopupWindow {
         anchorName = findViewById(R.id.anchorName);
         ImgLoader.display(mContext, userInfoBean.getUser().getAvatar(), avatar);
         anchorName.setText(userInfoBean.getUser().getUserNicename());
-        ((TextView) findViewById(R.id.description)).setText(userInfoBean.getUser().getSignature());
+       // ((TextView) findViewById(R.id.description)).setText(userInfoBean.getUser().getSignature());
+        ((TextView) findViewById(R.id.description)).setText(WordUtil.isNewZh()?"他就在你附近，來看看～":"He is near you, come and see~");
         ViewUtils.findViewById(findViewById(R.id.age), R.id.tag, TextView.class).setText(String.format("%s%s%s",
                 WordUtil.getNewString(R.string.dialog_message_say_hi_age)
                 , userInfoBean.getInfo().getAge()
-                ,WordUtil.isNewZh()?"歲":"Age"
+                ,WordUtil.isNewZh()?"歲":"years old"
                 )
         );
         showTag();

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

@@ -47,6 +47,10 @@ public class MessageSayHiNotifyManager {
                 .getMessageSayHiStartTimer(new HttpCallback<MessageSayHiStartBean>() {
                     @Override
                     public void onSuccess(MessageSayHiStartBean data) {
+                        if(data.getStatus()==0){
+                            Log.i(TAG, "onSuccess: 初始化定时器，定时器关:" + data.toString());
+                            return;
+                        }
                         timer = new Timer();
                         timer.schedule(createTask(), data.getNextTime() * 1000L);
                         hiBean = new MessageSayHiBean();

common/src/main/res/values-en-rUS/string.xml

@@ -25,7 +25,7 @@
     <string name="refresh_footer_nothing">No more data</string>
     <string name="black">Pull black</string>
     <string name="black_ing">Relieving blackout</string>
-    <string name="chat_remarks">Remarks</string>
+    <string name="chat_remarks">Modify remarks</string>
     <string name="chat_report">Report</string>
     <string name="bonus_sign">Sign in immediately</string>
     <string name="bonus_sign_1">Continuously signed in</string>
@@ -781,7 +781,8 @@
     <string name="black_add">Add to blacklist</string>
     <string name="black_error">Failed to join blacklist</string>
 
-    <string name="black_succer_more">Blacklist removed successfully</string>
+    <string name="black_succer_more">Succeeded in removing the blacklist</string>
+    <string name="black_more">Remove blacklist</string>
     <string name="black_error_more">Failed to remove blacklist</string>
 
     <string name="reply">Reply</string>

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

@@ -823,6 +823,7 @@
     <string name="black_add">加入黑名單</string>
     <string name="black_error">加入黑名单失败</string>
     <string name="black_succer_more">移除黑名单成功</string>
+    <string name="black_more">移除黑名單</string>
     <string name="black_error_more">移除黑名单失败</string>
 
     <string name="reply">回復</string>

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

@@ -823,6 +823,7 @@
     <string name="black_add">加入黑名單</string>
     <string name="black_error">加入黑名单失败</string>
     <string name="black_succer_more">移除黑名单成功</string>
+    <string name="black_more">移除黑名單</string>
     <string name="black_error_more">移除黑名单失败</string>
 
     <string name="reply">回復</string>

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

@@ -822,6 +822,7 @@
     <string name="black_add">加入黑名單</string>
     <string name="black_error">加入黑名單失敗</string>
     <string name="black_succer_more">移除黑名單成功</string>
+    <string name="black_more">移除黑名單</string>
     <string name="black_error_more">移除黑名單失敗</string>
 
     <string name="reply">回復</string>

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

@@ -25,7 +25,7 @@
     <string name="refresh_footer_nothing">No more data</string>
     <string name="black">Pull black</string>
     <string name="black_ing">Relieving blackout</string>
-    <string name="chat_remarks">Remarks</string>
+    <string name="chat_remarks">Modify remarks</string>
     <string name="chat_report">Report</string>
     <string name="bonus_sign">Sign in immediately</string>
     <string name="bonus_sign_1">Continuously signed in</string>
@@ -780,7 +780,8 @@
     <string name="black_succer">Successfully joined the blacklist</string>
     <string name="black_error">Failed to join blacklist</string>
 
-    <string name="black_succer_more">Blacklist removed successfully</string>
+    <string name="black_succer_more">Succeeded in removing the blacklist</string>
+    <string name="black_more">Remove blacklist</string>
     <string name="black_error_more">Failed to remove blacklist</string>
 
     <string name="reply">Reply</string>

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

@@ -53,10 +53,10 @@ public class MenuPopuwWindow implements View.OnClickListener {
                 public void onSuccess(RongIMClient.BlacklistStatus blacklistStatus) {
                     if (blacklistStatus == RongIMClient.BlacklistStatus.IN_BLACK_LIST) {
                         tvBlack.setTag("1");
-                        tvBlack.setText(R.string.black_ing);
+                        tvBlack.setText(R.string.black_more);
                     } else {
                         tvBlack.setTag(null);
-                        tvBlack.setText(R.string.black);
+                        tvBlack.setText(R.string.black_add);
                     }
                 }
 
@@ -89,7 +89,7 @@ public class MenuPopuwWindow implements View.OnClickListener {
      * @return
      */
     public void show(View view) {
-        popupWindow = new PopupWindow(popupView, DpUtil.dp2px(97), ViewGroup.LayoutParams.WRAP_CONTENT, true);
+        popupWindow = new PopupWindow(popupView, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, true);
         popupWindow.showAsDropDown(view);
         WindowManager.LayoutParams lp = mContext.getWindow().getAttributes();
         lp.alpha = 0.8f;

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="97dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/background_d5_white"
-    android:gravity="center"
+    android:gravity="start"
     android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/lt_remarks"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
@@ -42,7 +42,7 @@
 
     <LinearLayout
         android:id="@+id/lt_report"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
@@ -75,7 +75,7 @@
 
     <LinearLayout
         android:id="@+id/lt_black"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
@@ -93,7 +93,7 @@
             android:layout_width="wrap_content"
             android:layout_height="40dp"
             android:gravity="center"
-            android:text="@string/black"
+            android:text="@string/black_add"
             android:textColor="@color/black1"
             android:textSize="13sp"
             android:textStyle="bold" />

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

@@ -325,7 +325,7 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
 
                     private void showTag() {
                         List<String> tags = new ArrayList<>();
-                        tags.add(userInfoBean.getInfo().getAge()+(WordUtil.isNewZh()?"歲":"Age"));
+                        tags.add(userInfoBean.getInfo().getAge()+(WordUtil.isNewZh()?"歲":"years old"));
                         if (!StringUtil.isEmpty(userInfoBean.getInfo().getCareer())) {
                             tags.add(userInfoBean.getInfo().getCareer());
                         }

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

@@ -256,7 +256,7 @@ public class UserHomeActivity extends AbsActivity {
         });
         tagList = new ArrayList<>();
         if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getAge())) {
-            tagList.add(userInfo.getUserHomeTopInfo().getAge() + (WordUtil.isNewZh() ? "歲" : "Age"));
+            tagList.add(userInfo.getUserHomeTopInfo().getAge() + (WordUtil.isNewZh() ? "歲" : "years old"));
         }
         if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getHeight())) {
             tagList.add(userInfo.getUserHomeTopInfo().getHeight());

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

@@ -18,9 +18,9 @@
     <string name="battlepass_exchange_submit_lock">Unlocked</string>
     <string name="battlepass_reward_item_lock">Not yet reached level</string>
     <string name="battlepass_reward_item_get">Successfully claimed</string>
-    <string name="top">置頂</string>
+    <string name="top">TOP</string>
-    <string name="untop">取消置頂</string>
+    <string name="untop">UnTOP</string>
-    <string name="delete">刪除</string>
+    <string name="delete">Delete</string>
     <string name="activity_msg_title">Information</string>
     <string name="activity_msg_news_notice">Activities</string>
     <string name="activity_msg_system_message">Chats</string>
@@ -37,7 +37,7 @@
     <string name="activity_msg_addressbook_tab_fan">Fan</string>
     <string name="activity_msg_addressbook_tab_fan2">Return</string>
     <string name="activity_msg_addressbook_tab_mutual">Mutual</string>
-    <string name="activity_msg_chat_top_tip1">Present a gift to accompany him/her~</string>
+    <string name="activity_msg_chat_top_tip1">Accompany them with gifts~</string>
     <string name="dialog_msg_m_config">Message Settings</string>
     <string name="dialog_msg_status_config">Order Settings</string>
     <string name="dialog_msg_status_online_config">Online</string>
@@ -53,17 +53,17 @@
     <string name="dialog_msg_hi_config_audio_tips2">可以是自我介紹，交友意向，唱歌等，最多5秒</string>
     <string name="dialog_msg_hi_config_audio_tips3">例如：</string>
     <string name="dialog_msg_hi_config_audio_tips4">1.我願變成童話裡，你愛的那個天使 \n2.我還是很喜歡你，像風走了八千裡，不問歸期 \n3.我想吃碗面。什麼面？你的心裡面</string>
-    <string name="dialog_msg_hi_config_audio_btn">長按錄製</string>
+    <string name="dialog_msg_hi_config_audio_btn">Record</string>
-    <string name="dialog_msg_hi_config_audio_btn_play">點擊播放</string>
+    <string name="dialog_msg_hi_config_audio_btn_play">Play</string>
-    <string name="dialog_msg_hi_config_audio_btn_reset">重錄</string>
+    <string name="dialog_msg_hi_config_audio_btn_reset">Rerecord</string>
-    <string name="dialog_msg_hi_config_audio_btn_save">保存</string>
+    <string name="dialog_msg_hi_config_audio_btn_save">Save</string>
     <string name="dialog_msg_hi_config_audio_refuse_save_image">至少传一张图片</string>
     <string name="dialog_msg_hi_config_audio_refuse_save_text">至少传一条文字消息</string>
     <string name="dialog_msg_hi_config_audio_refuse_save_audio">至少传一条语音消息</string>
     <string name="activity_reg_user_info_title">Personal information</string>
     <string name="activity_reg_user_info_sex_title">Nickname</string>
     <string name="activity_reg_user_info_sex_sex">Sex</string>
-    <string name="activity_reg_user_info_sex_sex_tips">*Only one chance to choose gender, choose wisely.</string>
+    <string name="activity_reg_user_info_sex_sex_tips">*Only one chance to choose gender.</string>
     <string name="activity_reg_user_info_sex_man">Boys</string>
     <string name="activity_reg_user_info_sex_woman">Girl</string>
     <string name="activity_reg_user_info_avatar_change">Replace</string>