diff --git a/app/src/main/java/com/shayu/phonelive/AppContext.java b/app/src/main/java/com/shayu/phonelive/AppContext.java
index 6dea8b7ed..98dc3348a 100644
--- a/app/src/main/java/com/shayu/phonelive/AppContext.java
+++ b/app/src/main/java/com/shayu/phonelive/AppContext.java
@@ -135,12 +135,6 @@ public class AppContext extends CommonAppContext {
         if (!isMainProcess()) {
             return;
         }
-        AppManager.runDebugCode(new Runnable() {
-            @Override
-            public void run() {
-                ToastUtil.show("Debug代码");
-            }
-        });
         CrashSaveBean.getInstance().setStartTime(System.currentTimeMillis());
         //注册全局异常捕获
         registerError();
diff --git a/common/src/main/java/com/yunbao/common/adapter/LiveNewWishAdapter.java b/common/src/main/java/com/yunbao/common/adapter/LiveNewWishAdapter.java
index e6550b62d..4363e6dd2 100644
--- a/common/src/main/java/com/yunbao/common/adapter/LiveNewWishAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/LiveNewWishAdapter.java
@@ -1,5 +1,6 @@
 package com.yunbao.common.adapter;
 
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +12,7 @@ import com.yunbao.common.R;
 import com.yunbao.common.bean.WishModel;
 import com.yunbao.common.event.LiveNewWishListCloseEvent;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.DayWishItemViewHolder;
 import com.yunbao.common.views.LunarWishItemViewHolder;
 import com.yunbao.common.views.SeasonalWishItemViewHolder;
@@ -46,8 +48,20 @@ public class LiveNewWishAdapter extends RecyclerView.Adapter {
                 Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(true));
                 break;
         }
+        boolean isAdd = false;
+        for (int i = 0; i < wishList.size(); i++) {
+            if (wishList.get(i)!=null){
+                if (!TextUtils.isEmpty(wishList.get(i).getLid()) && !TextUtils.isEmpty(model.getLid())
+                        && TextUtils.equals(wishList.get(i).getLid(), model.getLid())) {
+                    ToastUtil.show(R.string.too_many_gifts);
+                    isAdd = true;
+                }
+            }
 
-        wishList.add(0, model);
+        }
+        if (!isAdd) {
+            wishList.add(0, model);
+        }
         notifyDataSetChanged();
     }
 
diff --git a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
index c6dfaf62d..bb7a963c1 100644
--- a/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/LiveNewWishListFragment.java
@@ -17,11 +17,11 @@ import com.yunbao.common.bean.WishListModel;
 import com.yunbao.common.bean.WishModel;
 import com.yunbao.common.bean.WishModel2;
 import com.yunbao.common.event.LiveNewWishListCloseEvent;
-import com.yunbao.common.event.PopupViewDismissEvent;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.views.HintCustomPopup;
 import com.yunbao.common.views.LiveNewWishGiftPopup;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
@@ -66,7 +66,7 @@ public class LiveNewWishListFragment extends BaseFragment {
             @Override
             public void onViewClicks() {
                 saveWish();
-                Bus.get().post(new PopupViewDismissEvent());
+
             }
         });
     }
@@ -105,29 +105,51 @@ public class LiveNewWishListFragment extends BaseFragment {
         liveNewWishAdapter.addData(wishList, type);
     }
 
-    public void saveWish() {
+    public int liveNewWishAdapterWishList() {
         List<WishModel> wishList = liveNewWishAdapter.getWishList();
         List<WishModel2> wishList2 = new ArrayList<>();
         Gson gson = new Gson();
         for (WishModel model : wishList) {
-            if (model!=null){
+            if (model != null) {
                 WishModel2 model2 = gson.fromJson(gson.toJson(model), WishModel2.class);
                 wishList2.add(model2);
             }
 
         }
-        if (wishList2.size() == 0) {
-            Bus.get().post(new PopupViewDismissEvent());
-        } else {
-            if (wishList2.size()>10){
-                ToastUtil.show(R.string.must_hint);
-                return;
+        return wishList2.size();
+    }
+
+    public void saveWish() {
+        List<WishModel> wishList = liveNewWishAdapter.getWishList();
+        List<WishModel2> wishList2 = new ArrayList<>();
+        Gson gson = new Gson();
+        for (WishModel model : wishList) {
+            if (model != null) {
+                WishModel2 model2 = gson.fromJson(gson.toJson(model), WishModel2.class);
+                wishList2.add(model2);
             }
+
+        }
+        switch (type) {
+            case 1:
+                Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(false));
+                break;
+            case 2:
+                Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(false));
+                break;
+            case 3:
+                Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(false));
+                break;
+            case 4:
+                Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(false));
+                break;
+        }
+        if (wishList2.size() == 0) {
             LiveNetManager.get(getContext()).
                     setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
                         @Override
                         public void onSuccess(String data) {
-
+                            ToastUtil.show("修改成功");
                         }
 
                         @Override
@@ -135,22 +157,58 @@ public class LiveNewWishListFragment extends BaseFragment {
                             ToastUtil.show(R.string.net_error);
                         }
                     });
-            switch (type) {
-                case 1:
-                    Bus.get().post(new LiveNewWishListCloseEvent().setDayWish(false));
-                    break;
-                case 2:
-                    Bus.get().post(new LiveNewWishListCloseEvent().setZhouXin(false));
-                    break;
-                case 3:
-                    Bus.get().post(new LiveNewWishListCloseEvent().setLunarWish(false));
-                    break;
-                case 4:
-                    Bus.get().post(new LiveNewWishListCloseEvent().setSeasonalWish(false));
-                    break;
+        } else if (wishList2.size() == 1) {
+            new XPopup.Builder(getContext())
+                    .asCustom(new HintCustomPopup(getContext(),
+                            getContext().getString(R.string.dialog_tip),
+                            getContext().getString(R.string.sett_rigger))
+                            .setLiveOpenOk(getContext().getString(R.string.settings_ser))
+                            .setLiveOpenCancel(getContext().getString(R.string.cancel_ca))
+                            .setCallBack(new HintCustomPopup.HintCustomCallBack() {
+                                @Override
+                                public void onSure() {
+
+                                }
+
+                                @Override
+                                public void onCancel() {
+
+                                    if (wishList2.size() > 10) {
+                                        ToastUtil.show(R.string.must_hint);
+                                        return;
+                                    }
+                                    LiveNetManager.get(getContext()).
+                                            setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
+                                                @Override
+                                                public void onSuccess(String data) {
+                                                    ToastUtil.show("修改成功");
+                                                }
+
+                                                @Override
+                                                public void onError(String error) {
+                                                    ToastUtil.show(R.string.net_error);
+                                                }
+                                            });
+                                }
+                            })).show();
+        } else {
+            if (wishList2.size() > 10) {
+                ToastUtil.show(R.string.must_hint);
+                return;
             }
+            LiveNetManager.get(getContext()).
+                    setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
+                        @Override
+                        public void onSuccess(String data) {
+                            ToastUtil.show("修改成功");
+                        }
+
+                        @Override
+                        public void onError(String error) {
+                            ToastUtil.show(R.string.net_error);
+                        }
+                    });
+
         }
-
-
     }
 }
diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
index 8779c4866..a32b22392 100644
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -863,6 +863,15 @@ public interface PDLiveApi {
             @Query("to_uid") String toUid
     );
 
+    /**
+     * 礼物墙已点亮
+     */
+    @GET("/api/public/?service=Gift.giftUserSendWall")
+    Observable<ResponseModel<GiftAlreadyWallModel>> giftUserSendWall(
+            @Query("liveuid") String liveUid,
+            @Query("to_uid") String toUid
+    );
+
     /**
      * 礼物墙未点亮
      */
diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
index aeeb32a15..b628a359e 100644
--- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
+++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
@@ -1874,6 +1874,28 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
+    public void giftUserSendWall(String liveUid, String toUid, HttpCallback<GiftAlreadyWallModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .giftUserSendWall(liveUid, toUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<GiftAlreadyWallModel>>() {
+                    @Override
+                    public void accept(ResponseModel<GiftAlreadyWallModel> giftAlreadyWallModelResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(giftAlreadyWallModelResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
     public void giftWithoutWall(String liveUid, String toUid, HttpCallback<GiftAlreadyWallModel> callback) {
         API.get().pdLiveApi(mContext)
                 .giftWithoutWall(liveUid, toUid)
@@ -2072,9 +2094,9 @@ public class LiveNetManager {
                 }).isDisposed();
     }
 
-    public void buyFansExclusivePack(String liveUid, String packId,String stream, HttpCallback<HttpCallbackModel> callback) {
+    public void buyFansExclusivePack(String liveUid, String packId, String stream, HttpCallback<HttpCallbackModel> callback) {
         API.get().pdLiveApi(mContext)
-                .buyFansExclusivePack(liveUid, packId,stream)
+                .buyFansExclusivePack(liveUid, packId, stream)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<ResponseModel<HttpCallbackModel>>() {
diff --git a/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java
index 335b71651..677c2d632 100644
--- a/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/DayWishItemViewHolder.java
@@ -80,10 +80,13 @@ public class DayWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java b/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java
index 4294b8b34..7a654aaba 100644
--- a/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/GiftNumberPopup.java
@@ -54,7 +54,9 @@ public class GiftNumberPopup extends BottomPopupView {
                 new XPopup.Builder(getContext())
                         .asCustom(new InputCustomPopup(getContext(),
                                 getContext().getString(R.string.the_title_financier3),
-                                R.string.custom_quantity, true).setListener(new InputCustomPopup.InputCustomListener() {
+                                R.string.custom_quantity, true)
+                                .setMaxValue(4)
+                                .setListener(new InputCustomPopup.InputCustomListener() {
                             @Override
                             public void onConfirm(String text) {
                                 if (!TextUtils.isEmpty(text)) {
diff --git a/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java b/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java
index b2598cd14..80b31e916 100644
--- a/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java
@@ -1,6 +1,7 @@
 package com.yunbao.common.views;
 
 import android.content.Context;
+import android.text.InputFilter;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.View;
@@ -22,6 +23,7 @@ public class InputCustomPopup extends CenterPopupView {
     private String message = "";
     private int title = R.string.dialog_tip;
     private boolean isType;
+    private int maxValue=0;
 
     public InputCustomPopup(@NonNull Context context, String message, int title) {
         super(context);
@@ -36,6 +38,11 @@ public class InputCustomPopup extends CenterPopupView {
         this.isType = isType;
     }
 
+    public InputCustomPopup setMaxValue(int maxValue) {
+        this.maxValue = maxValue;
+        return this;
+    }
+
     public InputCustomPopup(@NonNull Context context, int title) {
         super(context);
         this.title = title;
@@ -53,6 +60,9 @@ public class InputCustomPopup extends CenterPopupView {
         super.onCreate();
         EditText content = findViewById(R.id.content);
         TextView titleText = findViewById(R.id.title);
+        if(maxValue>0){
+            content.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxValue)});
+        }
 
         if (isType) {
             content.setHint(message);
diff --git a/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java b/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
index b6d8a88c6..4ca74750f 100644
--- a/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/LiveNewWishListPopup.java
@@ -98,7 +98,6 @@ public class LiveNewWishListPopup extends BottomPopupView {
 
     private void saveWishDialog(boolean isDismiss) {
         if (hintCustomPopup != null) return;
-
         hintCustomPopup = new HintCustomPopup(
                 getContext(),
                 getContext().getString(R.string.replacement_reset_confirmed_cancel3),
@@ -110,17 +109,15 @@ public class LiveNewWishListPopup extends BottomPopupView {
                     public void onSure() {
                         hintCustomPopup = null;
                         if (dayWish) {
-                            dayWishFragment.saveWish();
+                            dayWishFragment.saveWish( );
                         } else if (zhouXin) {
-                            zhouXinFragment.saveWish();
+                            zhouXinFragment.saveWish( );
                         } else if (lunarWish) {
-                            lunarWishFragment.saveWish();
+                            lunarWishFragment.saveWish( );
                         } else if (seasonalWish) {
-                            seasonalWishFragment.saveWish();
-                        }
-                        if (isDismiss) {
-                            dismiss();
+                            seasonalWishFragment.saveWish( );
                         }
+
                     }
 
                     @Override
@@ -167,6 +164,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
                 .setWishlistName(event.getModel().getName())
                 .setWishlistIcon(event.getModel().getImg())
                 .setWishlistNum("1")
+                .setLid(event.getModel().getId())
                 .setLuid("" + IMLoginManager.get(mContext).getUserInfo().getId())
                 .setWishlistProgress("0")
                 .setPrice(Integer.parseInt(event.getModel().getPrice()))
@@ -334,7 +332,7 @@ public class LiveNewWishListPopup extends BottomPopupView {
                             setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
                                 @Override
                                 public void onSuccess(String data) {
-                                    ToastUtil.show(data);
+                                    ToastUtil.show("修改成功");
                                 }
 
                                 @Override
diff --git a/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java
index 756685745..01d3d65ea 100644
--- a/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/LunarWishItemViewHolder.java
@@ -77,10 +77,13 @@ public class LunarWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java
index b0578cc45..be93e658d 100644
--- a/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/SeasonalWishItemViewHolder.java
@@ -77,10 +77,13 @@ public class SeasonalWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java b/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java
index 422c2e304..63d1f533e 100644
--- a/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/WeekWishItemViewHolder.java
@@ -77,10 +77,13 @@ public class WeekWishItemViewHolder extends RecyclerView.ViewHolder {
                 @Override
                 public void onViewClicks() {
                     int number = model.wishProgress();
-                    model.setWishlistNum(String.valueOf(number - 1));
-                    if (listener != null) {
-                        listener.onUpdate(model, index);
+                    if (number>1){
+                        model.setWishlistNum(String.valueOf(number - 1));
+                        if (listener != null) {
+                            listener.onUpdate(model, index);
+                        }
                     }
+
                 }
             });
         } else {
diff --git a/common/src/main/res/drawable/background_skip_unselect_button.png b/common/src/main/res/drawable/background_skip_unselect_button.png
new file mode 100644
index 000000000..0b0bb68b7
Binary files /dev/null and b/common/src/main/res/drawable/background_skip_unselect_button.png differ
diff --git a/common/src/main/res/layout/dialog_live_gift_popup.xml b/common/src/main/res/layout/dialog_live_gift_popup.xml
index e51c57a5d..a489f4994 100644
--- a/common/src/main/res/layout/dialog_live_gift_popup.xml
+++ b/common/src/main/res/layout/dialog_live_gift_popup.xml
@@ -53,6 +53,7 @@
                 android:gravity="center_vertical">
 
                 <ImageView
+                    android:id="@+id/gift_itle"
                     android:layout_width="54dp"
                     android:layout_height="13dp"
                     android:layout_marginStart="13dp"
@@ -92,7 +93,7 @@
     <RelativeLayout
         android:id="@+id/gift_list"
         android:layout_width="match_parent"
-        android:layout_height="351dp"
+        android:layout_height="361dp"
         android:animateLayoutChanges="true"
         android:orientation="vertical">
 
@@ -157,14 +158,23 @@
                         android:progress="0"
                         android:progressDrawable="@drawable/progress_bg_user" />
 
-                    <TextView
+                    <com.yunbao.common.views.weight.MarqueeTextView
                         android:id="@+id/leave_hint"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:layout_marginTop="2dp"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:gravity="center"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
                         android:text="@string/leveling_points"
                         android:textColor="#BBBBBB"
                         android:textSize="9sp" />
+
                 </LinearLayout>
 
                 <ImageView
diff --git a/common/src/main/res/layout/dialog_live_new_wish_list.xml b/common/src/main/res/layout/dialog_live_new_wish_list.xml
index 542dd57c5..f044c166a 100644
--- a/common/src/main/res/layout/dialog_live_new_wish_list.xml
+++ b/common/src/main/res/layout/dialog_live_new_wish_list.xml
@@ -39,7 +39,10 @@
         android:layout_width="117dp"
         android:layout_height="31dp"
         android:layout_alignParentEnd="true"
-        android:layout_margin="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="@drawable/background_wish_replacement"
         android:gravity="center"
         android:text="@string/replacement_wish_day"
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle_en.png b/common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle_en.png
new file mode 100644
index 000000000..83ea01880
Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_live_gift_gift_itle_en.png differ
diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml
index 01a937fd8..15df89771 100644
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -176,7 +176,7 @@
     <string name="guard_guard">Guard</string>
     <string name="guard_week_con">Contribution this week</string>
     <string name="guard_no_data">anchor are waiting at your guard!</string>
-    <string name="guard_tip_0">Let\'s open up a guard for our favorite anchor</string>
+    <string name="guard_tip_0">Turn on the guard for your favorite anchor!</string>
     <string name="guard_tip_1">You are the current anchor\'s monthly guard \ n the guard date expires</string>
     <string name="guard_tip_2">You are the current anchor\'s annual guardian \ n the guardian date expires</string>
     <string name="guard_gift_tip">Special gift for annual guard</string>
@@ -1308,6 +1308,10 @@ Limited ride And limited avatar frame</string>
     <string name="the__gifts_in_the_studio">Please make gifts in the studio</string>
     <string name="been_sent">Been sent out</string>
     <string name="been_sent_must">Send out</string>
+    <string name="sett_rigger">"At least 2 types of gifts can be set to trigger the wish list special effect gift.     "</string>
+    <string name="cancel_ca">cancel</string>
+    <string name="settings_ser">settings</string>
+    <string name="too_many_gifts">Too many gifts</string>
 
 
 </resources>
diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml
index a1b2ca7d1..c4f091157 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1300,8 +1300,12 @@
     <string name="title_anchor">冠名主播：</string>
     <string name="the_title_financier">冠名金主：</string>
     <string name="the_title_financier2">冠名</string>
-    <string name="the_title_financier3">请输入自定义数量</string>
-    <string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
+    <string name="the_title_financier3">請輸入自定義數量</string>
+    <string name="the__gifts_in_the_studio">請在直播間內進行送禮</string>
     <string name="been_sent">已送出</string>
     <string name="been_sent_must">立即送出</string>
+    <string name="sett_rigger">最低設置2種類型禮物才能觸發心愿單特效禮物。</string>
+    <string name="cancel_ca">不再設置</string>
+    <string name="settings_ser">去設置</string>
+    <string name="too_many_gifts">重複添加禮物</string>
 </resources>
diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml
index 56cc1c802..abbd53187 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1299,8 +1299,12 @@
     <string name="title_anchor">冠名主播：</string>
     <string name="the_title_financier">冠名金主：</string>
     <string name="the_title_financier2">冠名</string>
-    <string name="the_title_financier3">请输入自定义数量</string>
-    <string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
+    <string name="the_title_financier3">請輸入自定義數量</string>
+    <string name="the__gifts_in_the_studio">請在直播間內進行送禮</string>
     <string name="been_sent">已送出</string>
     <string name="been_sent_must">立即送出</string>
+    <string name="sett_rigger">最低設置2種類型禮物才能觸發心愿單特效禮物。</string>
+    <string name="cancel_ca">不再設置</string>
+    <string name="settings_ser">去設置</string>
+    <string name="too_many_gifts">重複添加禮物</string>
 </resources>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index ebe4b025f..74039fbf7 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -20,7 +20,7 @@
     <string name="bonus_sign">立即簽到</string>
     <string name="bonus_sign_1">已連續簽到</string>
     <string name="bonus_day">天</string>
-    <string name="beauty_init_error">美顏初始化异常，無法使用</string>
+    <string name="beauty_init_error">美顏初始化異常，無法使用</string>
     <string name="cash">提現帳戶</string>
     <string name="cash_account_empty">您當前還沒設定提現帳戶</string>
     <string name="cash_add_account">添加提現帳戶</string>
@@ -34,7 +34,7 @@
     <string name="cash_type_ali">支付寶</string>
     <string name="cash_type_wx">微信</string>
     <string name="cash_type_bank">銀行卡</string>
-    <string name="cash_delete">是否要删除該帳戶？</string>
+    <string name="cash_delete">是否要刪除該帳戶？</string>
     <string name="cash_record">提現記錄</string>
     <string name="coin_give">贈送</string>
     <string name="coin_balance">帳戶餘額</string>
@@ -58,17 +58,17 @@
     <string name="task1">任務1</string>
     <string name="task2">任務2</string>
     <string name="task3">任務3</string>
-    <string name="give_a_free_gift">赠送一个\n免费礼物</string>
+    <string name="give_a_free_gift">贈送一個\n免費禮物</string>
     <string name="incomplete">未完成</string>
     <string name="complete">完成</string>
     <string name="follow_anchor">任意關注\n一名主播</string>
     <string name="light_up_room">雙擊點亮\n    直播間</string>
     <string name="completing_mission">恭喜你完成任務</string>
-    <string name="get">获得</string>
+    <string name="get">獲得</string>
     <string name="only_one">這個禮物只能送一個哦~</string>
     <string name="edit_profile_birthday">生日</string>
     <string name="edit_profile_sex">性別</string>
-    <string name="apply_for_lianmai">申请連麥</string>
+    <string name="apply_for_lianmai">申請連麥</string>
     <string name="cancel_application">取消申請</string>
     <string name="close_mic">關閉連麥</string>
     <string name="quit_mic">退出連麥</string>
@@ -125,7 +125,7 @@
     <string name="guard_my">我的</string>
     <string name="diamond">鑽石</string>
 
-    <string name="guard_guard">主播守护</string>
+    <string name="guard_guard">主播守護</string>
     <string name="guard_week_con">本周貢獻</string>
     <string name="guard_no_data">主播正在等待您的守護！</string>
     <string name="guard_tip_0">快去為喜歡的主播開通守護吧</string>
@@ -193,12 +193,12 @@
     <string name="login_tip_1">登入即代表同意</string>
     <string name="login_tip_2">服務和隱私條款</string>
     <string name="login_other_type">其他登入管道</string>
-    <string name="login_tip_3">注册登入後體驗更精彩！</string>
+    <string name="login_tip_3">註冊登入後體驗更精彩！</string>
     <string name="login_input_phone">請輸入手機號碼</string>
     <string name="login_input_pwd">請輸入密碼</string>
     <string name="login_immediately_login">立即登入</string>
     <string name="login_ing">登入中</string>
-    <string name="login_immediately_register">立即注册</string>
+    <string name="login_immediately_register">立即註冊</string>
     <string name="login_forget_pwd">忘記密碼</string>
     <string name="login_phone_error">請輸入正確的手機號碼</string>
     <string name="login_auth_ing">正在授權登入</string>
@@ -219,7 +219,7 @@
     <string name="live_class">選擇頻道</string>
     <string name="live_class_choose">選擇直播頻道</string>
     <string name="live_class_tip_title">注意選擇適合自己的頻道。</string>
-    <string name="live_class_tip">直播過程中，若運營人員發現選擇的頻道和直播內容不相符的情况，會調整您的直播頻道。</string>
+    <string name="live_class_tip">直播過程中，若運營人員發現選擇的頻道和直播內容不相符的情況，會調整您的直播頻道。</string>
     <string name="live_set_pwd">請設定房間密碼</string>
     <string name="live_set_fee">請設定收費金額\n（收益以直播結束顯示為准）</string>
     <string name="live_set_pwd_empty">請設定房間密碼</string>
@@ -424,17 +424,17 @@
     <string name="profit_tip_2">可提現%1$s數</string>
     <string name="profit_tip_3">輸入要選取的%1$s數</string>
     <string name="profit_cash">立即提現</string>
-    <string name="reg_register">注册</string>
+    <string name="reg_register">註冊</string>
     <string name="reg_input_phone">請輸入您的手機號</string>
     <string name="reg_input_code">請輸入驗證碼</string>
     <string name="reg_input_pwd_1">請填寫密碼</string>
     <string name="reg_input_pwd_2">請確認密碼</string>
     <string name="reg_input_pwd_3">填寫邀請碼（非必填）</string>
-    <string name="reg_register_and_login">注册並登入</string>
+    <string name="reg_register_and_login">註冊並登入</string>
     <string name="reg_get_code">獲取驗證碼</string>
     <string name="reg_get_code_again">重新獲取</string>
     <string name="reg_pwd_error">密碼不一致</string>
-    <string name="reg_register_ing">注册中</string>
+    <string name="reg_register_ing">註冊中</string>
     <string name="red_pack_1">直播間紅包</string>
     <string name="red_pack_2">給當前直播間觀眾發紅包</string>
     <string name="red_pack_3">拼手氣紅包</string>
@@ -516,7 +516,7 @@
     <string name="video_process_failed">視頻預處理失敗</string>
     <string name="video_process_cancel">視頻預處理取消</string>
     <string name="video_processing">處理中</string>
-    <string name="video_edit_status_error">狀態异常，停止編輯</string>
+    <string name="video_edit_status_error">狀態異常，停止編輯</string>
     <string name="video_choose_music">選擇音樂</string>
     <string name="video_search_music">蒐索歌曲名稱</string>
     <string name="video_music_hot">熱門歌曲</string>
@@ -533,7 +533,7 @@
     <string name="video_process_2">視頻生成中</string>
     <string name="video_generate_success">生成視頻成功</string>
     <string name="video_generate_failed">生成視頻失敗</string>
-    <string name="video_give_up_pub">是否放弃發佈此條視頻</string>
+    <string name="video_give_up_pub">是否放棄發佈此條視頻</string>
     <string name="video_no_local">未找到本地視頻</string>
     <string name="video_local">本地視頻</string>
     <string name="video_duration_error">視頻時長不符合要求</string>
@@ -559,12 +559,12 @@
     <string name="video_report_tip_3">請選擇舉報理由</string>
     <string name="video_report_tip_4">舉報成功</string>
     <string name="video_scroll_top">已經到頂了哦</string>
-    <string name="video_record_delete_last">確定删除上一段視頻？</string>
+    <string name="video_record_delete_last">確定刪除上一段視頻？</string>
     <string name="video_edit_exit">是否退出視頻編輯</string>
     <string name="add">添加</string>
     <string name="accept">接受</string>
     <string name="all">全部</string>
-    <string name="alumb">相册</string>
+    <string name="alumb">相冊</string>
     <string name="cancel">取消</string>
     <string name="camera">相機</string>
     <string name="pic_choose_look">圖片選取/預覽</string>
@@ -577,18 +577,18 @@
     <string name="cannot_follow_self">無法關注自己哦~</string>
     <string name="dialog_tip">提示</string>
     <string name="download">下載</string>
-    <string name="delete">删除</string>
+    <string name="delete">刪除</string>
     <string name="end">結束</string>
     <string name="hot">熱門</string>
     <string name="day_rank">日榜</string>
     <string name="week_rank">周榜</string>
     <string name="live_audience">觀衆</string>
-    <string name="rosy">红润</string>
+    <string name="rosy">紅潤</string>
     <string name="skin">美白</string>
     <string name="smooth">磨皮</string>
     <string name="big_eyes">大眼</string>
-    <string name="slim_face">瘦脸</string>
-    <string name="thin_face">削脸</string>
+    <string name="slim_face">瘦臉</string>
+    <string name="thin_face">削臉</string>
     <string name="chin">下巴</string>
     <string name="nose">鼻子</string>
     <string name="lips">嘴唇</string>
@@ -596,24 +596,24 @@
     <string name="teeth">白牙</string>
     <string name="light">自然</string>
     <string name="white">白皙</string>
-    <string name="white1">净白</string>
+    <string name="white1">凈白</string>
     <string name="jp">日系</string>
     <string name="bw">黑白</string>
     <string name="soft">柔和</string>
     <string name="warmth">暖光</string>
-    <string name="retro">复古</string>
+    <string name="retro">復古</string>
     <string name="flower">花香</string>
-    <string name="easy">轻氧</string>
-    <string name="vitality">元气</string>
-    <string name="warm">鲜明</string>
+    <string name="easy">輕氧</string>
+    <string name="vitality">元氣</string>
+    <string name="warm">鮮明</string>
     <string name="bright">明亮</string>
     <string name="deep">深海</string>
-    <string name="sunset">夕阳</string>
-    <string name="cure">治愈</string>
-    <string name="filter">滤镜</string>
+    <string name="sunset">夕陽</string>
+    <string name="cure">治癒</string>
+    <string name="filter">濾鏡</string>
     <string name="preset">美型</string>
-    <string name="beauty">美颜</string>
-    <string name="cute">可爱</string>
+    <string name="beauty">美顏</string>
+    <string name="cute">可愛</string>
     <string name="goddess">女神</string>
     <string name="gxzb">個性裝扮</string>
     <string name="glamour_list">魅力榜</string>
@@ -680,7 +680,7 @@
     <string name="live_level_chat_limit">發言，需要到達%1$s級</string>
     <string name="live_location_close">開定位</string>
     <string name="live_location_close_2">堅決關閉</string>
-    <string name="live_location_close_3">關閉定位，直播不會被附近的人看到，直播間人數可能會减少，確認關閉嗎？</string>
+    <string name="live_location_close_3">關閉定位，直播不會被附近的人看到，直播間人數可能會減少，確認關閉嗎？</string>
     <string name="mars">火星</string>
     <string name="shop">商城</string>
     <string name="detail">明細</string>
@@ -698,7 +698,7 @@
     <string name="wallet_tip_5">未選中支付方式</string>
     <string name="wallet_coin_name">我的%1$s</string>
     <string name="charge">充值</string>
-    <string name="receive">领取</string>
+    <string name="receive">領取</string>
     <string name="mesg">消息中心</string>
     <string name="owning_guild">所屬公會</string>
     <string name="live_ktgz">開通貴族</string>
@@ -715,7 +715,7 @@
     <string name="chat_charge_pay">立即支付</string>
     <string name="live_user_level">使用者等級</string>
     <string name="live_user_level_anchor">主播等級</string>
-    <string name="live_user_card_level">用户等級</string>
+    <string name="live_user_card_level">用戶等級</string>
     <string name="live_noble_level_anchor">貴族等級</string>
     <string name="live_noble_fens_anchor">粉絲團</string>
     <string name="live_honor_number_anchor">榮譽墻</string>
@@ -728,7 +728,7 @@
     <string name="live_send_buy_zuoji_1">購買了座騎</string>
     <string name="live_send_buy_liang_name_1">購買了靚號</string>
     <string name="live_send_buy_vip_1">VIP</string>
-    <string name="live_random">随机PK</string>
+    <string name="live_random">隨機PK</string>
     <string name="live_wishlist">心願單</string>
     <string name="live_zg">娛樂整蠱</string>
     <string name="live_dr">多人PK</string>
@@ -745,7 +745,7 @@
     <string name="guard_tip_day3">您是當前主播的年守護</string>
     <string name="guardiandate">守護日期截止到：%s</string>
 
-    <string name="favoriteanchor">快为您喜欢的主播开通守护吧</string>
+    <string name="favoriteanchor">快為您喜歡的主播開通守護吧</string>
     <string name="theguardianof">成爲%s的守護</string>
 
 
@@ -765,7 +765,7 @@
     <string name="register_tip_3">隱私政策</string>
     <string name="live_medal_des2">每日禮包</string>
     <string name="live_medal_des3">貴賓座席</string>
-    <string name="live_medal_des5">真爱排行</string>
+    <string name="live_medal_des5">真愛排行</string>
     <string name="live_medal_des4">送禮獲得粉絲微章</string>
     <string name="wishlist_title3">當日設置的心願，會在當天24:00失效</string>
     <string name="live_item_add_gift">添加禮物和數量</string>
@@ -777,7 +777,7 @@
     <string name="lives_state">直播中</string>
     <string name="rest_state">休息中</string>
 
-    <string name="live_close_follow">拜托拜托，可以關注一下我嗎？</string>
+    <string name="live_close_follow">拜託拜託，可以關注一下我嗎？</string>
     <string name="live_close_follow_exit">關注並退出</string>
     <string name="live_close_exit">直接退出</string>
     <string name="user">用戶</string>
@@ -816,10 +816,10 @@
 
     <string name="now_noble">當前貴族： </string>
     <string name="now_noble_time">到期時間： </string>
-    <string name="black_succer">已加入黑名单</string>
-    <string name="black_error">加入黑名单失败</string>
-    <string name="black_succer_more">移除黑名单成功</string>
-    <string name="black_error_more">移除黑名单失败</string>
+    <string name="black_succer">已加入黑名單</string>
+    <string name="black_error">加入黑名單失敗</string>
+    <string name="black_succer_more">移除黑名單成功</string>
+    <string name="black_error_more">移除黑名單失敗</string>
 
     <string name="reply">回復</string>
     <string name="input_content">回復評論</string>
@@ -844,9 +844,9 @@
     <string name="user_task_text3">解鎖直播間發言功能</string>
     <string name="user_task_but">前置任務</string>
 
-    <string name="user_login_facebook">使用Facebook登录</string>
-    <string name="user_login_twitter">使用Twitter登录</string>
-    <string name="user_login_google">使用Google登录</string>
+    <string name="user_login_facebook">使用Facebook登錄</string>
+    <string name="user_login_twitter">使用Twitter登錄</string>
+    <string name="user_login_google">使用Google登錄</string>
 
     <string name="user_login_outtime">請求超時，請稍後再試。</string>
 
@@ -893,12 +893,12 @@
     <string name="floating_screen">飄屏彈幕</string>
     <string name="whole_station_horn">全站喇叭</string>
     <string name="whole_station_horn_hint">可用次數：%s  注：每月1日凌晨4點更新次數</string>
-    <string name="cannot_be_empty">内容不可为空</string>
+    <string name="cannot_be_empty">內容不可為空</string>
     <string name="site_wide_news">貴族專屬全站消息</string>
     <string name="site_wide_news_hint1">全站顯示消息並可跳轉到當前直播間</string>
-    <string name="site_wide_news_hint2">开通贵族国王、皇帝、超级皇帝免费获得</string>
+    <string name="site_wide_news_hint2">開通貴族國王、皇帝、超級皇帝免費獲得</string>
     <string name="back">返回</string>
-    <string name="go_nobility">前往贵族</string>
+    <string name="go_nobility">前往貴族</string>
     <string name="use_successfully">使用成功</string>
     <string name="use_live">前往直播間</string>
     <string name="search_history">搜索歷史</string>
@@ -907,7 +907,7 @@
     <string name="anchor_more">更多</string>
     <string name="wonderful_live">精彩直播</string>
     <string name="recommended_for_you">為您推薦</string>
-    <string name="fun_games">趣味游戏</string>
+    <string name="fun_games">趣味遊戲</string>
     <string name="value_added_benefits">增值權益</string>
     <string name="fan_club">粉絲團</string>
     <string name="activity_center">活動中心</string>
@@ -931,7 +931,7 @@
     <string name="viscount">子爵</string>
     <string name="marquis">侯爵</string>
     <string name="duke">公爵</string>
-    <string name="king">国王</string>
+    <string name="king">國王</string>
     <string name="emperor">皇帝</string>
     <string name="better_emperor">超皇</string>
     <string name="can_not_go">無法前往神秘人的個人主頁。</string>
@@ -942,21 +942,21 @@
     <string name="try_again_later">數據加載失敗，請稍後再試</string>
     <string name="open_noble2">開通了</string>
     <string name="enough_speakers">喇叭數量不足</string>
-    <string name="order_query">订单查询中</string>
-    <string name="order_query_success">订单无异常</string>
+    <string name="order_query">訂單查詢中</string>
+    <string name="order_query_success">訂單無異常</string>
     <string name="login_invalid">登錄失效，請重新登錄</string>
     <string name="login_wait">請稍後</string>
     <string name="slide_settings">滑動設置</string>
     <string name="up_slide_settings">上下滑動切換直播間</string>
-    <string name="live_say_something_a">\@用户昵称\t\t你好啊～</string>
-    <string name="oline_list">在线列表</string>
+    <string name="live_say_something_a">\@用戶昵稱\t\t你好啊～</string>
+    <string name="oline_list">在線列表</string>
     <string name="search_want">搜索想要@的人</string>
     <string name="online_audience">在線觀眾</string>
     <string name="audience">觀眾</string>
     <string name="cannot_yourself">無法@自己</string>
     <string name="total_star_value">總星值</string>
     <string name="number_of_people_assisted">助力人數</string>
-    <string name="star_change">%s星挑战</string>
+    <string name="star_change">%s星挑戰</string>
     <string name="star_success">恭喜 %s，完成了%s %s星 挑戰，快去一睹主播芳容吧！</string>
     <string name="star">星</string>
     <string name="small_window_settings">小窗播放設置</string>
@@ -966,13 +966,13 @@
     <string name="system_window">APP全應用小窗播放</string>
     <string name="system_window_hint">在其他應用上及所有界面显示小窗\n需打開懸浮窗權限。</string>
     <string name="to_open_the">前往打開</string>
-    <string name="do_you_like">不喜歡小窗播放吗？\n可以在「個人中心」-「設定」中關閉</string>
+    <string name="do_you_like">不喜歡小窗播放嗎？\n可以在「個人中心」-「設定」中關閉</string>
     <string name="to_set_up">去設置</string>
     <string name="know_the">知道了</string>
     <string name="individual_set">個人設定</string>
     <string name="reward">獎勵</string>
     <string name="change_the_password">修改密碼</string>
-    <string name="blacklist">黑名单</string>
+    <string name="blacklist">黑名單</string>
     <string name="alerts">消息通知</string>
     <string name="studio_gift_effects">屏蔽直播間禮物特效</string>
     <string name="studio_ride_effects">屏蔽直播間座駕特效</string>
@@ -988,7 +988,7 @@
     <string name="image_quality_selection">畫質選擇</string>
     <string name="more_settings">更多設置</string>
     <string name="moer">查看更多</string>
-    <string name="gift_way">礼物正在获取中...</string>
+    <string name="gift_way">禮物正在獲取中...</string>
     <string name="start_pk">開始PK</string>
     <string name="number_of_remaining_times">剩餘次數:%s</string>
     <string name="confirmed_to_proceed">是否確認進行多人PK（確認後扣除1點次數）當日剩餘次數: %s</string>
@@ -997,9 +997,9 @@
     <string name="pk_time">時間  %s</string>
 
     <string name="random_pk_dialog_apply">接受</string>
-    <string name="random_pk_dialog_refuse">拒绝</string>
-    <string name="random_pk_dialog_refuse_again">坚持拒绝</string>
-    <string name="random_pk_dialog_title">随机PK提示</string>
+    <string name="random_pk_dialog_refuse">拒絕</string>
+    <string name="random_pk_dialog_refuse_again">堅持拒絕</string>
+    <string name="random_pk_dialog_title">隨機PK提示</string>
 
     <string name="speech_robot_setup">自動發言機器人設置</string>
     <string name="robot_switch">機器人開關</string>
@@ -1036,7 +1036,7 @@
     <string name="stick_to_choice">堅持選擇</string>
     <string name="net_hint">網絡提示</string>
     <string name="net_hint2">系統監測到您的網絡不穩定，設備內存不足將會影響到您的直播流暢度，因此建議您選擇流暢清晰度。</string>
-    <string name="check_the_new_version">检查新版本</string>
+    <string name="check_the_new_version">檢查新版本</string>
     <string name="discover_a_new_version">發現新版本，點此更新</string>
     <string name="latest_version">已是最新版本</string>
     <string name="updating">更新中</string>
@@ -1059,7 +1059,7 @@
     <string name="live_data_attention_rate">關注轉化率</string>
     <string name="live_data_fan_group">新增粉絲團</string>
     <string name="live_data_fan_group_rate">粉絲團轉化率</string>
-    <string name="live_data_loading">加载中…</string>
+    <string name="live_data_loading">加載中…</string>
     <string name="yoursystemisolder">由於您的系統較老，我們自動為您屏蔽了禮物及座駕特效，可在「設置中心」手動打開。</string>
     <string name="net_error">抱歉！出錯了！</string>
 
@@ -1068,19 +1068,19 @@
     <string name="more_day_to">再簽到1天即可獲得額外獎勵。</string>
     <string name="sign_in_to_the_center">「簽到中心」</string>
     <string name="go_to_the">快前往「簽到中心」獲得額外獎勵吧！</string>
-    <string name="sign_in_center">签到中心</string>
-    <string name="to_top">返回首页</string>
-    <string name="go_to_the_sign">前往签到中心</string>
+    <string name="sign_in_center">簽到中心</string>
+    <string name="to_top">返回首頁</string>
+    <string name="go_to_the_sign">前往簽到中心</string>
     <string name="confirm_pick_up">確認領取</string>
     <string name="customer_service2">無法登陸？點此聯繫客服</string>
     <string name="next_step_is_consent">進入下一步即代表同意</string>
-    <string name="user_protocol2">用户協議</string>
+    <string name="user_protocol2">用戶協議</string>
     <string name="and">和</string>
     <string name="privacy_terms">隱私條款</string>
     <string name="terms_and_policies">條款和政策</string>
     <string name="treat_and_protect">歡迎來到PD LIVE，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
     <string name="install_the_application">詳情請您閱讀以下安裝應用程序的消息：</string>
-    <string name="anti_cheating_services">為了向您提供一鍵分享服務，我們的產品集成Mob+U-Share SDK，Mob+SDK需要收集您的設備Mac地址、唯一設備識別碼(1MEI/android ID/IDFA/OPENUDID/GUID、 SIM卡IMSI信息)以及您需要分享的社交賬號公開信息，以便完成一鍵分享服務。並通過地理位置校準報表數據準確性，提供基礎反作弊服務。為了您的信息安全，我們已與第三方SDK服務商進行數據安全保密約定，這些公司會嚴格遵守我們的數據隱私和安全要求。  除非得到您的同意，我們不會與其共享您的個人身份信息。為便於您更好地了解[Mob+]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政）。</string>
+    <string name="anti_cheating_services">為了向您提供一鍵分享服務，我們的產品集成Mob+U-Share SDK，Mob+SDK需要收集您的設備Mac地址、唯一設備識別碼(1MEI/android ID/IDFA/OPENUDID/GUID、 SIM卡IMSI信息)以及您需要分享的社交賬號公開信息，以便完成一鍵分享服務。並通過地理位置校準報表數據準確性，提供基礎反作弊服務。為了您的信息安全，我們已與第三方SDK服務商進行數據安全保密約定，這些公司會嚴格遵守我們的數據隱私和安全要求。  除非得到您的同意，我們不會與其共享您的個人身份信息。為便於您更好地了解[Mob+]採集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政）。</string>
     <string name="agreement">同意</string>
     <string name="read_and_agre">點擊同意後即代表您已閱讀並同意以上所有內容。</string>
     <string name="support_login">本應用會收集位置數據以支持登錄和註冊的功能使用。</string>
@@ -1091,7 +1091,7 @@
     <string name="layout_live_anchor_say_ready_title">女神說</string>
 
     <string name="say_something3">說點什麽吧...</string>
-    <string name="come_hint">%s 来了</string>
+    <string name="come_hint">%s 來了</string>
     <string name="day_wish">日心願</string>
     <string name="zhou_xin">周心願</string>
     <string name="lunar_wish">月心願</string>
@@ -1107,8 +1107,8 @@
     <string name="replacement_reset_confirmed_hint">重置後將會清空當前心願單列表\n無論心願單是否完成</string>
     <string name="replacement_reset_confirmed_sure">確定重置</string>
     <string name="replacement_reset_confirmed_cancel">返回列表</string>
-    <string name="replacement_reset_confirmed_cancel2">是否保存当前心愿单</string>
-    <string name="replacement_reset_confirmed_cancel3">当前心愿单未保存</string>
+    <string name="replacement_reset_confirmed_cancel2">是否保存當前心愿單</string>
+    <string name="replacement_reset_confirmed_cancel3">當前心愿單未保存</string>
     <string name="replacement_reset_confirmed_cancel4">不保存</string>
 
     <string name="live_use_discount_content">您有一張%s，是否使用？使用後開通花費鉆石%s，返還金豆%s</string>
@@ -1119,10 +1119,10 @@
     <string name="live_language_setting">語言設定</string>
     <string name="traditional_chinese">繁體中文</string>
     <string name="add_gift2">添加禮物、貴族、守護心願</string>
-    <string name="heat_add">热度加成</string>
-    <string name="must_hint">最多只能设置10条</string>
+    <string name="heat_add">熱度加成</string>
+    <string name="must_hint">最多只能設置10條</string>
     <string name="live_room_chat_fount_size_low">小</string>
-    <string name="live_room_chat_fount_size_def">默认</string>
+    <string name="live_room_chat_fount_size_def">默認</string>
     <string name="live_room_chat_fount_size_high">大</string>
     <string name="dialog_live_fount_title">選擇字號大小</string>
     <string name="dialog_fount_submit">確認</string>
@@ -1139,9 +1139,9 @@
     <string name="chat_prompt9">新活動、系統消息</string>
     <string name="chat_prompt10">開播通知</string>
     <string name="chat_prompt11">開啟後獲得直播通知</string>
-    <string name="PK_Ladder_Race">PK天梯赛</string>
+    <string name="PK_Ladder_Race">PK天梯賽</string>
     <string name="party_studio">是否確認前往對方直播間？</string>
-    <string name="not_received">充值未到账？</string>
+    <string name="not_received">充值未到賬？</string>
     <string name="delete_account1">是否刪除賬號</string>
     <string name="delete_account2">點擊刪除後即刻生效，且不可恢復，您確認要繼續嗎？</string>
     <string name="delete_account3">確認刪除</string>
@@ -1173,22 +1173,22 @@
     <string name="complete_information_hint3">離開會讓您失去獎勵，您確認離開嗎？</string>
     <string name="complete_information_hint2">愛你，愛你</string>
     <string name="you_guide_me">指導下我好嗎</string>
-    <string name="resend_win">再送%s个必得%s</string>
-    <string name="have_already_win">已将%s发送至您的个性装扮</string>
+    <string name="resend_win">再送%s個必得%s</string>
+    <string name="have_already_win">已將%s發送至您的個性裝扮</string>
     <string name="mini_blind_box">迷你盲盒</string>
     <string name="collection_blind_box">典藏盲盒</string>
     <string name="pd_blind_box">PD盲盒</string>
     <string name="live_vote_create_error">投票創建失敗</string>
-    <string name="individual_dressing">个性装扮</string>
-    <string name="random_availability">可随机获得，%s</string>
-    <string name="random_availability2">已获得，%s，%s</string>
-    <string name="random_availability3">已获得，%s</string>
+    <string name="individual_dressing">個性裝扮</string>
+    <string name="random_availability">可隨機獲得，%s</string>
+    <string name="random_availability2">已獲得，%s，%s</string>
+    <string name="random_availability3">已獲得，%s</string>
     <string name="get_it_done">完成必得</string>
     <string name="blind_box_list">盲盒榜</string>
     <string name="participate_in">參與</string>
     <string name="extract_to">%s在%s中抽取到了</string>
-    <string name="extract_to2">%S送给了%s</string>
-    <string name="rebot_config_auto_say_max">超过最大值</string>
+    <string name="extract_to2">%S送給了%s</string>
+    <string name="rebot_config_auto_say_max">超過最大值</string>
     <string name="insufficient_balance">餘額不足，繼續充值</string>
     <string name="live_setting_gap_3">期限禁言</string>
     <string name="red_packet_list_title">紅包記錄</string>
@@ -1208,7 +1208,7 @@
     <string name="red_packet_user_tips2">攢人氣紅包</string>
     <string name="main_tabs_red_packet">紅包專區</string>
     <string name="save_popular_red_packets">攢人氣紅包</string>
-    <string name="red_packet_value">价值</string>
+    <string name="red_packet_value">價值</string>
     <string name="top_up_now">去充值></string>
     <string name="total_consumption_of_drill">共計消耗%s鑚</string>
     <string name="red_envelope_rill">紅包%s鑚/個</string>
@@ -1217,7 +1217,7 @@
     <string name="conditions">條件</string>
     <string name="drill">鑚</string>
     <string name="amount">金額</string>
-    <string name="range_range_is">范围区间为[%s]</string>
+    <string name="range_range_is">範圍區間為[%s]</string>
     <string name="red_packet_open">開</string>
     <string name="randomly_available">隨機可得</string>
     <string name="build_up_popularity">攢人氣</string>
@@ -1242,8 +1242,8 @@
     <string name="red_too_bad2">與紅包擦肩而過</string>
     <string name="check_out_your_luck">查看大家手氣</string>
     <string name="lucky_red_envelope">" %s 在 好運紅包 中抽到了 %s"</string>
-    <string name="lucky_red_envelope_amount">数量</string>
-    <string name="red_envelope_released_successfully">红包发布成功</string>
+    <string name="lucky_red_envelope_amount">數量</string>
+    <string name="red_envelope_released_successfully">紅包發布成功</string>
     <string name="me_edit_avatar_system">選擇系統頭像</string>
     <string name="me_edit_avatar_system_tip">該功能需升至Lv.5后使用，請努力升級吧~</string>
     <string name="main_anchor_live_notify_info">無論你在哪裏，我都在直播間等你~</string>
@@ -1259,7 +1259,7 @@
     <string name="unlit_icon">未點亮</string>
     <string name="all_service_champion">全服冠名</string>
     <string name="unlit_icon_hint">愛\“禮\”伊始，\“墻\”勢點亮  暫無點亮</string>
-    <string name="lit_icon_hint">暂无未点亮礼物哦</string>
+    <string name="lit_icon_hint">暫無未點亮禮物哦</string>
     <string name="instant_light">立即點亮</string>
     <string name="honorary_achievement">榮譽成就</string>
     <string name="lit_icon">已點亮</string>
@@ -1282,7 +1282,7 @@
     <string name="gift_wall_entrance8_9">送禮機器：纍計贈送禮物個數達到200、1000、10K、100K、1M時，分別點亮對應的成就；</string>
     <string name="gift_wall_entrance8_10">點燈大師：解鎖【禮物墻】的數量達到10、30、50、100、200時,分別點亮對應的成就</string>
     <string name="regular_bubble">規則</string>
-    <string name="unlit_icon_hint2">当前活动暂未送出任何礼物哦</string>
+    <string name="unlit_icon_hint2">當前活動暫未送出任何禮物哦</string>
     <string name="rule_introduction">規則介紹</string>
     <string name="gift_details_hint">禮物詳情</string>
     <string name="vacant_position_awaits">虛位以待</string>
@@ -1299,10 +1299,14 @@
     <string name="title_anchor">冠名主播：</string>
     <string name="the_title_financier">冠名金主：</string>
     <string name="the_title_financier2">冠名</string>
-    <string name="the_title_financier3">请输入自定义数量</string>
-    <string name="the__gifts_in_the_studio">请在直播间内进行送礼</string>
+    <string name="the_title_financier3">請輸入自定義數量</string>
+    <string name="the__gifts_in_the_studio">請在直播間內進行送禮</string>
     <string name="been_sent">已送出</string>
     <string name="been_sent_must">立即送出</string>
+    <string name="sett_rigger">最低設置2種類型禮物才能觸發心愿單特效禮物。</string>
+    <string name="cancel_ca">不再設置</string>
+    <string name="settings_ser">去設置</string>
+    <string name="too_many_gifts">重複添加禮物</string>
 
 
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index d3e9b1d33..8f022b06e 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -176,7 +176,7 @@
     <string name="guard_guard">Guard</string>
     <string name="guard_week_con">Contribution this week</string>
     <string name="guard_no_data">anchor are waiting at your guard!</string>
-    <string name="guard_tip_0">Let\'s open up a guard for our favorite anchor</string>
+    <string name="guard_tip_0">Turn on the guard for your favorite anchor!</string>
     <string name="guard_tip_1">You are the current anchor\'s monthly guard \ n the guard date expires</string>
     <string name="guard_tip_2">You are the current anchor\'s annual guardian \ n the guardian date expires</string>
     <string name="guard_gift_tip">Special gift for annual guard</string>
@@ -1309,5 +1309,9 @@ Limited ride And limited avatar frame</string>
     <string name="the__gifts_in_the_studio">Please make gifts in the studio</string>
     <string name="been_sent">Been sent out</string>
     <string name="been_sent_must">Send out</string>
+    <string name="sett_rigger">At least 2 types of gifts can be set to trigger the wish list special effect gift.     </string>
+    <string name="cancel_ca">cancel</string>
+    <string name="settings_ser">settings</string>
+    <string name="too_many_gifts">Too many gifts</string>
 
 </resources>
diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
index 5ac18d0af..da661857c 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
@@ -79,6 +79,7 @@ import com.yunbao.live.bean.LiveGuardInfo;
 import com.yunbao.live.bean.LiveKsyConfigBean;
 import com.yunbao.live.bean.LiveReceiveGiftBean;
 import com.yunbao.live.dialog.FreePkDialogFragment;
+import com.yunbao.live.dialog.LiveInputDialogFragment;
 import com.yunbao.live.dialog.LiveNewFunctionDialogFragment;
 import com.yunbao.live.dialog.LivePrankDialogFragment;
 import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience;
@@ -1661,6 +1662,22 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                     mLiveRoomViewHolder.showGiftWall(event.getUid(),event.isVoicePress(),event.getUname(),event.getAvatar());
                 }
                 break;
+            case INPUT_DIALOG:
+                LiveInputDialogFragment liveInputDialogFragment = new LiveInputDialogFragment();
+                Bundle liveInputBundle = new Bundle();
+                liveInputBundle.putString(Constants.LIVE_DANMU_PRICE, mDanmuPrice);
+                liveInputBundle.putString(Constants.COIN_NAME, mCoinName);
+                liveInputBundle.putString(Constants.LIVE_UID, mLiveUid);
+                liveInputBundle.putString(Constants.LIVE_STREAM, mStream);
+                liveInputBundle.putString(Constants.LIVE_UID, mLiveUid);
+                if (event.getOlineUserlistModel() == null) {
+                    liveInputBundle.putString("TagUser", "");
+                } else {
+                    liveInputBundle.putString("TagUser", GsonUtils.toJson(event.getOlineUserlistModel()));
+                }
+                liveInputDialogFragment.setArguments(liveInputBundle);
+                liveInputDialogFragment.show(getSupportFragmentManager(), "LiveInputDialogFragment");
+                break;
         }
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
diff --git a/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java b/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
index e0c8e79dd..e07a3d1a3 100644
--- a/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/GiftWallItemPopup.java
@@ -2,6 +2,7 @@ package com.yunbao.live.dialog;
 
 
 import android.content.Context;
+import android.graphics.Color;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -9,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.cardview.widget.CardView;
 
 import com.lxj.xpopup.core.CenterPopupView;
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.GiftWallGiftDetail;
 import com.yunbao.common.bean.GiftWallModel;
@@ -28,6 +30,7 @@ public class GiftWallItemPopup extends CenterPopupView {
     private GiftWallModel giftWallModel;
     private boolean unlit;
     private String mLiveUid, mStream;
+    private boolean isAnchor = false;
 
     public GiftWallItemPopup(@NonNull Context context, GiftWallModel giftWallModel,
                              boolean unlit, String mLiveUid, String mStream) {
@@ -36,6 +39,9 @@ public class GiftWallItemPopup extends CenterPopupView {
         this.unlit = unlit;
         this.mLiveUid = mLiveUid;
         this.mStream = mStream;
+        if (this.mLiveUid.equals(CommonAppConfig.getInstance().getUid())) {
+            isAnchor = true;
+        }
     }
 
     @Override
@@ -60,6 +66,11 @@ public class GiftWallItemPopup extends CenterPopupView {
         } else {
             giftDetailsBtn.setText(getContext().getText(R.string.instant_light));
         }
+        if(isAnchor){
+            giftDetailsBtn.setBackgroundResource(R.drawable.background_skip_unselect_button);
+            giftDetailsBtn.setEnabled(false);
+            giftDetailsBtn.setTextColor(Color.parseColor("#F2F2F2"));
+        }
         ImgLoader.display(getContext(), giftWallModel.getGifticon(), giftImg);
         giftDetails.setText(giftWallModel.getGiftname());
         price.setText(giftWallModel.getNeedcoin());
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java
index c75201359..346b57079 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java
@@ -85,9 +85,6 @@ public class LiveFansGroupSendGiftDialog extends AbsDialogCenterPopupWindow {
                     @Override
                     public void onSuccess(List<FansGroupGiftPack> data) {
                         adapter.setList(data);
-                        if (data.size() == 0) {
-                            dismiss();
-                        }
                     }
 
                     @Override
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
index d3c6bcdf3..f071d7058 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -89,12 +89,13 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * 直播间新送礼弹窗
  */
 public class LiveGiftPopup extends AbsDialogFragment {
-    private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage, namingAvatar;
+    private ImageView gitBackground, nobilityIcon, description, iconArrow, operateImage, namingAvatar, giftItle;
     private JSONArray liveGiftList;
     private TextView diamondText, goldText, liveWrap, vipGoldDesc, vipGoldTitle, giftNumber;
     private RecyclerView giftTitle;
@@ -163,6 +164,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
         vipGoldDesc = mRootView.findViewById(R.id.vipGoldDesc);
         vipGoldTitle = mRootView.findViewById(R.id.vipGoldTitle);
         giftNumber = mRootView.findViewById(R.id.gift_number);
+        giftItle = mRootView.findViewById(R.id.gift_itle);
         liveGiftSend = mRootView.findViewById(R.id.live_gift_send);
         giftNumberLayout = mRootView.findViewById(R.id.gift_number_layout);
         mLianText = mRootView.findViewById(R.id.lian_text);
@@ -317,6 +319,11 @@ public class LiveGiftPopup extends AbsDialogFragment {
                 fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
             }
         });
+        if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+            ImgLoader.display(mContext, R.mipmap.icon_live_gift_gift_itle, giftItle);
+        } else {
+            ImgLoader.display(mContext, R.mipmap.icon_live_gift_gift_itle_en, giftItle);
+        }
     }
 
     private void initDate() {
diff --git a/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java b/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
index 542558451..060ab069a 100644
--- a/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
+++ b/live/src/main/java/com/yunbao/live/views/GiftAlreadyWallFragment.java
@@ -1,5 +1,6 @@
 package com.yunbao.live.views;
 
+import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -11,6 +12,7 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.R;
 import com.yunbao.common.adapter.GiftAlreadyWallAdapter;
 import com.yunbao.common.bean.GiftAlreadyWallModel;
@@ -60,6 +62,11 @@ public class GiftAlreadyWallFragment extends BaseFragment {
         alreadyWallAdapter = new GiftAlreadyWallAdapter();
         alreadyList.setLayoutManager(new GridLayoutManager(getContext(), 3, GridLayoutManager.VERTICAL, false));
         alreadyList.setAdapter(alreadyWallAdapter);
+        if(mLiveUid.equals(CommonAppConfig.getInstance().getUid())){
+            instantLight.setBackgroundResource(R.drawable.background_skip_unselect_button);
+            instantLight.setEnabled(false);
+            instantLight.setTextColor(Color.parseColor("#F2F2F2"));
+        }
         if (isAnchor) {
             unlitIconHint.setText(getContext().getString(R.string.unlit_icon_hint));
         } else {
@@ -82,27 +89,52 @@ public class GiftAlreadyWallFragment extends BaseFragment {
 
     @Override
     protected void loadData() {
-        LiveNetManager.get(getActivity()).
-                giftAlreadyWall(mLiveUid, toUid, new HttpCallback<GiftAlreadyWallModel>() {
-                    @Override
-                    public void onSuccess(GiftAlreadyWallModel data) {
-                        if (data.getGiftWall().size() > 0) {
-                            giftWallNoData.setVisibility(View.GONE);
-                            giftWallData.setVisibility(View.VISIBLE);
-                            alreadyWallAdapter.addAllData(data.getGiftWall());
-                            litIcon.setText(data.getGiftWallLightenNumber());
-                            giftAll.setText("/" + data.getGiftWallLightenTotal());
-                        } else {
-                            giftWallNoData.setVisibility(View.VISIBLE);
-                            giftWallData.setVisibility(View.GONE);
+        if (isAnchor){
+            LiveNetManager.get(getActivity()).
+                    giftAlreadyWall(mLiveUid, toUid, new HttpCallback<GiftAlreadyWallModel>() {
+                        @Override
+                        public void onSuccess(GiftAlreadyWallModel data) {
+                            if (data.getGiftWall().size() > 0) {
+                                giftWallNoData.setVisibility(View.GONE);
+                                giftWallData.setVisibility(View.VISIBLE);
+                                alreadyWallAdapter.addAllData(data.getGiftWall());
+                                litIcon.setText(data.getGiftWallLightenNumber());
+                                giftAll.setText("/" + data.getGiftWallLightenTotal());
+                            } else {
+                                giftWallNoData.setVisibility(View.VISIBLE);
+                                giftWallData.setVisibility(View.GONE);
+                            }
                         }
-                    }
 
-                    @Override
-                    public void onError(String error) {
+                        @Override
+                        public void onError(String error) {
+
+                        }
+                    });
+        }else {
+            LiveNetManager.get(getActivity()).
+                    giftUserSendWall(mLiveUid, toUid, new HttpCallback<GiftAlreadyWallModel>() {
+                        @Override
+                        public void onSuccess(GiftAlreadyWallModel data) {
+                            if (data.getGiftWall().size() > 0) {
+                                giftWallNoData.setVisibility(View.GONE);
+                                giftWallData.setVisibility(View.VISIBLE);
+                                alreadyWallAdapter.addAllData(data.getGiftWall());
+                                litIcon.setText(data.getGiftWallLightenNumber());
+                                giftAll.setText("/" + data.getGiftWallLightenTotal());
+                            } else {
+                                giftWallNoData.setVisibility(View.VISIBLE);
+                                giftWallData.setVisibility(View.GONE);
+                            }
+                        }
+
+                        @Override
+                        public void onError(String error) {
+
+                        }
+                    });
+        }
 
-                    }
-                });
     }
 
     public static GiftAlreadyWallFragment newInstance(String mStream, String mLiveUid, String toUid, boolean isAnchor) {
diff --git a/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
index a36e27ca8..8d5168ed4 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveGiftViewHolder.java
@@ -178,7 +178,10 @@ public class LiveGiftViewHolder extends AbsViewHolder {
             mGiftCount.setText(new LiveTextRender().renderGiftCount(mLianCount));
         }
         mLastGiftKey = bean.getKey();
-        if (!TextUtils.equals(bean.getNamingLiveuid(), "0") && !TextUtils.equals(bean.getNamingUid(), "0")) {
+        if (!TextUtils.isEmpty(bean.getNamingLiveuid()) &&
+                !TextUtils.isEmpty(bean.getNamingUid()) &&
+                !TextUtils.equals(bean.getNamingLiveuid(), "0") &&
+                !TextUtils.equals(bean.getNamingUid(), "0")) {
             root_back.setBackgroundResource(R.drawable.background_naming);
             findViewById(R.id.naming_icon).setVisibility(View.VISIBLE);
         } else {
diff --git a/live/src/main/res/layout/dialog_new_guard_list.xml b/live/src/main/res/layout/dialog_new_guard_list.xml
index 981a39668..75ca884bc 100644
--- a/live/src/main/res/layout/dialog_new_guard_list.xml
+++ b/live/src/main/res/layout/dialog_new_guard_list.xml
@@ -133,7 +133,7 @@
                         android:scrollHorizontally="true"
                         android:singleLine="true"
                         android:textColor="#A281FD"
-                        android:textSize="14sp" />
+                        android:textSize="11sp" />
 
                     <com.yunbao.common.views.weight.MarqueeTextView
                         android:id="@+id/guard_tip2"
@@ -151,7 +151,7 @@
                         android:scrollHorizontally="true"
                         android:singleLine="true"
                         android:textColor="#A281FD"
-                        android:textSize="14sp"
+                        android:textSize="11sp"
                         android:visibility="gone" />
                 </LinearLayout>
 
diff --git a/live/src/main/res/layout/dialog_new_live_user.xml b/live/src/main/res/layout/dialog_new_live_user.xml
index 505984def..62162d177 100644
--- a/live/src/main/res/layout/dialog_new_live_user.xml
+++ b/live/src/main/res/layout/dialog_new_live_user.xml
@@ -71,7 +71,7 @@
                 android:layout_marginStart="1dp"
                 android:text="@string/user_card_guard"
                 android:textColor="#FFFFFF"
-                android:textSize="12sp" />
+                android:textSize="10sp" />
 
             <ImageView
                 android:id="@+id/imageView4"