修改中英文

2023-10-16 16:30:54 +08:00 · 2023-10-14 17:05:14 +08:00 · 2023-10-13 17:48:42 +08:00 · 2023-10-13 16:06:07 +08:00 · 2023-10-13 14:09:34 +08:00 · 2023-10-12 16:19:27 +08:00
605 changed files with 23710 additions and 3222 deletions
--- a/FaceUnity/src/main/res/values-zh-rCN/strings.xml
+++ b/FaceUnity/src/main/res/values-zh-rCN/strings.xml
@@ -1,96 +1,96 @@
 <resources>

    <string name="camera_dialog_title">警告</string>
-    <string name="sorry_no_permission">抱歉，你所使用的证书权限或SDK不包括该功能。</string>
-    <string name="camera_dialog_message">相机权限被禁用或者相机被别的应用占用！</string>
-    <string name="camera_dialog_open">重试</string>
+    <string name="sorry_no_permission">抱歉，你所使用的證書權限或SDK不包括該功能。</string>
+    <string name="camera_dialog_message">相機權限被禁用或者相機被別的應用佔用！</string>
+    <string name="camera_dialog_open">重試</string>
    <string name="camera_dialog_back">退出</string>

    <string name="fu_base_debug">Resolution:\n\t%dX%d\nFPS: %d\nRender time:\n\t%dms</string>
    <string name="save_photo_success">保存照片成功！</string>
-    <string name="save_video_success">保存视频成功！</string>
-    <string name="save_video_failed">保存视频失败！</string>
-    <string name="save_video_too_short">视频太短啦！</string>
-    <string name="save_video_wait">视频处理中请稍等</string>
-    <string name="fu_base_is_tracking_text">未检测到人脸</string>
-    <string name="fu_base_incomplete_face_text">人脸不全</string>
-    <string name="fu_base_input_type_single">单输入</string>
-    <string name="fu_base_input_type_double">双输入</string>
+    <string name="save_video_success">保存視頻成功！</string>
+    <string name="save_video_failed">保存視頻失敗！</string>
+    <string name="save_video_too_short">視頻太短啦！</string>
+    <string name="save_video_wait">視頻處理中請稍等</string>
+    <string name="fu_base_is_tracking_text">未檢測到人臉</string>
+    <string name="fu_base_incomplete_face_text">人臉不全</string>
+    <string name="fu_base_input_type_single">單輸入</string>
+    <string name="fu_base_input_type_double">雙輸入</string>

    <string name="beauty_box_heavy_blur_fine">磨皮</string>
    <string name="beauty_box_color_level">美白</string>
-    <string name="beauty_box_red_level">红润</string>
-    <string name="beauty_box_sharpen">锐化</string>
+    <string name="beauty_box_red_level">紅潤</string>
+    <string name="beauty_box_sharpen">銳化</string>
    <string name="beauty_box_eye_bright">亮眼</string>
    <string name="beauty_box_tooth_whiten">美牙</string>
    <string name="beauty_box_eye_enlarge">大眼</string>
-    <string name="beauty_box_eye_circle">圆眼</string>
+    <string name="beauty_box_eye_circle">圓眼</string>
    <string name="beauty_box_cheek_natural">自然</string>
    <string name="beauty_box_cheek_goddess">女神</string>
-    <string name="beauty_box_cheek_long_face">长脸</string>
-    <string name="beauty_box_cheek_round_face">圆脸</string>
-    <string name="beauty_box_cheek_thinning">瘦脸</string>
-    <string name="beauty_box_cheek_v">V脸</string>
-    <string name="beauty_box_cheek_narrow">窄脸</string>
-    <string name="beauty_box_cheek_short">短脸</string>
-    <string name="beauty_box_cheek_small">小脸</string>
+    <string name="beauty_box_cheek_long_face">長臉</string>
+    <string name="beauty_box_cheek_round_face">圓臉</string>
+    <string name="beauty_box_cheek_thinning">瘦臉</string>
+    <string name="beauty_box_cheek_v">V臉</string>
+    <string name="beauty_box_cheek_narrow">窄臉</string>
+    <string name="beauty_box_cheek_short">短臉</string>
+    <string name="beauty_box_cheek_small">小臉</string>
    <string name="beauty_box_intensity_chin">下巴</string>
-    <string name="beauty_box_intensity_forehead">额头</string>
+    <string name="beauty_box_intensity_forehead">額頭</string>
    <string name="beauty_box_intensity_nose">瘦鼻</string>
    <string name="beauty_box_intensity_mouth">嘴型</string>
-    <string name="beauty_box_cheekbones">瘦颧骨</string>
-    <string name="beauty_box_lower_jaw">瘦下颌骨</string>
-    <string name="beauty_radio_skin_beauty">美肤</string>
+    <string name="beauty_box_cheekbones">瘦顴骨</string>
+    <string name="beauty_box_lower_jaw">瘦下頜骨</string>
+    <string name="beauty_radio_skin_beauty">美膚</string>
    <string name="beauty_radio_face_shape">美型</string>
-    <string name="beauty_radio_filter">滤镜</string>
-    <string name="beauty_radio_style">风格推荐</string>
+    <string name="beauty_radio_filter">濾鏡</string>
+    <string name="beauty_radio_style">風格推薦</string>
    <string name="beauty_micro_pouch">去黑眼圈</string>
-    <string name="beauty_micro_nasolabial">去法令纹</string>
+    <string name="beauty_micro_nasolabial">去法令紋</string>
    <string name="beauty_micro_smile">微笑嘴角</string>
    <string name="beauty_brow_height">眉毛上下</string>
-    <string name="beauty_brow_space">眉间距</string>
-    <string name="beauty_micro_canthus">开眼角</string>
-    <string name="beauty_micro_philtrum">缩人中</string>
-    <string name="beauty_micro_long_nose">长鼻</string>
+    <string name="beauty_brow_space">眉間距</string>
+    <string name="beauty_micro_canthus">開眼角</string>
+    <string name="beauty_micro_philtrum">縮人中</string>
+    <string name="beauty_micro_long_nose">長鼻</string>
    <string name="beauty_micro_eye_space">眼距</string>
    <string name="beauty_micro_eye_rotate">眼睛角度</string>

-    <string name="makeup_radio_lipstick">口红</string>
-    <string name="makeup_radio_blusher">腮红</string>
+    <string name="makeup_radio_lipstick">口紅</string>
+    <string name="makeup_radio_blusher">腮紅</string>
    <string name="makeup_radio_eyebrow">眉毛</string>
    <string name="makeup_radio_eye_shadow">眼影</string>
-    <string name="makeup_radio_eye_liner">眼线</string>
+    <string name="makeup_radio_eye_liner">眼線</string>
    <string name="makeup_radio_eyelash">睫毛</string>
    <string name="makeup_radio_contact_lens">美瞳</string>
    <string name="makeup_radio_foundation">粉底</string>
    <string name="makeup_radio_highlight">高光</string>
-    <string name="makeup_radio_shadow">阴影</string>
-    <string name="makeup_radio_remove">卸妆</string>
-    <string name="makeup_customize">自定义</string>
+    <string name="makeup_radio_shadow">陰影</string>
+    <string name="makeup_radio_remove">卸妝</string>
+    <string name="makeup_customize">自定義</string>
    <string name="makeup_peach_blossom">桃花</string>
    <string name="makeup_boyfriend">男友</string>
    <string name="makeup_clear">清透</string>
    <string name="makeup_grapefruit">西柚</string>
-    <string name="select_data_photo">选择图片</string>
-    <string name="select_data_video">选择视频</string>
-    <string name="select_data_title">请从相册中选择图片或视频</string>
-    <string name="image_file_does_not_exist">所选图片文件不存在。</string>
-    <string name="video_file_does_not_exist">所选视频文件不存在。</string>
+    <string name="select_data_photo">選擇圖片</string>
+    <string name="select_data_video">選擇視頻</string>
+    <string name="select_data_title">請從相冊中選擇圖片或視頻</string>
+    <string name="image_file_does_not_exist">所選圖片文件不存在。</string>
+    <string name="video_file_does_not_exist">所選視頻文件不存在。</string>

-    <string name="future_warrior">张嘴试试</string>
-    <string name="jet_mask">鼓腮帮子</string>
-    <string name="sdx2">皱眉试试</string>
+    <string name="future_warrior">張嘴試試</string>
+    <string name="jet_mask">鼓腮幫子</string>
+    <string name="sdx2">皺眉試試</string>
    <string name="luhantongkuan_ztt_fu">眨一眨眼</string>
-    <string name="qingqing_ztt_fu">嘟嘴试试</string>
-    <string name="xiaobianzi_zh_fu">微笑触发</string>
-    <string name="xiaoxueshen_ztt_fu">吹气触发</string>
-    <string name="hez_ztt_fu">张嘴试试</string>
+    <string name="qingqing_ztt_fu">嘟嘴試試</string>
+    <string name="xiaobianzi_zh_fu">微笑觸發</string>
+    <string name="xiaoxueshen_ztt_fu">吹氣觸發</string>
+    <string name="hez_ztt_fu">張嘴試試</string>
    <string name="push_hand">推出手掌</string>
-    <string name="fu_lm_koreaheart">单手手指比心</string>
-    <string name="ssd_thread_six">比个六</string>
-    <string name="ssd_thread_cute">双拳靠近脸颊卖萌</string>
+    <string name="fu_lm_koreaheart">單手手指比心</string>
+    <string name="ssd_thread_six">比個六</string>
+    <string name="ssd_thread_cute">雙拳靠近臉頰賣萌</string>

-    <string name="origin">原图</string>
+    <string name="origin">原圖</string>
    <string name="bailiang_1">白亮 1</string>
    <string name="bailiang_2">白亮 2</string>
    <string name="bailiang_3">白亮 3</string>
@@ -109,23 +109,23 @@
    <string name="xiaoqingxin_3">小清新 3</string>
    <string name="xiaoqingxin_4">小清新 4</string>
    <string name="xiaoqingxin_6">小清新 6</string>
-    <string name="lengsediao_1">冷色调 1</string>
-    <string name="lengsediao_2">冷色调 2</string>
-    <string name="lengsediao_3">冷色调 3</string>
-    <string name="lengsediao_4">冷色调 4</string>
-    <string name="lengsediao_7">冷色调 7</string>
-    <string name="lengsediao_8">冷色调 8</string>
-    <string name="lengsediao_11">冷色调 11</string>
-    <string name="nuansediao_1">暖色调 1</string>
-    <string name="nuansediao_2">暖色调 2</string>
-    <string name="gexing_1">个性 1</string>
-    <string name="gexing_2">个性 2</string>
-    <string name="gexing_3">个性 3</string>
-    <string name="gexing_4">个性 4</string>
-    <string name="gexing_5">个性 5</string>
-    <string name="gexing_7">个性 7</string>
-    <string name="gexing_10">个性 10</string>
-    <string name="gexing_11">个性 11</string>
+    <string name="lengsediao_1">冷色調 1</string>
+    <string name="lengsediao_2">冷色調 2</string>
+    <string name="lengsediao_3">冷色調 3</string>
+    <string name="lengsediao_4">冷色調 4</string>
+    <string name="lengsediao_7">冷色調 7</string>
+    <string name="lengsediao_8">冷色調 8</string>
+    <string name="lengsediao_11">冷色調 11</string>
+    <string name="nuansediao_1">暖色調 1</string>
+    <string name="nuansediao_2">暖色調 2</string>
+    <string name="gexing_1">個性 1</string>
+    <string name="gexing_2">個性 2</string>
+    <string name="gexing_3">個性 3</string>
+    <string name="gexing_4">個性 4</string>
+    <string name="gexing_5">個性 5</string>
+    <string name="gexing_7">個性 7</string>
+    <string name="gexing_10">個性 10</string>
+    <string name="gexing_11">個性 11</string>
    <string name="heibai_1">黑白 1</string>
    <string name="heibai_2">黑白 2</string>
    <string name="heibai_3">黑白 3</string>
@@ -138,14 +138,14 @@
    <string name="ziran_6">自然 6</string>
    <string name="ziran_7">自然 7</string>
    <string name="ziran_8">自然 8</string>
-    <string name="zhiganhui_1">质感灰 1</string>
-    <string name="zhiganhui_2">质感灰 2</string>
-    <string name="zhiganhui_3">质感灰 3</string>
-    <string name="zhiganhui_4">质感灰 4</string>
-    <string name="zhiganhui_5">质感灰 5</string>
-    <string name="zhiganhui_6">质感灰 6</string>
-    <string name="zhiganhui_7">质感灰 7</string>
-    <string name="zhiganhui_8">质感灰 8</string>
+    <string name="zhiganhui_1">質感灰 1</string>
+    <string name="zhiganhui_2">質感灰 2</string>
+    <string name="zhiganhui_3">質感灰 3</string>
+    <string name="zhiganhui_4">質感灰 4</string>
+    <string name="zhiganhui_5">質感灰 5</string>
+    <string name="zhiganhui_6">質感灰 6</string>
+    <string name="zhiganhui_7">質感灰 7</string>
+    <string name="zhiganhui_8">質感灰 8</string>
    <string name="mitao_1">蜜桃 1</string>
    <string name="mitao_2">蜜桃 2</string>
    <string name="mitao_3">蜜桃 3</string>
@@ -155,85 +155,85 @@
    <string name="mitao_7">蜜桃 7</string>
    <string name="mitao_8">蜜桃 8</string>

-    <string name="beauty_face_style_none">无</string>
-    <string name="beauty_face_style_1">风格 1</string>
-    <string name="beauty_face_style_2">风格 2</string>
-    <string name="beauty_face_style_3">风格 3</string>
-    <string name="beauty_face_style_4">风格 4</string>
-    <string name="beauty_face_style_5">风格 5</string>
-    <string name="beauty_face_style_6">风格 6</string>
-    <string name="beauty_face_style_7">风格 7</string>
-    <string name="beauty_face_style_toast">使用%s先取消“风格推荐”</string>
+    <string name="beauty_face_style_none">無</string>
+    <string name="beauty_face_style_1">風格 1</string>
+    <string name="beauty_face_style_2">風格 2</string>
+    <string name="beauty_face_style_3">風格 3</string>
+    <string name="beauty_face_style_4">風格 4</string>
+    <string name="beauty_face_style_5">風格 5</string>
+    <string name="beauty_face_style_6">風格 6</string>
+    <string name="beauty_face_style_7">風格 7</string>
+    <string name="beauty_face_style_toast">使用%s先取消“風格推薦”</string>

-    <string name="poster_take_photo">对准线框 正脸拍摄</string>
-    <string name="poster_change_face_error">替换失败</string>
-    <string name="poster_template_face_none">未识别模板的人脸，请重新选择模板</string>
-    <string name="dialog_no_track_face">未检测到人脸，请重新拍摄</string>
-    <string name="dialog_no_incomplete_face">人脸不全，请重新拍摄</string>
-    <string name="dialog_face_rotation_not_valid">人脸偏转角度过大，请正脸拍摄。</string>
+    <string name="poster_take_photo">對準線框 正臉拍攝</string>
+    <string name="poster_change_face_error">替換失敗</string>
+    <string name="poster_template_face_none">未識別模板的人臉，請重新選擇模板</string>
+    <string name="dialog_no_track_face">未檢測到人臉，請重新拍攝</string>
+    <string name="dialog_no_incomplete_face">人臉不全，請重新拍攝</string>
+    <string name="dialog_face_rotation_not_valid">人臉偏轉角度過大，請正臉拍攝。</string>
    <string name="dialog_got">知道啦</string>
-    <string name="tip_dual_face">检测到多人，请选择一人进行换脸</string>
+    <string name="tip_dual_face">檢測到多人，請選擇一人進行換臉</string>

    <string name="animoji_filter">Animoji</string>
-    <string name="cartoon_filter">动漫滤镜</string>
+    <string name="cartoon_filter">動漫濾鏡</string>

-    <string name="delete_avatar_model">删除模型</string>
+    <string name="delete_avatar_model">刪除模型</string>
    <string name="new_avatar_model">新建模型</string>
-    <string name="edit_avatar_model">编辑模型</string>
+    <string name="edit_avatar_model">編輯模型</string>

-    <string name="avatar_face_hair">发型</string>
-    <string name="avatar_face_face">脸型</string>
+    <string name="avatar_face_hair">髮型</string>
+    <string name="avatar_face_face">臉型</string>
    <string name="avatar_face_eye">眼睛</string>
    <string name="avatar_face_lip">嘴唇</string>
    <string name="avatar_face_nose">鼻子</string>

-    <string name="avatar_face_length">脸型长度</string>
-    <string name="avatar_face_width">脸颊宽度</string>
-    <string name="avatar_chin_width">下颚宽度</string>
+    <string name="avatar_face_length">臉型長度</string>
+    <string name="avatar_face_width">臉頰寬度</string>
+    <string name="avatar_chin_width">下顎寬度</string>
    <string name="avatar_chin_height">下巴高低</string>
    <string name="avatar_eye_position">眼睛位置</string>
    <string name="avatar_eye_corner_height">眼角高度</string>
    <string name="avatar_eye_height">眼睛高低</string>
-    <string name="avatar_eye_width">眼睛宽窄</string>
+    <string name="avatar_eye_width">眼睛寬窄</string>
    <string name="avatar_nose_position">鼻子位置</string>
-    <string name="avatar_nose_width">鼻翼宽窄</string>
-    <string name="avatar_nose_height">鼻头高低</string>
+    <string name="avatar_nose_width">鼻翼寬窄</string>
+    <string name="avatar_nose_height">鼻頭高低</string>
    <string name="avatar_mouth_position">嘴部位置</string>
    <string name="avatar_up_lip_thickness">上唇厚度</string>
    <string name="avatar_down_lip_thickness">下唇厚度</string>
-    <string name="avatar_lip_width">嘴唇宽度</string>
-    <string name="model_empty_tip">你还没有创建过模型哦</string>
-    <string name="dialog_reset_avatar_model">是否将所有参数恢复到默认值?</string>
-    <string name="avatar_face_customize">自定义</string>
+    <string name="avatar_lip_width">嘴唇寬度</string>
+    <string name="model_empty_tip">你還沒有創建過模型哦</string>
+    <string name="dialog_reset_avatar_model">是否將所有參數恢復到默認值?</string>
+    <string name="avatar_face_customize">自定義</string>
    <string name="avatar_save_succeed">保存成功</string>

-    <string name="live_photo_back_not_save">返回后当前操作将不会被保存哦</string>
-    <string name="live_photo_btn_delete">删除</string>
+    <string name="live_photo_back_not_save">返回后當前操作將不會被保存哦</string>
+    <string name="live_photo_btn_delete">刪除</string>
    <string name="live_photo_btn_cancel">取消</string>
-    <string name="live_photo_btn_delete_">删除(%d)</string>
-    <string name="live_photo_delete_effect">删除道具</string>
-    <string name="live_photo__delete_all">全选</string>
-    <string name="live_photo_empty_list_tip">你还没有创建过道具哦</string>
-    <string name="confirm">确定</string>
+    <string name="live_photo_btn_delete_">刪除(%d)</string>
+    <string name="live_photo_delete_effect">刪除道具</string>
+    <string name="live_photo__delete_all">全選</string>
+    <string name="live_photo_empty_list_tip">你還沒有創建過道具哦</string>
+    <string name="confirm">確定</string>
    <string name="cancel">取消</string>
-    <string name="dialog_confirm_delete">确定删除所选中的道具？</string>
-    <string name="toast_delete_succeed">删除成功</string>
-    <string name="toast_delete_failed">删除失败</string>
+    <string name="dialog_confirm_delete">確定刪除所選中的道具？</string>
+    <string name="toast_delete_succeed">刪除成功</string>
+    <string name="toast_delete_failed">刪除失敗</string>
    <string name="live_photo_save_succeed">道具保存成功</string>
-    <string name="recover">恢复</string>
+    <string name="recover">恢復</string>

-    <string name="makeup_lip_fog">雾面</string>
-    <string name="makeup_lip_moist1">润泽Ⅰ</string>
-    <string name="makeup_lip_moist2">润泽Ⅱ</string>
+    <string name="makeup_lip_fog">霧面</string>
+    <string name="makeup_lip_moist1">潤澤Ⅰ</string>
+    <string name="makeup_lip_moist2">潤澤Ⅱ</string>
    <string name="makeup_lip_pearl">珠光</string>
    <string name="makeup_lip_bitelip">咬唇</string>
-    <string name="makeup_blusher_apple">苹果肌</string>
+    <string name="makeup_blusher_apple">蘋果肌</string>
    <string name="makeup_blusher_fan">扇形</string>
    <string name="makeup_blusher_eye_corner">眼角</string>
    <string name="makeup_blusher_slight_drunk">微醺</string>
    <string name="makeup_highlight_one">高光 I</string>
    <string name="makeup_highlight_two">高光 II</string>
-    <string name="makeup_shadow_one">阴影 I</string>
+    <string name="makeup_shadow_one">陰影 I</string>
    <string name="makeup_pupil_1">蜜糖</string>
    <string name="makeup_pupil_2">奶茶</string>
    <string name="makeup_pupil_3">水波</string>
@@ -241,106 +241,106 @@
    <string name="makeup_pupil_5">孔雀</string>
    <string name="makeup_pupil_6">星河</string>
    <string name="makeup_pupil_7">落目</string>
-    <string name="makeup_pupil_8">极光</string>
-    <string name="makeup_eyebrow_willow">柳叶眉</string>
+    <string name="makeup_pupil_8">極光</string>
+    <string name="makeup_eyebrow_willow">柳恭弘=叶 恭弘眉</string>
    <string name="makeup_eyebrow_wild">野生眉</string>
    <string name="makeup_eyebrow_classical">古典眉</string>
-    <string name="makeup_eyebrow_standard">标准眉</string>
-    <string name="makeup_eye_shadow_single">单色眼影</string>
-    <string name="makeup_eye_shadow_double1">双色眼影 I</string>
-    <string name="makeup_eye_shadow_double2">双色眼影 II</string>
-    <string name="makeup_eye_shadow_double3">双色眼影 III</string>
+    <string name="makeup_eyebrow_standard">標準眉</string>
+    <string name="makeup_eye_shadow_single">單色眼影</string>
+    <string name="makeup_eye_shadow_double1">雙色眼影 I</string>
+    <string name="makeup_eye_shadow_double2">雙色眼影 II</string>
+    <string name="makeup_eye_shadow_double3">雙色眼影 III</string>
    <string name="makeup_eye_shadow_triple1">三色眼影 I</string>
    <string name="makeup_eye_shadow_triple2">三色眼影 II</string>
    <string name="makeup_eyelash_natural1">自然型 I</string>
    <string name="makeup_eyelash_natural2">自然型 II</string>
-    <string name="makeup_eyelash_thick1">浓密型 I</string>
-    <string name="makeup_eyelash_thick2">浓密型 II</string>
-    <string name="makeup_eyelash_exaggerate1">夸张型 I</string>
-    <string name="makeup_eyelash_exaggerate2">夸张型 II</string>
-    <string name="makeup_eye_linear_cat">猫眼</string>
+    <string name="makeup_eyelash_thick1">濃密型 I</string>
+    <string name="makeup_eyelash_thick2">濃密型 II</string>
+    <string name="makeup_eyelash_exaggerate1">誇張型 I</string>
+    <string name="makeup_eyelash_exaggerate2">誇張型 II</string>
+    <string name="makeup_eye_linear_cat">貓眼</string>
    <string name="makeup_eye_linear_drooping">下垂眼</string>
-    <string name="makeup_eye_linear_pull_open">拉开眼距</string>
+    <string name="makeup_eye_linear_pull_open">拉開眼距</string>
    <string name="makeup_eye_linear_pull_close">拉近眼距</string>
-    <string name="makeup_eye_linear_long">长眼</string>
-    <string name="makeup_eye_linear_circular">圆眼</string>
+    <string name="makeup_eye_linear_long">長眼</string>
+    <string name="makeup_eye_linear_circular">圓眼</string>

    <string name="makeup_combination_diadiatu">嗲嗲兔</string>
-    <string name="makeup_combination_dongling">冻龄</string>
-    <string name="makeup_combination_guofeng">国风</string>
+    <string name="makeup_combination_dongling">凍齡</string>
+    <string name="makeup_combination_guofeng">國風</string>
    <string name="makeup_combination_hunxie">混血</string>
    <string name="makeup_combination_sexy">性感</string>
    <string name="makeup_combination_sweet">甜美</string>
-    <string name="makeup_combination_neighbor">邻家</string>
-    <string name="makeup_combination_occident">欧美</string>
-    <string name="makeup_combination_charming">妩媚</string>
-    <string name="makeup_combination_jianling">减龄</string>
+    <string name="makeup_combination_neighbor">鄰家</string>
+    <string name="makeup_combination_occident">歐美</string>
+    <string name="makeup_combination_charming">嫵媚</string>
+    <string name="makeup_combination_jianling">減齡</string>
    <string name="makeup_combination_nuandong">暖冬</string>
-    <string name="makeup_combination_hongfeng">红枫</string>
+    <string name="makeup_combination_hongfeng">紅楓</string>
    <string name="makeup_combination_shaonv">少女</string>
-    <string name="makeup_combination_ziyun">紫韵</string>
-    <string name="makeup_combination_yanshimao">厌世猫</string>
-    <string name="makeup_combination_renyu">人鱼</string>
+    <string name="makeup_combination_ziyun">紫韻</string>
+    <string name="makeup_combination_yanshimao">厭世貓</string>
+    <string name="makeup_combination_renyu">人魚</string>
    <string name="makeup_combination_chuqiu">初秋</string>
-    <string name="makeup_combination_qianzhihe">千纸鹤</string>
+    <string name="makeup_combination_qianzhihe">千紙鶴</string>
    <string name="makeup_combination_chaomo">超模</string>
-    <string name="makeup_combination_chuju">雏菊</string>
-    <string name="makeup_combination_gangfeng">港风</string>
+    <string name="makeup_combination_chuju">雛菊</string>
+    <string name="makeup_combination_gangfeng">港風</string>
    <string name="makeup_combination_rose">Rose</string>

    <string name="slimming">瘦身</string>
-    <string name="long_legs">长腿</string>
-    <string name="thin_waist">细腰</string>
+    <string name="long_legs">長腿</string>
+    <string name="thin_waist">細腰</string>
    <string name="beautify_shoulder">美肩</string>
    <string name="beautify_hip_slim">美臀</string>
-    <string name="beautify_head_slim">小头</string>
+    <string name="beautify_head_slim">小頭</string>
    <string name="beautify_leg_thin_slim">瘦腿</string>
-    <string name="toast_not_detect_body">未检测到人体</string>
-    <string name="pta_human_full_body">全身驱动</string>
-    <string name="pta_human_half_body">半身驱动</string>
+    <string name="toast_not_detect_body">未檢測到人體</string>
+    <string name="pta_human_full_body">全身驅動</string>
+    <string name="pta_human_half_body">半身驅動</string>


-    <string name="select_data_photo_or_video">载入图片或视频</string>
-    <string name="toast_not_detect_gesture">未检测到手势</string>
+    <string name="select_data_photo_or_video">載入圖片或視頻</string>
+    <string name="toast_not_detect_gesture">未檢測到手勢</string>

-    <string name="bg_seg_green_graphic">抠像</string>
+    <string name="bg_seg_green_graphic">摳像</string>
    <string name="bg_seg_green_background">背景</string>
-    <string name="bg_seg_green_key_color">关键颜色</string>
+    <string name="bg_seg_green_key_color">關鍵顏色</string>
    <string name="bg_seg_green_similarity">相似度</string>
    <string name="bg_seg_green_smooth">平滑</string>
    <string name="bg_seg_green_alpha">祛色度</string>
-    <string name="bg_seg_green_safe_area">安全区域</string>
+    <string name="bg_seg_green_safe_area">安全區域</string>
    <string name="bg_seg_green_science">科技</string>
-    <string name="bg_seg_green_beach">沙滩</string>
+    <string name="bg_seg_green_beach">沙灘</string>
    <string name="bg_seg_green_classroom">教室</string>
    <string name="bg_seg_green_forest">森林</string>
-    <string name="bg_seg_green_ink">水墨画</string>
-    <string name="dialog_guide_bg_seg_green">请使用纯色背景拍摄，推荐绿色幕布效果最佳</string>
+    <string name="bg_seg_green_ink">水墨畫</string>
+    <string name="dialog_guide_bg_seg_green">請使用純色背景拍攝，推薦綠色幕布效果最佳</string>
    <string name="dialog_i_know">我知道了</string>

-    <string name="download_error">下载失败</string>
+    <string name="download_error">下載失敗</string>
    <string name="back">返回</string>

-    <string name="safe_area_tips">白色区域为安全区域，不参与绿幕抠像</string>
+    <string name="safe_area_tips">白色區域為安全區域，不參与綠幕摳像</string>

-    <string name="brow_height_tips">眉毛上下功能仅支持在高端机上使用</string>
-    <string name="brow_space_tips">眉间距功能仅支持在高端机上使用</string>
+    <string name="brow_height_tips">眉毛上下功能僅支持在高端機上使用</string>
+    <string name="brow_space_tips">眉間距功能僅支持在高端機上使用</string>


-    <string name="home_function_name_beauty">美颜</string>
-    <string name="home_function_name_makeup">美妆</string>
-    <string name="home_function_name_sticker">贴纸</string>
-    <string name="home_function_name_beauty_body">美体</string>
+    <string name="home_function_name_beauty">美顏</string>
+    <string name="home_function_name_makeup">美妝</string>
+    <string name="home_function_name_sticker">貼紙</string>
+    <string name="home_function_name_beauty_body">美體</string>

-    <string name="toast_not_detect_face">未检测到人脸</string>
-    <string name="toast_not_detect_face_or_body">未检测到人脸或人体</string>
+    <string name="toast_not_detect_face">未檢測到人臉</string>
+    <string name="toast_not_detect_face_or_body">未檢測到人臉或人體</string>

    <string name="makeup_combination_naicha">奶茶</string>
    <string name="makeup_combination_dousha">豆沙</string>
    <string name="makeup_combination_chaoa">超A</string>
-    <string name="home_function_name_big_head">搞笑大头</string>
+    <string name="home_function_name_big_head">搞笑大頭</string>
    <string name="home_function_name_animoji">Animoji</string>
-    <string name="home_function_name_fine_sticker">精品贴纸</string>
+    <string name="home_function_name_fine_sticker">精品貼紙</string>
    <string name="dialog_reset">重置</string>
    <string name="menu_diy">自定義</string>

--- a/FaceUnity/src/main/res/values/strings.xml
+++ b/FaceUnity/src/main/res/values/strings.xml
@@ -16,33 +16,33 @@
    <string name="fu_base_input_type_single">SingleInput</string>
    <string name="fu_base_input_type_double">DualInput</string>

-    <string name="beauty_box_heavy_blur_fine">Fine smooth</string>
-    <string name="beauty_box_color_level">Whiten</string>
-    <string name="beauty_box_red_level">Ruddy</string>
+    <string name="beauty_box_heavy_blur_fine">Buffing</string>
+    <string name="beauty_box_color_level">Skin Tone</string>
+    <string name="beauty_box_red_level">Rosy</string>
    <string name="beauty_box_sharpen">Sharpen</string>
-    <string name="beauty_box_eye_bright">Eye brighten</string>
-    <string name="beauty_box_tooth_whiten">Tooth whiten</string>
-    <string name="beauty_box_eye_enlarge">Eye enlarge</string>
-    <string name="beauty_box_eye_circle">Eye round</string>
-    <string name="beauty_box_cheek_natural">Natural</string>
+    <string name="beauty_box_eye_bright">Brighen</string>
+    <string name="beauty_box_tooth_whiten">Whiten</string>
+    <string name="beauty_box_eye_enlarge">Enlarge</string>
+    <string name="beauty_box_eye_circle">Round</string>
+    <string name="beauty_box_cheek_natural">Origin</string>
    <string name="beauty_box_cheek_goddess">Goddess</string>
    <string name="beauty_box_cheek_long_face">Long face</string>
    <string name="beauty_box_cheek_round_face">Round face</string>
-    <string name="beauty_box_cheekbones">Cheekbone</string>
-    <string name="beauty_box_lower_jaw">Jawbone</string>
-    <string name="beauty_box_cheek_thinning">Cheek thin</string>
-    <string name="beauty_box_cheek_v">V face</string>
-    <string name="beauty_box_cheek_narrow">CheekNarrow</string>
-    <string name="beauty_box_cheek_short">Cheek short</string>
-    <string name="beauty_box_cheek_small">Cheek small</string>
-    <string name="beauty_box_intensity_chin">Chin</string>
-    <string name="beauty_box_intensity_forehead">Forehead</string>
-    <string name="beauty_box_intensity_nose">Nose</string>
-    <string name="beauty_box_intensity_mouth">Mouth</string>
-    <string name="beauty_radio_skin_beauty">Skin</string>
-    <string name="beauty_radio_face_shape">Reshape</string>
+    <string name="beauty_box_cheekbones">Cheek</string>
+    <string name="beauty_box_lower_jaw">Jaw</string>
+    <string name="beauty_box_cheek_thinning">Lower Width</string>
+    <string name="beauty_box_cheek_v">V Shape</string>
+    <string name="beauty_box_cheek_narrow">Upper Width</string>
+    <string name="beauty_box_cheek_short">Short Face</string>
+    <string name="beauty_box_cheek_small">Size Face</string>
+    <string name="beauty_box_intensity_chin">Chin Length</string>
+    <string name="beauty_box_intensity_forehead">Hairline</string>
+    <string name="beauty_box_intensity_nose">Nose Size</string>
+    <string name="beauty_box_intensity_mouth">Mouth Size</string>
+    <string name="beauty_radio_skin_beauty">Skincare</string>
+    <string name="beauty_radio_face_shape">Beauty type</string>
    <string name="beauty_radio_filter">Filter</string>
-    <string name="beauty_radio_style">Presets</string>
+    <string name="beauty_radio_style">Style recommend</string>
    <string name="makeup_radio_lipstick">Lipstick</string>
    <string name="makeup_radio_blusher">Blush</string>
    <string name="makeup_radio_eyebrow">Eyebrow</string>
@@ -59,16 +59,16 @@
    <string name="makeup_boyfriend">Boyfriend</string>
    <string name="makeup_clear">Clear</string>
    <string name="makeup_grapefruit">Grapefruit</string>
-    <string name="beauty_micro_pouch">Circle</string>
-    <string name="beauty_micro_nasolabial">Wrinkles</string>
+    <string name="beauty_micro_pouch">Dark Circles</string>
+    <string name="beauty_micro_nasolabial">Laugh Line</string>
    <string name="beauty_micro_smile">Smile</string>
-    <string name="beauty_brow_height">Brow height</string>
-    <string name="beauty_brow_space">Brow space</string>
-    <string name="beauty_micro_canthus">Canthus</string>
-    <string name="beauty_micro_philtrum">Philtrum</string>
-    <string name="beauty_micro_long_nose">Length</string>
-    <string name="beauty_micro_eye_space">Eye distance</string>
-    <string name="beauty_micro_eye_rotate">Slant</string>
+    <string name="beauty_brow_height">Brow Position</string>
+    <string name="beauty_brow_space">Brow Distance</string>
+    <string name="beauty_micro_canthus">Inner Corner</string>
+    <string name="beauty_micro_philtrum">Mouth Position</string>
+    <string name="beauty_micro_long_nose">Nose Lift</string>
+    <string name="beauty_micro_eye_space">Eye Distance</string>
+    <string name="beauty_micro_eye_rotate">Eye Upturn</string>
    <string name="beauty_face_style_none">None</string>
    <string name="beauty_face_style_1">Style 1</string>
    <string name="beauty_face_style_2">Style 2</string>
@@ -77,7 +77,7 @@
    <string name="beauty_face_style_5">Style 5</string>
    <string name="beauty_face_style_6">Style 6</string>
    <string name="beauty_face_style_7">Style 7</string>
-    <string name="beauty_face_style_toast">To use %s, cancel \'Presets\' first.</string>
+    <string name="beauty_face_style_toast">To use %s, cancel \'Style recommend\' first.</string>

    <string name="select_data_photo">Photo</string>
    <string name="select_data_video">Video</string>
--- a/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java
+++ b/Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java
@@ -99,7 +99,7 @@ public class InvitePopDialog extends AbsDialogPopupWindow {
        list.setAdapter(adapter);
        initData();
        link.setText(url.substring(0, 40));
-        info.setText(R.string.dialog_invite_info);
+        info.setText(mContext.getString(R.string.dialog_invite_info));
        avatar.setImageResource(R.mipmap.ic_launcher);
        //title.setTextColor(getContext().getResources().getColorStateList(R.drawable.bg_invite_title));
        title.setText(R.string.dialog_invite_title);
--- a/Share/src/main/java/com/yunbao/share/ui/SharePopDialog.java
+++ b/Share/src/main/java/com/yunbao/share/ui/SharePopDialog.java
@@ -19,8 +19,8 @@ import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
-import com.yunbao.share.bean.ShareBuilder;
 import com.yunbao.share.adapters.ShareAppAdapter;
+import com.yunbao.share.bean.ShareBuilder;

 import java.util.ArrayList;
 import java.util.List;
@@ -64,7 +64,7 @@ public class SharePopDialog extends AbsDialogPopupWindow {
    }

    public SharePopDialog setShareLink(String link) {
-        this.shareLink = link;
+        this.shareLink = link + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
        return this;
    }

@@ -113,6 +113,7 @@ public class SharePopDialog extends AbsDialogPopupWindow {
                url = shareLink;
            }
        }
+        url = url + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
        link.setText(url);
        info.setText(String.format(getContext().getString(R.string.dialog_share_info), StringUtil.isEmpty(anchorName) ? "" : anchorName));
        ImgLoader.display(getContext(), anchorAvatar, avatar);
@@ -139,7 +140,7 @@ public class SharePopDialog extends AbsDialogPopupWindow {
            url = ShareBuilder.createLiveShareLink(uid, anchorId, anchorName, anchorAvatar);
        }
        ClipboardManager cm = (ClipboardManager) getContext().getSystemService(CLIPBOARD_SERVICE);
-        ClipData clipData = ClipData.newPlainText("text",info.getText().toString()+"\n"+url);
+        ClipData clipData = ClipData.newPlainText("text", info.getText().toString() + "\n" + url + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0));
        cm.setPrimaryClip(clipData);
        ToastUtil.show(getContext().getString(com.yunbao.common.R.string.copy_success));
    }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -235,4 +235,45 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 }
 -keep class com.faceunity.wrapper.faceunity$LoadConfig*{
   private static boolean sLoadedLibrary;
-}
+}
+-keep class com.umeng.** {*;}
+
+-keep class org.repackage.** {*;}
+
+-keep class com.uyumao.** { *; }
+
+-keepclassmembers class * {
+   public <init> (org.json.JSONObject);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+#----svga
+-keep class com.opensource.svgaplayer.**{
+    public <methods>;
+    public static <fields>;
+}
+# json序列化的混淆
+-keep class tech.sud.mgp.hello.ui.scenes.ticket.model.** {*;}
+-keep class tech.sud.mgp.hello.service.game.req.** {*;}
+-keep class tech.sud.mgp.hello.service.game.resp.** {*;}
+-keep class tech.sud.mgp.hello.service.login.req.** {*;}
+-keep class tech.sud.mgp.hello.service.login.resp.** {*;}
+-keep class tech.sud.mgp.hello.service.main.req.** {*;}
+-keep class tech.sud.mgp.hello.service.main.resp.** {*;}
+-keep class tech.sud.mgp.hello.service.main.config.** {*;}
+-keep class tech.sud.mgp.hello.service.room.req.** {*;}
+-keep class tech.sud.mgp.hello.service.room.resp.** {*;}
+-keep class tech.sud.mgp.hello.service.room.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.main.home.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.scenes.base.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.scenes.common.cmd.** {*;}
+-keep class tech.sud.mgp.hello.ui.scenes.custom.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.scenes.orderentertainment.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.main.settings.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.main.nft.model.** {*;}
+-keep class tech.sud.mgp.hello.common.event.model.** {*;}
+
+-keep class com.yunbao.common.sud.** {*;}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,8 @@
    <uses-permission
        android:name="android.permission.CALL_PHONE"
        tools:node="remove" />
-    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"
+    <uses-permission
+        android:name="android.permission.CHANGE_CONFIGURATION"
        tools:ignore="ProtectedPermissions" />
    <uses-permission
        android:name="android.permission.READ_LOGS"
@@ -62,6 +63,9 @@
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.FLASHLIGHT" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission
@@ -81,12 +85,12 @@
    <uses-permission android:name="com.android.vending.BILLING" />
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <!-- Android11新增 -->
-<!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
-<!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
+    <!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
+    <!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
    <queries>
-        <package android:name="com.twitter.android"/>
-        <package android:name="jp.naver.line.android"/>
+        <package android:name="com.twitter.android" />
+        <package android:name="jp.naver.line.android" />

    </queries>
    <application
@@ -95,30 +99,30 @@
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:largeHeap="true"
-        android:supportsRtl="true"
        android:preserveLegacyExternalStorage="true"
        android:requestLegacyExternalStorage="true"
+        android:supportsRtl="true"
        android:theme="@style/AppTheme"
        tools:replace="theme,label,icon,allowBackup">
-<!--        <service-->
-<!--            android:name="com.shayu.phonelive.utils.MyNotificationService">-->
-<!--            <intent-filter>-->
-<!--                <action android:name="com.google.firebase.MESSAGING_EVENT" />-->
-<!--            </intent-filter>-->
-<!--        </service>-->
+        <!--        <service-->
+        <!--            android:name="com.shayu.phonelive.utils.MyNotificationService">-->
+        <!--            <intent-filter>-->
+        <!--                <action android:name="com.google.firebase.MESSAGING_EVENT" />-->
+        <!--            </intent-filter>-->
+        <!--        </service>-->
        <service
            android:name="io.rong.push.platform.google.RongFirebaseMessagingService"
-            android:stopWithTask="false"
-            android:exported="false">
+            android:exported="false"
+            android:stopWithTask="false">
            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
            </intent-filter>
        </service>
        <activity
            android:name="com.shayu.phonelive.activity.LauncherActivity"
+            android:exported="true"
            android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity"
-            android:exported="true">
+            tools:ignore="LockedOrientationActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

@@ -130,7 +134,8 @@
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />

-                <data android:scheme="smvslm" />
+
+                <data android:scheme="um.64e40ee55488fe7b3afa2c96" />
            </intent-filter>
        </activity>

@@ -162,13 +167,16 @@
        <meta-data
            android:name="com.facebook.sdk.ClientToken"
            android:value="@string/facebook_client_token" />
-        <meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="false"/>
+        <meta-data
+            android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
+            android:value="false" />
        <meta-data
            android:name="firebase_messaging_auto_init_enabled"
            android:value="false" />
        <meta-data
            android:name="firebase_analytics_collection_enabled"
            android:value="false" />
+
        <receiver
            android:name="com.shayu.phonelive.utils.CustomMessageReceiver"
            android:exported="true">
@@ -186,12 +194,12 @@
                <action android:name="com.huawei.push.action.MESSAGING_EVENT" />
            </intent-filter>
        </service>
-<!--        <meta-data-->
-<!--            android:name="com.huawei.hms.client.appid"-->
-<!--            android:value="106936673"/>-->
-<!--        <meta-data-->
-<!--            android:name="com.huawei.hms.client.cpid"-->
-<!--            android:value="30086000612391734"/>-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.client.appid"-->
+        <!--            android:value="106936673"/>-->
+        <!--        <meta-data-->
+        <!--            android:name="com.huawei.hms.client.cpid"-->
+        <!--            android:value="30086000612391734"/>-->
    </application>

 </manifest>
--- a/app/src/main/java/com/shayu/phonelive/AppContext.java
+++ b/app/src/main/java/com/shayu/phonelive/AppContext.java
@@ -19,6 +19,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 import com.alibaba.android.arouter.launcher.ARouter;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.blankj.utilcode.util.Utils;
 import com.facebook.appevents.AppEventsLogger;
 import com.fm.openinstall.OpenInstall;
@@ -30,10 +32,13 @@ import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
 import com.tencent.imsdk.v2.V2TIMManager;
 import com.tencent.imsdk.v2.V2TIMSimpleMsgListener;
 import com.tencent.imsdk.v2.V2TIMUserInfo;
+import com.umeng.analytics.MobclickAgent;
+import com.umeng.commonsdk.UMConfigure;
 import com.yunbao.common.BuildConfig;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
+import com.yunbao.common.bean.AnchorStartLiveBean;
 import com.yunbao.common.bean.CrashSaveBean;
 import com.yunbao.common.manager.imrongcloud.InstructorSendReward;
 import com.yunbao.common.manager.imrongcloud.InstructorSendRewardProvider;
@@ -44,6 +49,7 @@ import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.live.socket.SocketReceiveBean;
 import com.yunbao.live.socket.SocketRyClient;
 import com.yunbao.live.utils.LiveImDeletUtil;
 import com.yunbao.live.views.PortraitLiveManager;
@@ -131,12 +137,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();
@@ -165,8 +165,23 @@ public class AppContext extends CommonAppContext {
        if (isMainProcess()) {
            OpenInstall.init(this);
        }
+        //设置LOG开关，默认为false
+        UMConfigure.setLogEnabled(true);


+        //友盟正式初始化
+        UMConfigure.init(getApplicationContext(), "64e40ee55488fe7b3afa2c96", "PDLive", UMConfigure.DEVICE_TYPE_PHONE,
+                "64e40ee55488fe7b3afa2c96");
+
+        //集成umeng-crash-vx.x.x.aar，则需要关闭原有统计SDK异常捕获功能
+        MobclickAgent.setCatchUncaughtExceptions(false);
+        //PushSDK初始化(如使用推送SDK，必须调用此方法)
+
+        //统计SDK是否支持采集在子进程中打点的自定义事件，默认不支持
+        UMConfigure.setProcessEvent(true);//支持多进程打点
+        MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
+        UMConfigure.submitPolicyGrantResult(getApplicationContext(), true);
+
        registerActivityLifecycleCallbacks(new AdjustLifecycleCallbacks());
        //初始化 AndroidUtilCode
        Utils.init(this);
@@ -201,11 +216,16 @@ public class AppContext extends CommonAppContext {
                                    && (TextUtils.equals("__system__", message.getTargetId())
                                    || ("g" + PortraitLiveManager.liveID).contains(message.getTargetId()))) {
                                SocketRyClient.mSocketHandler.sendMessage(msg);
+                            } else if (content.getContent().contains("LivePK_anchorStartLiveNotify")) {//开播通知
+                                SocketReceiveBean received = JSON.parseObject(content.getContent(), SocketReceiveBean.class);
+                                JSONObject map = received.getMsg().getJSONObject(0);
+                                sendStartAnchorLive(map);
                            }
                            //主播页面
                            if (TextUtils.isEmpty(PortraitLiveManager.liveID) && SocketRyClient.mSocketHandler != null) {
                                SocketRyClient.mSocketHandler.sendMessage(msg);
                            }
+
                        } else if (message.getConversationType() == Conversation.ConversationType.PRIVATE) {//私聊信息
                            EventBus.getDefault().post(message);
                        }
@@ -215,6 +235,14 @@ public class AppContext extends CommonAppContext {
                }
                return false;
            }
+
+            private void sendStartAnchorLive(JSONObject map) {
+                AnchorStartLiveBean bean = new AnchorStartLiveBean();
+                bean.setAnchorName(map.getString("anchorName"));
+                bean.setRoomId(map.getString("roomid"));
+                bean.setAvatar(map.getString("avatar"));
+                EventBus.getDefault().post(bean);
+            }
        });


@@ -322,7 +350,7 @@ public class AppContext extends CommonAppContext {
    }


-    private void setFirebaseCrashData() {
+    public static void setFirebaseCrashData() {
        if (!CommonAppConfig.IS_UPLOAD_ERROR_LOG) {
            return;
        }
--- a/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java
+++ b/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java
@@ -8,11 +8,13 @@ import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;

+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.yunbao.common.BuildConfig;
 import com.yunbao.common.bean.CrashSaveBean;
 import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.FileUtil;
 import com.yunbao.common.utils.SpUtil;
+import com.yunbao.common.utils.ToastUtil;

 import java.io.File;
 import java.io.PrintWriter;
@@ -105,7 +107,8 @@ public class NeverCrashUtils {
                        Log.e(TAG, "未捕获的主线程异常行为", e);
                    }
                    e.printStackTrace();
-
+                    AppContext.setFirebaseCrashData();
+                    FirebaseCrashlytics.getInstance().recordException(e);
                    AppManager.runDebugCode(() -> Toast.makeText(application, "发生闪退:" + e.getMessage(), Toast.LENGTH_SHORT).show());
                    FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()), throwableToString(e), "error.log");
                    getMainCrashHandler().mainException(Looper.getMainLooper().getThread(), e);
--- a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
+++ b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
@@ -229,8 +229,11 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                    } else {
                        checkUidAndToken();
                    }
+                }else{
+                    ToastUtil.show(getString(R.string.net_error));
                }
            }
+
        });
    }

--- a/build.gradle
+++ b/build.gradle
@@ -11,6 +11,7 @@ buildscript {
        maven { url 'https://maven.aliyun.com/repository/google' }
        maven { url 'https://maven.fabric.io/public' }
        maven { url 'http://maven.faceunity.com/repository/maven-public/' }//美颜库
+        maven { url 'https://repo1.maven.org/maven2/' }//埋点
        google()
        mavenCentral()
    }
@@ -41,6 +42,7 @@ allprojects {
        maven { url 'https://maven.fabric.io/public' }
        maven { url 'http://maven.faceunity.com/repository/maven-public/' }//美颜库
        maven { url "https://jitpack.io" }
+        maven { url 'https://repo1.maven.org/maven2/' }//埋点
        google()  // Google's Maven repository
    }
 }
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -179,7 +179,7 @@ dependencies {
    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
    api 'com.jakewharton.rxbinding3:rxbinding:3.1.0'
    //loading样式库
-    api  'com.wang.avi:library:2.1.3'
+    api 'com.wang.avi:library:2.1.3'
    api 'com.google.firebase:firebase-messaging:23.0.6'
    api 'com.google.firebase:firebase-analytics:21.1.0'
 //    api 'com.huawei.hms:push:4.0.2.300'
@@ -196,4 +196,14 @@ dependencies {
    api 'com.github.gzu-liyujiang.AndroidPicker:WheelView:4.1.11'
    //自定义圆角图片
    api 'com.makeramen:roundedimageview:2.3.0'
+    // 友盟统计SDK
+    api 'com.umeng.umsdk:common:9.6.3'// 必选
+    api 'com.umeng.umsdk:asms:1.8.0'// 必选
+    api 'com.umeng.umsdk:uyumao:1.1.2'
+    //高级运营分析功能依赖库，使用卸载分析、开启反作弊能力请务必集成，以免影响高级功能使用。common需搭配v9.6.3及以上版本，asms需搭配v1.7.0及以上版本。需更新隐私声明。
+    // 标准版本SudMGP SDK
+    api 'tech.sud.mgp:SudMGP:1.3.3.1158'
+
+    // 多语言语音识别扩展库(可选)
+    api 'tech.sud.mgp:SudASR:1.3.3.1158'
 }
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -1,16 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
    package="com.yunbao.common">

-<!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
-<!--    <uses-permission android:name="android.permission.INTERNET" />-->
-<!--    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />-->
+    <!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
+    <!--    <uses-permission android:name="android.permission.INTERNET" />-->
+    <!--    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />-->

    <application android:allowBackup="true">

-<!--        <meta-data-->
-<!--            android:name="com.google.ar.core"-->
-<!--            android:value="optional" />-->
+        <!--        <meta-data-->
+        <!--            android:name="com.google.ar.core"-->
+        <!--            android:value="optional" />-->

        <activity
            android:name="com.yunbao.common.activity.WebViewActivity"
@@ -32,23 +31,23 @@
                android:resource="@xml/file_paths" />
        </provider>

-<!--
+        <!--

-        支付宝
-        <activity
-            android:name="com.alipay.sdk.app.H5PayActivity"
-            android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize|stateHidden"></activity>
-        <activity
-            android:name="com.alipay.sdk.app.H5AuthActivity"
-            android:configChanges="orientation|keyboardHidden|navigation"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize|stateHidden"></activity>
-        支付宝 end
-->
+                支付宝
+                <activity
+                    android:name="com.alipay.sdk.app.H5PayActivity"
+                    android:configChanges="orientation|keyboardHidden|navigation|screenSize"
+                    android:exported="false"
+                    android:screenOrientation="portrait"
+                    android:windowSoftInputMode="adjustResize|stateHidden"></activity>
+                <activity
+                    android:name="com.alipay.sdk.app.H5AuthActivity"
+                    android:configChanges="orientation|keyboardHidden|navigation"
+                    android:exported="false"
+                    android:screenOrientation="portrait"
+                    android:windowSoftInputMode="adjustResize|stateHidden"></activity>
+                支付宝 end
+        -->

        <activity
            android:name="com.yunbao.common.activity.ErrorActivity"
@@ -57,6 +56,9 @@
        <activity
            android:name="com.yunbao.common.activity.SelectImageActivity"
            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.yunbao.common.activity.SudGameActivity"
+            android:screenOrientation="portrait" />

        <activity
            android:name="com.yunbao.common.activity.PreviewImageActivity"
--- a/common/src/main/java/com/yunbao/common/CommonAppConfig.java
+++ b/common/src/main/java/com/yunbao/common/CommonAppConfig.java
@@ -7,6 +7,7 @@ import android.os.Environment;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yunbao.common.bean.ConfigBean;
@@ -19,6 +20,7 @@ import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.WordUtil;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -78,8 +80,6 @@ public class CommonAppConfig {
    public static int alert_end_time = 1;


-
-
    private CommonAppConfig() {

    }
@@ -148,6 +148,7 @@ public class CommonAppConfig {
        }
        return Constants.DIAMONDS;
    }
+
    public String getGoldCoinName() {
        ConfigBean configBean = getConfig();
        if (configBean != null) {
@@ -183,12 +184,19 @@ public class CommonAppConfig {
        if (configBean != null) {
            callback.callback(configBean);
        } else {
-            CommonHttpUtil.getConfig(null,callback);
+            CommonHttpUtil.getConfig(null, callback);
        }
    }

+    private String[][] liveType = null;
+
+    public String[][] getLiveType() {
+        return liveType;
+    }
+
    public void setConfig(ConfigBean config) {
        mConfig = config;
+        liveType = config.getLiveType();
    }

    /**
@@ -385,13 +393,12 @@ public class CommonAppConfig {
    public String getAppName() {
        if (TextUtils.isEmpty(mAppName)) {
            int res = CommonAppContext.sInstance.getResources().getIdentifier("app_name", "string", "myname.pdlive.shayu");
-            mAppName =WordUtil.getString(res);
+            mAppName = WordUtil.getString(res);
        }
        return mAppName;
    }


-
    /**
     * 获取App图标的资源id
     */
@@ -447,9 +454,10 @@ public class CommonAppConfig {
        } catch (PackageManager.NameNotFoundException e) {
            e.printStackTrace();
        }
-        Log.i("tag","url:"+res);
+        Log.i("tag", "url:" + res);
        return res;
    }
+
    private static boolean getMetaDataBoolean(String key) {
        boolean res = false;
        try {
@@ -670,40 +678,45 @@ public class CommonAppConfig {
    public void setBeautySdkType(String sproutType) {
        SpUtil.getInstance().setStringValue(SpUtil.BEAUTY_SDK_TYPE, sproutType);
    }
+
    public String getBeautySdkType() {
-        return   SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_SDK_TYPE);
+        return SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_SDK_TYPE);
    }

    //设置是否显示转盘功能
    public void setTurnTableEnable(String enable) {
        SpUtil.getInstance().setStringValue(SpUtil.TURNTABLE_ENABLE, enable);
    }
+
    public String getTurnTableEnable() {
-        return   SpUtil.getInstance().getStringValue(SpUtil.TURNTABLE_ENABLE);
+        return SpUtil.getInstance().getStringValue(SpUtil.TURNTABLE_ENABLE);
    }

    //设置360美颜贴纸下载地址
    public void setBeauty360TieZhiUrl(String tieZhiUrl) {
        SpUtil.getInstance().setStringValue(SpUtil.BEAUTY_360_TIEZHI_URL, tieZhiUrl);
    }
+
    public String getBeauty360TieZhiUrl() {
-        return   SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_360_TIEZHI_URL);
+        return SpUtil.getInstance().getStringValue(SpUtil.BEAUTY_360_TIEZHI_URL);
    }

    //360贴纸已经下载过
    public void setBeauty360TieZhiExist(boolean isExist) {
        SpUtil.getInstance().setBooleanValue(SpUtil.BEAUTY_360_TIEZHI_EXIST, isExist);
    }
+
    public boolean getBeauty360TieZhiExist() {
-        return   SpUtil.getInstance().getBooleanValue(SpUtil.BEAUTY_360_TIEZHI_EXIST);
+        return SpUtil.getInstance().getBooleanValue(SpUtil.BEAUTY_360_TIEZHI_EXIST);
    }

    //设置主播pk时间
-    public void setAnchorPkTime(String pkTime){
+    public void setAnchorPkTime(String pkTime) {
        SpUtil.getInstance().setStringValue(SpUtil.ANCHOR_PK_TIME, pkTime);
    }
-    public String getAnchorPkTime(){
-       return SpUtil.getInstance().getStringValue(SpUtil.ANCHOR_PK_TIME);
+
+    public String getAnchorPkTime() {
+        return SpUtil.getInstance().getStringValue(SpUtil.ANCHOR_PK_TIME);
    }

 }
--- a/common/src/main/java/com/yunbao/common/Constants.java
+++ b/common/src/main/java/com/yunbao/common/Constants.java
@@ -185,6 +185,7 @@ public class Constants {
    public static final String LIVE_PK_END = "endPK";//结束PK，以这个PK获取到的参数为准
    public static final String RED_PACKET = "RedPacket";//红包通知
    public static final String RED_PACKET_SUPER_JACKPOT = "RedPacketSuperJackpot";//超级红包通知
+    public static final String SOCKET_LIVE_MSG_TO_USER = "SendMsgToUser";//七日用户主播提示语

    //游戏socket
    public static final String SOCKET_GAME_ZJH = "startGame";//炸金花
--- a/common/src/main/java/com/yunbao/common/activity/AbsActivity.java
+++ b/common/src/main/java/com/yunbao/common/activity/AbsActivity.java
@@ -24,6 +24,7 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;

+import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.R;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.interfaces.LifeCycleListener;
@@ -178,11 +179,15 @@ public abstract class AbsActivity extends AppCompatActivity {
        }
        //友盟统计
 //        MobclickAgent.onResume(this);
+        MobclickAgent.onPageStart(this.mTag);
+        Log.e("MobclickAgent","MobclickAgent:_onResume_"+this.mTag);
    }

    @Override
    protected void onPause() {
        super.onPause();
+        MobclickAgent.onPageEnd(this.mTag);
+        Log.e("MobclickAgent","MobclickAgent:_onPause_"+this.mTag);
        if (mLifeCycleListeners != null) {
            for (LifeCycleListener listener : mLifeCycleListeners) {
                listener.onPause();
@@ -376,4 +381,5 @@ public abstract class AbsActivity extends AppCompatActivity {
                break;
        }
    }
+
 }
--- a/common/src/main/java/com/yunbao/common/activity/SudGameActivity.java
+++ b/common/src/main/java/com/yunbao/common/activity/SudGameActivity.java
@@ -0,0 +1,150 @@
+package com.yunbao.common.activity;
+
+import android.app.Activity;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.lifecycle.Observer;
+
+import com.google.gson.Gson;
+import com.makeramen.roundedimageview.RoundedImageView;
+import com.yunbao.common.R;
+import com.yunbao.common.bean.CheckRemainingBalance;
+import com.yunbao.common.bean.CreateSudRoomModel;
+import com.yunbao.common.event.CheckRemainingBalanceEvent;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.sud.QuickStartGameViewModel;
+import com.yunbao.common.sud.model.GameConfigModel;
+import com.yunbao.common.sud.state.SudMGPMGState;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.List;
+import java.util.Locale;
+
+public class SudGameActivity extends AbsActivity {
+    private FrameLayout gameContainer;
+    private long mInteractionID;
+    private String mLiveUid;
+    private final QuickStartGameViewModel gameViewModel = new QuickStartGameViewModel(); // 创建ViewModel
+
+    private CreateSudRoomModel mCreateSudRoomModel;
+    private TextView gameTitle, roomName, roomNumber;
+    private RoundedImageView mAvatar;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_sud_game;
+    }
+
+    @Override
+    protected void main() {
+        Bus.getOn(this);
+        super.main();
+        initView();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Bus.getOff(this);
+        super.onDestroy();
+    }
+
+    private void initView() {
+        String createSudRoomJson = getIntent().getStringExtra("CreateSudRoom");
+        mCreateSudRoomModel = new Gson().fromJson(createSudRoomJson, CreateSudRoomModel.class);
+        mInteractionID = mCreateSudRoomModel.getLongSudGameId();
+        mLiveUid = mCreateSudRoomModel.getSudGameRoomId();
+
+        gameContainer = findViewById(R.id.game_container);
+        gameTitle = findViewById(R.id.game_title);
+        roomName = findViewById(R.id.room_name);
+        roomNumber = findViewById(R.id.room_number);
+        mAvatar = findViewById(R.id.avatar);
+        if (mCreateSudRoomModel != null) {
+            gameTitle.setText(mCreateSudRoomModel.getSudGameName());
+            roomName.setText(mCreateSudRoomModel.getRoomName());
+            roomNumber.setText(mCreateSudRoomModel.getSudGameRoomId());
+            ImgLoader.display(mContext, mCreateSudRoomModel.getAvatar(), mAvatar);
+        }
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.exit), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                gameViewModel.onDestroy();
+                finish();
+            }
+        });
+        gameViewModel.gameViewLiveData.observe(this, new Observer<View>() {
+            @Override
+            public void onChanged(View view) {
+                if (view == null) { // 在关闭游戏时，把游戏View给移除
+                    gameContainer.removeAllViews();
+                } else { // 把游戏View添加到容器内
+                    gameContainer.addView(view, FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT);
+                }
+            }
+        });
+        // 加载游戏，参数定义可查看BaseGameViewModel.switchGame()方法注释
+        // 游戏配置
+        GameConfigModel gameConfigModel = gameViewModel.getGameConfigModel();
+        gameConfigModel.ui.ping.hide = true; // 配置不隐藏ping值
+        gameConfigModel.ui.level.hide = true; // 配置不隐藏ping值
+
+        gameConfigModel.ui.lobby_players.custom = true;
+        gameConfigModel.ui.join_btn.custom = true;
+
+        // SudMGP平台64bit游戏ID
+        gameViewModel.switchGame((Activity) mContext, mLiveUid, mInteractionID);
+//        gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, -1, true, 1);
+//        gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfCaptain(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()));
+//        ViewClicksAntiShake.clicksAntiShake(gameTitle, new ViewClicksAntiShake.ViewClicksCallBack() {
+//            @Override
+//            public void onViewClicks() {
+//
+//            }
+//        });
+
+
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onCheckRemainingBalanceEvent(CheckRemainingBalanceEvent event) {
+        if (event.getResults().size() > 0) {
+            gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(false, event.getSeatIndex(), true, 1);
+        } else {
+            LiveNetManager.get(mContext).checkRemainingBalance(mCreateSudRoomModel.getSudGameRoomId(), new HttpCallback<CheckRemainingBalance>() {
+                @Override
+                public void onSuccess(CheckRemainingBalance data) {
+                    if (data.getGoldenBeanRemainingBalance() == 1) {
+                        gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(true, event.getSeatIndex(), true, 1);
+                    } else {
+                        if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                            ToastUtil.show("金豆不够 ");
+                        }else {
+                            ToastUtil.show("Insufficient money ");
+                        }
+                    }
+                }
+
+                @Override
+                public void onError(String error) {
+                    if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                        ToastUtil.show("金豆不够 ");
+                    }else {
+                        ToastUtil.show("Insufficient money ");
+                    }
+                }
+            });
+        }
+
+    }
+
+}
--- a/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
+++ b/common/src/main/java/com/yunbao/common/activity/WebViewActivity.java
@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Handler;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.view.View;
@@ -23,12 +24,16 @@ import android.widget.ProgressBar;

 import androidx.annotation.RequiresApi;

+import com.alibaba.fastjson.JSON;
 import com.lxj.xpopup.XPopup;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
 import com.yunbao.common.R;
+import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.event.JavascriptInterfaceEvent;
+import com.yunbao.common.event.LiveRoomChangeEvent;
+import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.manager.IMLoginManager;
@@ -39,10 +44,14 @@ import com.yunbao.common.utils.DeviceUtils;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.JavascriptInterfaceUtils;
 import com.yunbao.common.utils.L;
+import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.HintCustomPopup;

+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

@@ -104,7 +113,13 @@ public class WebViewActivity extends AbsActivity {

            @Override
            public void onPageFinished(WebView view, String url) {
-                setTitle(view.getTitle());
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        setTitle(view.getTitle());
+                    }
+                }, 500);
+
                if (url.contains("for")) {
                    mWebView.loadUrl("javascript:goAnchorTab()");
                }
@@ -162,7 +177,7 @@ public class WebViewActivity extends AbsActivity {
        mWebView.getSettings().setJavaScriptEnabled(true);
        mWebView.getSettings().setDomStorageEnabled(true);
        String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
        mWebView.getSettings().setAllowFileAccess(true);
        mWebView.getSettings().setUseWideViewPort(true); // 关键点
        mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件
@@ -241,10 +256,13 @@ public class WebViewActivity extends AbsActivity {
        mValueCallback2 = null;
    }

-    public static void forward(Context context, String url, boolean addArgs) {
+    private static boolean mIsLive = false;
+
+    public static void forward(Context context, String url, boolean addArgs, boolean isLive) {
+        mIsLive = isLive;
        if (Constants.LoginKefu) {
            if (addArgs) {
-                url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken();
+                url += "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
            }
        }
        Intent intent = new Intent(context, WebViewActivity.class);
@@ -252,8 +270,9 @@ public class WebViewActivity extends AbsActivity {
        context.startActivity(intent);
    }

-    public static void forward(Context context, String url) {
-        forward(context, url, true);    }
+    public static void forward(Context context, String url, boolean isLive) {
+        forward(context, url, true, isLive);
+    }


    @Override
@@ -319,6 +338,7 @@ public class WebViewActivity extends AbsActivity {
        if (Constants.isShowPage != -1) {
            finish();
        }
+
    }

    @Subscribe(threadMode = ThreadMode.MAIN)
@@ -374,6 +394,60 @@ public class WebViewActivity extends AbsActivity {
                                }
                            }))
                    .show();
+        } else if (TextUtils.equals(event.getMethod(), "androidMethodLookToLive")) {
+            //看直播
+            gotoLive(event.getLiveId());
        }
    }
+
+    private void gotoLive(final String live_id) {
+
+        LiveHttpUtil.getLiveInfo(live_id, new com.yunbao.common.http.HttpCallback() {
+            @Override
+            public void onSuccess(int code, String msg, String[] info) {
+                if (code == 0 && info.length > 0) {
+                    LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
+                    new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
+                        @Override
+                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
+                            if (liveBean == null) {
+                                return;
+                            }
+                            if (MicStatusManager.getInstance().isMic(liveUid)) {
+                                MicStatusManager.getInstance().showDownMicDialog(mContext);
+                                return;
+                            }
+                            if (mIsLive) {
+                                finish();
+                                if (MicStatusManager.getInstance().isMic(liveUid)) {
+                                    MicStatusManager.getInstance().showDownMicDialog(mContext);
+                                    return;
+                                }
+                                EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)));
+                            } else {
+                                RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
+                            }
+                            finish();
+                        }
+
+                        @Override
+                        public void onCheckError(String contextError) {
+
+                        }
+                    });
+                } else {
+                    RouteUtil.forwardUserHome(mContext, live_id, 0);
+                }
+            }
+        });
+
+
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
+
+
 }
--- a/common/src/main/java/com/yunbao/common/adapter/AvatarListAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/AvatarListAdapter.java
@@ -0,0 +1,41 @@
+package com.yunbao.common.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.playerObject;
+import com.yunbao.common.views.AvatarListViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AvatarListAdapter extends RecyclerView.Adapter {
+    private List<playerObject> playerObjects = new ArrayList<>();
+
+    public AvatarListAdapter(List<playerObject> playerObjects) {
+        this.playerObjects = playerObjects;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_sud_avatar_list_view, parent, false);
+        return new AvatarListViewHolder(runGamesView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        AvatarListViewHolder avatarListViewHolder = (AvatarListViewHolder) holder;
+        avatarListViewHolder.setData(playerObjects.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return playerObjects.size();
+    }
+}
--- a/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java
@@ -19,6 +19,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.DrawerRecommendViewHolder;
 import com.yunbao.common.views.DrawerTaskViewHolder;
 import com.yunbao.common.views.FunGamesViewHolder;
+import com.yunbao.common.views.InteractionGamesViewHolder;
 import com.yunbao.common.views.RecommendViewHolder;
 import com.yunbao.common.views.RigtsInterestsViewHolder;

@@ -72,9 +73,12 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter {
            case RIGHTS_INTERESTS:
                View rightsInterestsView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_rights_interests, parent, false);
                return new RigtsInterestsViewHolder(rightsInterestsView);
-            default:
+            case RECOMMEND:
                View recommendView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_recommend, parent, false);
                return new RecommendViewHolder(recommendView);
+            default:
+                View gamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_interaction_games_view, parent, false);
+                return new InteractionGamesViewHolder(gamesView);
        }
    }

@@ -92,6 +96,9 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter {
        } else if (holder instanceof RigtsInterestsViewHolder) {
            RigtsInterestsViewHolder rigtsInterestsViewHolder = (RigtsInterestsViewHolder) holder;
            rigtsInterestsViewHolder.setData(infoModels.get(position));
+        } else if (holder instanceof InteractionGamesViewHolder) {
+            InteractionGamesViewHolder interactionGamesViewHolder = (InteractionGamesViewHolder) holder;
+            interactionGamesViewHolder.setData(infoModels.get(position));
        } else if (holder instanceof RecommendViewHolder) {

            RecommendViewHolder recommendViewHolder = (RecommendViewHolder) holder;
@@ -122,7 +129,7 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter {

                                @Override
                                public void onError(String error) {
-                                    ToastUtil.show(R.string.net_error);
+                                    ToastUtil.show(mContext.getString(R.string.net_error));
                                }
                            });
                }
--- a/common/src/main/java/com/yunbao/common/adapter/GiftAlreadyWallAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/GiftAlreadyWallAdapter.java
@@ -16,6 +16,11 @@ import java.util.List;

 public class GiftAlreadyWallAdapter extends RecyclerView.Adapter {
    private List<GiftWallModel> giftWall = new ArrayList<>();
+    private boolean sbWy;//是否正在直播
+
+    public GiftAlreadyWallAdapter(boolean sbWy) {
+        this.sbWy = sbWy;
+    }

    @NonNull
    @Override
@@ -27,7 +32,7 @@ public class GiftAlreadyWallAdapter extends RecyclerView.Adapter {
    @Override
    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
        GiftAlreadyWallViewHolder withoutWallViewHolder = (GiftAlreadyWallViewHolder) holder;
-        withoutWallViewHolder.showData(giftWall.get(position));
+        withoutWallViewHolder.showData(giftWall.get(position), sbWy);
    }

    @Override
--- a/common/src/main/java/com/yunbao/common/adapter/InteractionGamesAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/InteractionGamesAdapter.java
@@ -0,0 +1,79 @@
+package com.yunbao.common.adapter;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+import com.yunbao.common.event.CustomDrawerPopupEvent;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.InteractionGamesChildViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InteractionGamesAdapter extends RecyclerView.Adapter {
+    private Context mContext;
+    private boolean rigts;
+    private List<CustomSidebarChildModel> child = new ArrayList<>();
+
+    public InteractionGamesAdapter(Context mContext, boolean rigts) {
+        this.mContext = mContext;
+        this.rigts = rigts;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view3, parent, false);
+        return new InteractionGamesChildViewHolder(runGamesView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        InteractionGamesChildViewHolder childViewHolder = (InteractionGamesChildViewHolder) holder;
+        childViewHolder.setData(child.get(position), rigts);
+        childViewHolder.setItemViewClicks(new InteractionGamesChildViewHolder.InteractionGamesCallBack() {
+            @Override
+            public void onItemViewClicks(CustomSidebarChildModel model, boolean rigts) {
+
+                long activityID = TextUtils.isEmpty(model.getSrc()) ? 0 : Long.parseLong(model.getSrc());
+                if (activityID != 0) {
+                    Bus.get().post(new CustomDrawerPopupEvent()
+                            .setDisMiss(true).setInteractionID(activityID).setInteraction(true).setChild(child));
+                }
+
+
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return child.size();
+    }
+
+    public void updateData(List<CustomSidebarChildModel> mChild) {
+        child.clear();
+        if (mChild.size() > 8) {
+            for (int i = 0; i < 8; i++) {
+                child.add(mChild.get(i));
+            }
+        } else {
+            child.addAll(mChild);
+        }
+        notifyDataSetChanged();
+    }
+
+    public void selectAll(List<CustomSidebarChildModel> mChild) {
+        child.clear();
+        child.addAll(mChild);
+        notifyDataSetChanged();
+    }
+}
--- a/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleFunGamesAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleFunGamesAdapter.java
@@ -0,0 +1,65 @@
+package com.yunbao.common.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+import com.yunbao.common.views.FunGamesChildViewHolder;
+import com.yunbao.common.views.NewRoleFunGamesChildViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LiveNewRoleFunGamesAdapter extends RecyclerView.Adapter {
+    private Context mContext;
+    private boolean rigts;
+    private List<CustomSidebarChildModel> child = new ArrayList<>();
+    private boolean showRed = false;
+    public LiveNewRoleFunGamesAdapter(Context mContext, boolean rigts,boolean showRed) {
+        this.mContext = mContext;
+        this.rigts = rigts;
+        this.showRed = showRed;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view, parent, false);
+        return new NewRoleFunGamesChildViewHolder(runGamesView,showRed);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        NewRoleFunGamesChildViewHolder childViewHolder = (NewRoleFunGamesChildViewHolder) holder;
+        childViewHolder.setData(child.get(position), rigts);
+    }
+
+    @Override
+    public int getItemCount() {
+        return child.size();
+    }
+
+    public void updateData(List<CustomSidebarChildModel> mChild) {
+        child.clear();
+        if (mChild.size() > 8) {
+            for (int i = 0; i < 8; i++) {
+                child.add(mChild.get(i));
+            }
+        } else {
+            child.addAll(mChild);
+        }
+        notifyDataSetChanged();
+    }
+
+    public void selectAll(List<CustomSidebarChildModel> mChild) {
+        child.clear();
+        child.addAll(mChild);
+        notifyDataSetChanged();
+    }
+}
--- a/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java
@@ -0,0 +1,85 @@
+package com.yunbao.common.adapter;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+import com.yunbao.common.event.CustomDrawerPopupEvent;
+import com.yunbao.common.event.LiveNewRoleEvent;
+import com.yunbao.common.event.NewRoleCustomDrawerPopupEvent;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.InteractionGamesChildViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LiveNewRoleInteractionGamesAdapter extends RecyclerView.Adapter {
+    private Context mContext;
+    private boolean rigts;
+    private List<CustomSidebarChildModel> child = new ArrayList<>();
+
+    public LiveNewRoleInteractionGamesAdapter(Context mContext, boolean rigts) {
+        this.mContext = mContext;
+        this.rigts = rigts;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view3, parent, false);
+        return new InteractionGamesChildViewHolder(runGamesView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        InteractionGamesChildViewHolder childViewHolder = (InteractionGamesChildViewHolder) holder;
+        childViewHolder.setData(child.get(position), rigts);
+        childViewHolder.setItemViewClicks(new InteractionGamesChildViewHolder.InteractionGamesCallBack() {
+            @Override
+            public void onItemViewClicks(CustomSidebarChildModel model, boolean rigts) {
+
+                    long activityID = TextUtils.isEmpty(model.getSrc()) ? 0 : Long.parseLong(model.getSrc());
+                    if (activityID != 0) {
+                        Bus.get().post(new NewRoleCustomDrawerPopupEvent()
+                                .setDisMiss(true)
+                                .setInteractionID(activityID)
+                                        .setChild(child)
+                                .setInteraction(true));
+                    }
+
+
+                Bus.get().post(new LiveNewRoleEvent());
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return child.size();
+    }
+
+    public void updateData(List<CustomSidebarChildModel> mChild) {
+        child.clear();
+        if (mChild.size() > 8) {
+            for (int i = 0; i < 8; i++) {
+                child.add(mChild.get(i));
+            }
+        } else {
+            child.addAll(mChild);
+        }
+        notifyDataSetChanged();
+    }
+
+    public void selectAll(List<CustomSidebarChildModel> mChild) {
+        child.clear();
+        child.addAll(mChild);
+        notifyDataSetChanged();
+    }
+}
--- a/common/src/main/java/com/yunbao/common/adapter/LiveNewRolerPopupAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/LiveNewRolerPopupAdapter.java
@@ -0,0 +1,102 @@
+package com.yunbao.common.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.AnchorRecommendItemModel;
+import com.yunbao.common.bean.CustomSidebarInfoModel;
+import com.yunbao.common.views.LiveNewRoleFunGamesViewHolder;
+import com.yunbao.common.views.LiveNewRoleInteractionGamesViewHolder;
+import com.yunbao.common.views.LiveNewRoleRigtsInterestsViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ */
+public class LiveNewRolerPopupAdapter extends RecyclerView.Adapter {
+    private Context mContext;
+    //  "type": 1,//模块类型 1 充值送好礼类型2 任务中心类型 3趣味游戏类4 权益 ,5为你推荐
+    private final int FUN_GAMES = 3;
+    private final int RIGHTS_INTERESTS = 4;
+    private List<CustomSidebarInfoModel> infoModels = new ArrayList<>();
+    private boolean showRed = false;
+    public LiveNewRolerPopupAdapter(Context mContext,boolean showRed) {
+        this.mContext = mContext;
+        this.showRed = showRed;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        switch (viewType) {
+            case FUN_GAMES:
+                View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_new_roler_fun_games_view, parent, false);
+                return new LiveNewRoleFunGamesViewHolder(runGamesView);
+            case RIGHTS_INTERESTS:
+                View rightsInterestsView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_roler_ights_interests, parent, false);
+                return new LiveNewRoleRigtsInterestsViewHolder(rightsInterestsView,showRed);
+            default:
+                View gamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_interaction_games_view, parent, false);
+                return new LiveNewRoleInteractionGamesViewHolder(gamesView);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        if (holder instanceof LiveNewRoleFunGamesViewHolder) {
+            LiveNewRoleFunGamesViewHolder funGamesViewHolder = (LiveNewRoleFunGamesViewHolder) holder;
+            funGamesViewHolder.setData(infoModels.get(position));
+        } else if (holder instanceof LiveNewRoleRigtsInterestsViewHolder) {
+            LiveNewRoleRigtsInterestsViewHolder rigtsInterestsViewHolder = (LiveNewRoleRigtsInterestsViewHolder) holder;
+            rigtsInterestsViewHolder.setData(infoModels.get(position));
+        } else if (holder instanceof LiveNewRoleInteractionGamesViewHolder) {
+            LiveNewRoleInteractionGamesViewHolder interactionGamesViewHolder = (LiveNewRoleInteractionGamesViewHolder) holder;
+            interactionGamesViewHolder.setData(infoModels.get(position));
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return infoModels.size();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        CustomSidebarInfoModel model = infoModels.get(position);
+        switch (model.getType()) {
+
+            case "3":
+                return FUN_GAMES;
+            case "4":
+                return RIGHTS_INTERESTS;
+
+        }
+        return super.getItemViewType(position);
+
+    }
+
+    public void updateData(List<CustomSidebarInfoModel> mInfoModels) {
+        infoModels.clear();
+        infoModels.addAll(mInfoModels);
+        notifyDataSetChanged();
+    }
+
+    private CustomDrawerListener listener;
+
+    public LiveNewRolerPopupAdapter setListener(CustomDrawerListener listener) {
+        this.listener = listener;
+        return this;
+    }
+
+    public interface CustomDrawerListener {
+        void goToLive(AnchorRecommendItemModel model);
+    }
+}
--- 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,8 @@ 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.utils.WordUtil;
 import com.yunbao.common.views.DayWishItemViewHolder;
 import com.yunbao.common.views.LunarWishItemViewHolder;
 import com.yunbao.common.views.SeasonalWishItemViewHolder;
@@ -46,8 +49,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(WordUtil.isNewZh()?"重複添加禮物":"Too many gifts");
+                    isAdd = true;
+                }
+            }

-        wishList.add(0, model);
+        }
+        if (!isAdd) {
+            wishList.add(0, model);
+        }
        notifyDataSetChanged();
    }

--- a/common/src/main/java/com/yunbao/common/adapter/NewRoleFunGamesAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/NewRoleFunGamesAdapter.java
@@ -0,0 +1,64 @@
+package com.yunbao.common.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+import com.yunbao.common.views.NewRoleFunGamesChildViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class NewRoleFunGamesAdapter extends RecyclerView.Adapter {
+    private Context mContext;
+
+    private List<CustomSidebarChildModel> child = new ArrayList<>();
+    private boolean rigts;
+
+    public NewRoleFunGamesAdapter(Context mContext, boolean rigts) {
+        this.mContext = mContext;
+        this.rigts = rigts;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view2, parent, false);
+        return new NewRoleFunGamesChildViewHolder(runGamesView,false);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        NewRoleFunGamesChildViewHolder childViewHolder = (NewRoleFunGamesChildViewHolder) holder;
+        childViewHolder.setData(child.get(position), rigts);
+    }
+
+    @Override
+    public int getItemCount() {
+        return child.size();
+    }
+
+    public void updateData(List<CustomSidebarChildModel> mChild) {
+        child.clear();
+        if (mChild.size() > 8) {
+            for (int i = 0; i < 8; i++) {
+                child.add(mChild.get(i));
+            }
+        } else {
+            child.addAll(mChild);
+        }
+        notifyDataSetChanged();
+    }
+
+    public void selectAll(List<CustomSidebarChildModel> mChild) {
+        child.clear();
+        child.addAll(mChild);
+        notifyDataSetChanged();
+    }
+}
--- a/common/src/main/java/com/yunbao/common/adapter/SudGameListAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/SudGameListAdapter.java
@@ -0,0 +1,36 @@
+package com.yunbao.common.adapter;
+
+import android.content.Context;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.SudRoomListModel;
+import com.yunbao.common.views.SudGameListViewHolder;
+
+public class SudGameListAdapter extends RefreshAdapter<SudRoomListModel> {
+    private boolean isHome = false;
+
+    public SudGameListAdapter(Context context, boolean isHome) {
+        super(context);
+        this.isHome = isHome;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        if (isHome){
+            return new SudGameListViewHolder(mInflater.inflate(R.layout.item_home_sud_game_list, parent, false));
+        }else {
+            return new SudGameListViewHolder(mInflater.inflate(R.layout.item_sud_game_list, parent, false));
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        SudGameListViewHolder sudGameListViewHolder = (SudGameListViewHolder) holder;
+        sudGameListViewHolder.setData(mList.get(position),isHome);
+    }
+}
--- a/common/src/main/java/com/yunbao/common/adapter/SudGameSearchHistoryListAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/SudGameSearchHistoryListAdapter.java
@@ -0,0 +1,83 @@
+package com.yunbao.common.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.interfaces.OnItemClickListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SudGameSearchHistoryListAdapter extends RecyclerView.Adapter<SudGameSearchHistoryListAdapter.ViewHolder> {
+    private List<String> mList;
+    private Context mContext;
+    private OnItemClickListener<String> onItemClickListener;
+    private boolean isHome = false;
+
+    public SudGameSearchHistoryListAdapter(Context mContext, boolean isHome) {
+        this.isHome = isHome;
+        this.mContext = mContext;
+        mList = new ArrayList<>();
+    }
+
+    public void setList(List<String> list) {
+        this.mList = list;
+        notifyDataSetChanged();
+    }
+
+    public void setOnItemClickListener(OnItemClickListener<String> onItemClickListener) {
+        this.onItemClickListener = onItemClickListener;
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        if (isHome) {
+            return new ViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_search_history, parent, false));
+        } else {
+            return new ViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_home_search_history, parent, false));
+        }
+
+
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        holder.setData(mList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return Math.min(mList.size(), 5);
+    }
+
+    public List<String> getList() {
+        return mList;
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+        TextView nameView;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            nameView = itemView.findViewById(R.id.history);
+
+        }
+
+        public void setData(String name) {
+            nameView.setText(name);
+            nameView.setOnClickListener(v -> {
+                if (onItemClickListener != null) {
+                    onItemClickListener.onItemClick(name, 0);
+                }
+            });
+        }
+    }
+}
--- a/common/src/main/java/com/yunbao/common/adapter/SudGameSearchRoomListAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/SudGameSearchRoomListAdapter.java
@@ -0,0 +1,34 @@
+package com.yunbao.common.adapter;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class SudGameSearchRoomListAdapter extends RecyclerView.Adapter<SudGameSearchRoomListAdapter.ViewHolder> {
+
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return null;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return 0;
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder{
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+    }
+}
--- a/common/src/main/java/com/yunbao/common/adapter/SudHomeGameListAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/SudHomeGameListAdapter.java
@@ -0,0 +1,54 @@
+package com.yunbao.common.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.bean.SudRoomListModel;
+import com.yunbao.common.views.SudGameListViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SudHomeGameListAdapter extends RecyclerView.Adapter<SudGameListViewHolder> {
+    private Context mContext;
+    private List<SudRoomListModel> mList;
+    private boolean isHome = false;
+
+    public SudHomeGameListAdapter(Context mContext, boolean isHome) {
+        this.mContext = mContext;
+        this.isHome = isHome;
+        mList = new ArrayList<>();
+    }
+
+    public void setList(List<SudRoomListModel> mList) {
+        this.mList = mList;
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public SudGameListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        if (isHome) {
+            return new SudGameListViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_home_sud_game_list, parent, false));
+        } else {
+            return new SudGameListViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_sud_game_list, parent, false));
+        }
+
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull SudGameListViewHolder holder, int position) {
+        holder.setData(mList.get(position),isHome);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mList.size();
+    }
+
+}
--- a/common/src/main/java/com/yunbao/common/adapter/SudTitleSelectAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/SudTitleSelectAdapter.java
@@ -0,0 +1,65 @@
+package com.yunbao.common.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.views.SudTitleSelectViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SudTitleSelectAdapter extends RecyclerView.Adapter {
+
+    private List<String> selectString = new ArrayList<>();
+
+    private int mIndex;
+    private int mType;
+
+    public SudTitleSelectAdapter(List<String> selectString, int index, int type) {
+        this.selectString = selectString;
+        mIndex = index;
+        mType = type;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_sud_title_select_view, parent, false);
+        return new SudTitleSelectViewHolder(runGamesView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        SudTitleSelectViewHolder childViewHolder = (SudTitleSelectViewHolder) holder;
+        childViewHolder.setData(selectString.get(position), mIndex == position, position, new SudTitleSelectViewHolder.SudTitleSelectListener() {
+            @Override
+            public void onSudTitleSelectCallBack(int index) {
+                if (sudTitleSelectCallBack != null) {
+                    sudTitleSelectCallBack.onSudTitleSelectCallBack(index);
+
+                }
+            }
+        });
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return selectString.size();
+    }
+
+    private SudTitleSelectCallBack sudTitleSelectCallBack;
+
+    public void setSudTitleSelectCallBack(SudTitleSelectCallBack sudTitleSelectCallBack) {
+        this.sudTitleSelectCallBack = sudTitleSelectCallBack;
+    }
+
+    public interface SudTitleSelectCallBack {
+        void onSudTitleSelectCallBack(int index);
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/ActiveModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/ActiveModel.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import com.google.gson.annotations.SerializedName;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.WordUtil;

 /**
 * 活动
@@ -105,7 +106,7 @@ public class ActiveModel extends BaseModel {
                "?uid=" + userInfo.getId() +
                "&token=" + userInfo.getToken()
                + "&anchorUid=" + liveUid
-                + "&active_id=" + activeId;
+                + "&active_id=" + activeId+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
        return url;
    }
 }
--- a/common/src/main/java/com/yunbao/common/bean/AnchorStartLiveBean.java
+++ b/common/src/main/java/com/yunbao/common/bean/AnchorStartLiveBean.java
@@ -0,0 +1,31 @@
+package com.yunbao.common.bean;
+
+public class AnchorStartLiveBean extends BaseModel{
+    private String anchorName;
+    private String avatar;
+    private String roomId;
+
+    public String getAnchorName() {
+        return anchorName;
+    }
+
+    public void setAnchorName(String anchorName) {
+        this.anchorName = anchorName;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java
+++ b/common/src/main/java/com/yunbao/common/bean/CheckRemainingBalance.java
@@ -0,0 +1,17 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class CheckRemainingBalance extends BaseModel{
+
+   @SerializedName("golden_bean_remaining_balance")
+   private int goldenBeanRemainingBalance;
+
+   public int getGoldenBeanRemainingBalance() {
+      return goldenBeanRemainingBalance;
+   }
+
+   public void setGoldenBeanRemainingBalance(int goldenBeanRemainingBalance) {
+      this.goldenBeanRemainingBalance = goldenBeanRemainingBalance;
+   }
+}
--- a/common/src/main/java/com/yunbao/common/bean/CreateSudRoomModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/CreateSudRoomModel.java
@@ -0,0 +1,160 @@
+package com.yunbao.common.bean;
+
+import android.text.TextUtils;
+
+import com.google.gson.annotations.SerializedName;
+
+public class CreateSudRoomModel extends BaseModel {
+
+    @SerializedName("sud_game_room_id")
+    private String sudGameRoomId;
+    @SerializedName("sud_game_id")
+    private String sudGameId;
+    @SerializedName("room_holder_id")
+    private int roomHolderId;
+    @SerializedName("room_holder_name")
+    private String roomHolderName;
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("room_holder_type")
+    private int roomHolderType;
+    @SerializedName("sud_game_name")
+    private String sudGameName;
+    @SerializedName("room_name")
+    private String roomName;
+    @SerializedName("room_status")
+    private String roomStatus;
+    @SerializedName("player_total")
+    private String playerTotal;
+    @SerializedName("ob_total")
+    private String obTotal;
+    @SerializedName("mg_id")
+    private String mgId;
+    @SerializedName("sud_game_icon")
+    private String sudGameIcon;
+
+    public String getSudGameRoomId() {
+        return sudGameRoomId;
+    }
+
+    public CreateSudRoomModel setSudGameRoomId(String sudGameRoomId) {
+        this.sudGameRoomId = sudGameRoomId;
+        return this;
+    }
+
+    public String getSudGameId() {
+        return sudGameId;
+    }
+
+    public long getLongSudGameId() {
+        if (TextUtils.isEmpty(sudGameId)) {
+            return 0;
+        } else {
+            return Long.parseLong(sudGameId);
+        }
+    }
+
+    public CreateSudRoomModel setSudGameId(String sudGameId) {
+        this.sudGameId = sudGameId;
+        return this;
+    }
+
+    public int getRoomHolderId() {
+        return roomHolderId;
+    }
+
+    public CreateSudRoomModel setRoomHolderId(int roomHolderId) {
+        this.roomHolderId = roomHolderId;
+        return this;
+    }
+
+    public String getRoomHolderName() {
+        return roomHolderName;
+    }
+
+    public CreateSudRoomModel setRoomHolderName(String roomHolderName) {
+        this.roomHolderName = roomHolderName;
+        return this;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public CreateSudRoomModel setAvatar(String avatar) {
+        this.avatar = avatar;
+        return this;
+    }
+
+    public int getRoomHolderType() {
+        return roomHolderType;
+    }
+
+    public CreateSudRoomModel setRoomHolderType(int roomHolderType) {
+        this.roomHolderType = roomHolderType;
+        return this;
+    }
+
+    public String getSudGameName() {
+        return sudGameName;
+    }
+
+    public CreateSudRoomModel setSudGameName(String sudGameName) {
+        this.sudGameName = sudGameName;
+        return this;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public CreateSudRoomModel setRoomName(String roomName) {
+        this.roomName = roomName;
+        return this;
+    }
+
+    public String getRoomStatus() {
+        return roomStatus;
+    }
+
+    public CreateSudRoomModel setRoomStatus(String roomStatus) {
+        this.roomStatus = roomStatus;
+        return this;
+    }
+
+    public String getPlayerTotal() {
+        return playerTotal;
+    }
+
+    public CreateSudRoomModel setPlayerTotal(String playerTotal) {
+        this.playerTotal = playerTotal;
+        return this;
+    }
+
+    public String getObTotal() {
+        return obTotal;
+    }
+
+    public CreateSudRoomModel setObTotal(String obTotal) {
+        this.obTotal = obTotal;
+        return this;
+    }
+
+    public String getMgId() {
+        return mgId;
+    }
+
+    public CreateSudRoomModel setMgId(String mgId) {
+        this.mgId = mgId;
+        return this;
+    }
+
+    public String getSudGameIcon() {
+        return sudGameIcon;
+    }
+
+    public CreateSudRoomModel setSudGameIcon(String sudGameIcon) {
+        this.sudGameIcon = sudGameIcon;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/CustomSidebarChildModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/CustomSidebarChildModel.java
@@ -34,6 +34,17 @@ public class CustomSidebarChildModel extends BaseModel {
    private String flag = "";
    @SerializedName("is_show")
    private String isShow;
+    @SerializedName("sud_game_is_new")
+    private String sudGameIsNew;
+
+    public String getSudGameIsNew() {
+        return sudGameIsNew;
+    }
+
+    public CustomSidebarChildModel setSudGameIsNew(String sudGameIsNew) {
+        this.sudGameIsNew = sudGameIsNew;
+        return this;
+    }

    public String getIsShow() {
        return isShow;
--- a/common/src/main/java/com/yunbao/common/bean/CustomSidebarInfoModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/CustomSidebarInfoModel.java
@@ -26,6 +26,8 @@ public class CustomSidebarInfoModel extends BaseModel {
    private String src;
    @SerializedName("type")
    private String type;
+    @SerializedName("sud_game_is_new")
+    private String sudGameIsNew;
    @SerializedName("child")
    private List<CustomSidebarChildModel> child;

@@ -38,6 +40,15 @@ public class CustomSidebarInfoModel extends BaseModel {
        return this;
    }

+    public String getSudGameIsNew() {
+        return sudGameIsNew;
+    }
+
+    public CustomSidebarInfoModel setSudGameIsNew(String sudGameIsNew) {
+        this.sudGameIsNew = sudGameIsNew;
+        return this;
+    }
+
    public String getTitle() {
        return title;
    }
--- a/common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java
@@ -33,6 +33,29 @@ public class EnterRoomNewModel extends BaseModel {
    @SerializedName("wishListProgress")
    private WishModel wishListProgress;

+    @SerializedName("sud_game_room_status")
+    private String sudGameRoomStatus;
+    @SerializedName("sud_game_room_name")
+    private String sudGameRoomName;
+
+    public String getSudGameRoomName() {
+        return sudGameRoomName;
+    }
+
+    public EnterRoomNewModel setSudGameRoomName(String sudGameRoomName) {
+        this.sudGameRoomName = sudGameRoomName;
+        return this;
+    }
+
+    public String getSudGameRoomStatus() {
+        return sudGameRoomStatus;
+    }
+
+    public EnterRoomNewModel setSudGameRoomStatus(String sudGameRoomStatus) {
+        this.sudGameRoomStatus = sudGameRoomStatus;
+        return this;
+    }
+
    public WishModel getWishListProgress() {
        return wishListProgress;
    }
--- a/common/src/main/java/com/yunbao/common/bean/FansCheckRed.java
+++ b/common/src/main/java/com/yunbao/common/bean/FansCheckRed.java
@@ -0,0 +1,19 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class FansCheckRed  extends BaseModel{
+    @SerializedName("fans_level_upgrade_status")
+    private int status;
+
+    public FansCheckRed() {
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/FansGroupGiftPack.java
+++ b/common/src/main/java/com/yunbao/common/bean/FansGroupGiftPack.java
@@ -0,0 +1,81 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class FansGroupGiftPack extends BaseModel{
+    @SerializedName("id")
+    private int id;
+    @SerializedName("quantity")
+    private int quantity;
+    @SerializedName("end_time")
+    private String endTime;
+    @SerializedName("giftname")
+    private String giftName;
+    @SerializedName("needcoin")
+    private String needCoin;
+    @SerializedName("gifticon")
+    private String icon;
+
+    public FansGroupGiftPack() {
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(int quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getGiftName() {
+        return giftName;
+    }
+
+    public void setGiftName(String giftName) {
+        this.giftName = giftName;
+    }
+
+    public String getNeedCoin() {
+        return needCoin;
+    }
+
+    public void setNeedCoin(String needCoin) {
+        this.needCoin = needCoin;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    @Override
+    public String toString() {
+        return "FansGroupGiftPack{" +
+                "id=" + id +
+                ", quantity=" + quantity +
+                ", endTime='" + endTime + '\'' +
+                ", giftName='" + giftName + '\'' +
+                ", needCoin='" + needCoin + '\'' +
+                ", icon='" + icon + '\'' +
+                '}';
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/FansGroupGiftPackInfo.java
+++ b/common/src/main/java/com/yunbao/common/bean/FansGroupGiftPackInfo.java
@@ -0,0 +1,161 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class FansGroupGiftPackInfo extends BaseModel {
+    @SerializedName("id")
+    private int id;
+    @SerializedName("pack_name")
+    private String packName;
+    @SerializedName("description")
+    private String description;
+    @SerializedName("coin")
+    private String coin;
+    @SerializedName("data")
+    private List<Gift> data;
+
+    public FansGroupGiftPackInfo() {
+    }
+
+    public String getPackName() {
+        return packName;
+    }
+
+    public void setPackName(String packName) {
+        this.packName = packName;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getCoin() {
+        return coin;
+    }
+
+    public void setCoin(String coin) {
+        this.coin = coin;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List<Gift> getData() {
+        return data;
+    }
+
+    public void setData(List<Gift> data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "FansGroupGiftPackInfo{" +
+                "id=" + id +
+                ", packName='" + packName + '\'' +
+                ", description='" + description + '\'' +
+                ", coin='" + coin + '\'' +
+                ", data=" + data +
+                '}';
+    }
+
+    public static class Gift {
+        @SerializedName("id")
+        private int id;
+        @SerializedName("name")
+        private String giftName;
+        @SerializedName("needcoin")
+        private String needCoin;
+        @SerializedName("src")
+        private String giftIcon;
+        @SerializedName("quantity")
+        private String quantity;
+        @SerializedName("restrict")
+        private int restrict;
+        @SerializedName("type")
+        private int type;
+
+        public Gift() {
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getGiftName() {
+            return giftName;
+        }
+
+        public void setGiftName(String giftName) {
+            this.giftName = giftName;
+        }
+
+        public String getNeedCoin() {
+            return needCoin;
+        }
+
+        public void setNeedCoin(String needCoin) {
+            this.needCoin = needCoin;
+        }
+
+        public String getGiftIcon() {
+            return giftIcon;
+        }
+
+        public void setGiftIcon(String giftIcon) {
+            this.giftIcon = giftIcon;
+        }
+
+        public String getQuantity() {
+            return quantity;
+        }
+
+        public void setQuantity(String quantity) {
+            this.quantity = quantity;
+        }
+
+        public int getRestrict() {
+            return restrict;
+        }
+
+        public void setRestrict(int restrict) {
+            this.restrict = restrict;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        @Override
+        public String toString() {
+            return "Gift{" +
+                    "id=" + id +
+                    ", giftName='" + giftName + '\'' +
+                    ", needCoin='" + needCoin + '\'' +
+                    ", giftIcon='" + giftIcon + '\'' +
+                    ", quantity='" + quantity + '\'' +
+                    ", restrict='" + restrict + '\'' +
+                    ", type=" + type +
+                    '}';
+        }
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/FansModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/FansModel.java
@@ -0,0 +1,57 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class FansModel extends BaseModel {
+
+   @SerializedName("levelid")
+   private int levelid;
+   @SerializedName("thumb")
+   private String thumb;
+   @SerializedName("colour")
+   private String colour;
+   @SerializedName("thumb_mark")
+   private String thumbMark;
+   @SerializedName("bg")
+   private String bg;
+
+   public int getLevelid() {
+      return levelid;
+   }
+
+   public void setLevelid(int levelid) {
+      this.levelid = levelid;
+   }
+
+   public String getThumb() {
+      return thumb;
+   }
+
+   public void setThumb(String thumb) {
+      this.thumb = thumb;
+   }
+
+   public String getColour() {
+      return colour;
+   }
+
+   public void setColour(String colour) {
+      this.colour = colour;
+   }
+
+   public String getThumbMark() {
+      return thumbMark;
+   }
+
+   public void setThumbMark(String thumbMark) {
+      this.thumbMark = thumbMark;
+   }
+
+   public String getBg() {
+      return bg;
+   }
+
+   public void setBg(String bg) {
+      this.bg = bg;
+   }
+}
--- a/common/src/main/java/com/yunbao/common/bean/GiftNamingInfoModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/GiftNamingInfoModel.java
@@ -0,0 +1,359 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class GiftNamingInfoModel extends BaseModel {
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("sendtype")
+    private String sendtype;
+    @SerializedName("type")
+    private String type;
+    @SerializedName("name")
+    private String name;
+    @SerializedName("release_status")
+    private String releaseStatus;
+    @SerializedName("type_sort")
+    private String typeSort;
+    @SerializedName("operate_image")
+    private String operateImage;
+    @SerializedName("operate_url")
+    private String operateUrl;
+    @SerializedName("mark")
+    private String mark;
+    @SerializedName("giftname")
+    private String giftname;
+    @SerializedName("needcoin")
+    private String needcoin;
+    @SerializedName("gifticon")
+    private String gifticon;
+    @SerializedName("gift_description")
+    private String giftDescription;
+    @SerializedName("corner_mark")
+    private String cornerMark;
+    @SerializedName("swf")
+    private String swf;
+    @SerializedName("gift_uid")
+    private String giftUid;
+    @SerializedName("type_start_time")
+    private String typeStartTime;
+    @SerializedName("type_end_time")
+    private String typeEndTime;
+    @SerializedName("gift_start_time")
+    private String giftStartTime;
+    @SerializedName("gift_end_time")
+    private String giftEndTime;
+    @SerializedName("naming_liveuid")
+    private String namingLiveuid;
+    @SerializedName("naming_uid")
+    private String namingUid;
+    @SerializedName("naming_live_name")
+    private String namingLiveName;
+    @SerializedName("naming_user_name")
+    private String namingUserName;
+    @SerializedName("naming_live_avatar")
+    private String namingLiveAvatar;
+    @SerializedName("naming_user_avatar")
+    private String namingUserAvatar;
+    @SerializedName("naming_status")
+    private String namingStatus;
+    @SerializedName("naming_coin")
+    private String namingCoin;
+    @SerializedName("fans_level")
+    private String fansLevel;
+    @SerializedName("naming_user_coin")
+    private String namingUserCoin;
+    @SerializedName("naming_live_coin")
+    private String namingLiveCoin;
+    @SerializedName("isweek")
+    private String isweek;
+
+    public String getId() {
+        return id;
+    }
+
+    public GiftNamingInfoModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getSendtype() {
+        return sendtype;
+    }
+
+    public GiftNamingInfoModel setSendtype(String sendtype) {
+        this.sendtype = sendtype;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public GiftNamingInfoModel setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public GiftNamingInfoModel setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getReleaseStatus() {
+        return releaseStatus;
+    }
+
+    public GiftNamingInfoModel setReleaseStatus(String releaseStatus) {
+        this.releaseStatus = releaseStatus;
+        return this;
+    }
+
+    public String getTypeSort() {
+        return typeSort;
+    }
+
+    public GiftNamingInfoModel setTypeSort(String typeSort) {
+        this.typeSort = typeSort;
+        return this;
+    }
+
+    public String getOperateImage() {
+        return operateImage;
+    }
+
+    public GiftNamingInfoModel setOperateImage(String operateImage) {
+        this.operateImage = operateImage;
+        return this;
+    }
+
+    public String getOperateUrl() {
+        return operateUrl;
+    }
+
+    public GiftNamingInfoModel setOperateUrl(String operateUrl) {
+        this.operateUrl = operateUrl;
+        return this;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public GiftNamingInfoModel setMark(String mark) {
+        this.mark = mark;
+        return this;
+    }
+
+    public String getGiftname() {
+        return giftname;
+    }
+
+    public GiftNamingInfoModel setGiftname(String giftname) {
+        this.giftname = giftname;
+        return this;
+    }
+
+    public String getNeedcoin() {
+        return needcoin;
+    }
+
+    public GiftNamingInfoModel setNeedcoin(String needcoin) {
+        this.needcoin = needcoin;
+        return this;
+    }
+
+    public String getGifticon() {
+        return gifticon;
+    }
+
+    public GiftNamingInfoModel setGifticon(String gifticon) {
+        this.gifticon = gifticon;
+        return this;
+    }
+
+    public String getGiftDescription() {
+        return giftDescription;
+    }
+
+    public GiftNamingInfoModel setGiftDescription(String giftDescription) {
+        this.giftDescription = giftDescription;
+        return this;
+    }
+
+    public String getCornerMark() {
+        return cornerMark;
+    }
+
+    public GiftNamingInfoModel setCornerMark(String cornerMark) {
+        this.cornerMark = cornerMark;
+        return this;
+    }
+
+    public String getSwf() {
+        return swf;
+    }
+
+    public GiftNamingInfoModel setSwf(String swf) {
+        this.swf = swf;
+        return this;
+    }
+
+    public String getGiftUid() {
+        return giftUid;
+    }
+
+    public GiftNamingInfoModel setGiftUid(String giftUid) {
+        this.giftUid = giftUid;
+        return this;
+    }
+
+    public String getTypeStartTime() {
+        return typeStartTime;
+    }
+
+    public GiftNamingInfoModel setTypeStartTime(String typeStartTime) {
+        this.typeStartTime = typeStartTime;
+        return this;
+    }
+
+    public String getTypeEndTime() {
+        return typeEndTime;
+    }
+
+    public GiftNamingInfoModel setTypeEndTime(String typeEndTime) {
+        this.typeEndTime = typeEndTime;
+        return this;
+    }
+
+    public String getGiftStartTime() {
+        return giftStartTime;
+    }
+
+    public GiftNamingInfoModel setGiftStartTime(String giftStartTime) {
+        this.giftStartTime = giftStartTime;
+        return this;
+    }
+
+    public String getGiftEndTime() {
+        return giftEndTime;
+    }
+
+    public GiftNamingInfoModel setGiftEndTime(String giftEndTime) {
+        this.giftEndTime = giftEndTime;
+        return this;
+    }
+
+    public String getNamingLiveuid() {
+        return namingLiveuid;
+    }
+
+    public GiftNamingInfoModel setNamingLiveuid(String namingLiveuid) {
+        this.namingLiveuid = namingLiveuid;
+        return this;
+    }
+
+    public String getNamingUid() {
+        return namingUid;
+    }
+
+    public GiftNamingInfoModel setNamingUid(String namingUid) {
+        this.namingUid = namingUid;
+        return this;
+    }
+
+    public String getNamingLiveName() {
+        return namingLiveName;
+    }
+
+    public GiftNamingInfoModel setNamingLiveName(String namingLiveName) {
+        this.namingLiveName = namingLiveName;
+        return this;
+    }
+
+    public String getNamingUserName() {
+        return namingUserName;
+    }
+
+    public GiftNamingInfoModel setNamingUserName(String namingUserName) {
+        this.namingUserName = namingUserName;
+        return this;
+    }
+
+    public String getNamingLiveAvatar() {
+        return namingLiveAvatar;
+    }
+
+    public GiftNamingInfoModel setNamingLiveAvatar(String namingLiveAvatar) {
+        this.namingLiveAvatar = namingLiveAvatar;
+        return this;
+    }
+
+    public String getNamingUserAvatar() {
+        return namingUserAvatar;
+    }
+
+    public GiftNamingInfoModel setNamingUserAvatar(String namingUserAvatar) {
+        this.namingUserAvatar = namingUserAvatar;
+        return this;
+    }
+
+    public String getNamingStatus() {
+        return namingStatus;
+    }
+
+    public GiftNamingInfoModel setNamingStatus(String namingStatus) {
+        this.namingStatus = namingStatus;
+        return this;
+    }
+
+    public String getNamingCoin() {
+        return namingCoin;
+    }
+
+    public GiftNamingInfoModel setNamingCoin(String namingCoin) {
+        this.namingCoin = namingCoin;
+        return this;
+    }
+
+    public String getFansLevel() {
+        return fansLevel;
+    }
+
+    public GiftNamingInfoModel setFansLevel(String fansLevel) {
+        this.fansLevel = fansLevel;
+        return this;
+    }
+
+    public String getNamingUserCoin() {
+        return namingUserCoin;
+    }
+
+    public GiftNamingInfoModel setNamingUserCoin(String namingUserCoin) {
+        this.namingUserCoin = namingUserCoin;
+        return this;
+    }
+
+    public String getNamingLiveCoin() {
+        return namingLiveCoin;
+    }
+
+    public GiftNamingInfoModel setNamingLiveCoin(String namingLiveCoin) {
+        this.namingLiveCoin = namingLiveCoin;
+        return this;
+    }
+
+    public String getIsweek() {
+        return isweek;
+    }
+
+    public GiftNamingInfoModel setIsweek(String isweek) {
+        this.isweek = isweek;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java
+++ b/common/src/main/java/com/yunbao/common/bean/GiftWallGiftDetail.java
@@ -11,7 +11,18 @@ public class GiftWallGiftDetail extends BaseModel {
    @SerializedName("avatar")
    private String avatar;
    @SerializedName("naming_coin")
-    private int namingCoin;
+    private String namingCoin;
+    @SerializedName("default_naming_coin")
+    private String default_naming_coin;
+
+    public String getDefault_naming_coin() {
+        return default_naming_coin;
+    }
+
+    public GiftWallGiftDetail setDefault_naming_coin(String default_naming_coin) {
+        this.default_naming_coin = default_naming_coin;
+        return this;
+    }

    public int getUid() {
        return uid;
@@ -23,6 +34,9 @@ public class GiftWallGiftDetail extends BaseModel {
    }

    public String getUserNicename() {
+        if (userNicename.length() > 5) {
+            userNicename = userNicename.substring(0, 5) + "...";
+        }
        return userNicename;
    }

@@ -40,11 +54,11 @@ public class GiftWallGiftDetail extends BaseModel {
        return this;
    }

-    public int getNamingCoin() {
+    public String getNamingCoin() {
        return namingCoin;
    }

-    public GiftWallGiftDetail setNamingCoin(int namingCoin) {
+    public GiftWallGiftDetail setNamingCoin(String namingCoin) {
        this.namingCoin = namingCoin;
        return this;
    }
--- a/common/src/main/java/com/yunbao/common/bean/LiveBean.java
+++ b/common/src/main/java/com/yunbao/common/bean/LiveBean.java
@@ -54,7 +54,8 @@ public class LiveBean implements Parcelable {
    private String recommendCardIconSizeThree = "";
    @SerializedName("red_packet_status")
    private int redPacketStatus;
-
+    @SerializedName("giftId")
+    private String giftId;
    private Map<String,String>  params;//用于跳转Activity时扩展参数，例：从首页Banner跳转到直播间时需要根据携带参数判断是否弹出新人特惠对话框

    public String getRecommendCardIconSizeTwo() {
@@ -66,6 +67,14 @@ public class LiveBean implements Parcelable {
        return this;
    }

+    public String getGiftId() {
+        return giftId;
+    }
+
+    public void setGiftId(String giftId) {
+        this.giftId = giftId;
+    }
+
    public String getRecommendCardIcon() {
        if (TextUtils.isEmpty(recommendCardIconSizeThree)) {
            if (!TextUtils.isEmpty(recommendCardIconSizeTwo)) {
@@ -444,6 +453,7 @@ public class LiveBean implements Parcelable {
        this.recommendCardtype = in.readString();
        this.recommendCardIconSizeTwo = in.readString();
        this.recommendCardIconSizeThree = in.readString();
+        this.giftId = in.readString();
    }

    @Override
@@ -488,6 +498,7 @@ public class LiveBean implements Parcelable {
        dest.writeString(this.recommendCardtype);
        dest.writeString(this.recommendCardIconSizeTwo);
        dest.writeString(this.recommendCardIconSizeThree);
+        dest.writeString(this.giftId);
    }

    public static final Creator<LiveBean> CREATOR = new Creator<LiveBean>() {
--- a/common/src/main/java/com/yunbao/common/bean/LiveClassBean.java
+++ b/common/src/main/java/com/yunbao/common/bean/LiveClassBean.java
@@ -1,6 +1,7 @@
 package com.yunbao.common.bean;

 import com.alibaba.fastjson.annotation.JSONField;
+import com.google.gson.annotations.SerializedName;

 /**
 * Created by cxf on 2018/9/25.
@@ -16,6 +17,8 @@ public class LiveClassBean {
    private boolean checked;
    private String chinese;
    private String english;
+    @SerializedName("channel_show")
+    private int channel_show;

    public String getChinese() {
        return chinese;
@@ -92,4 +95,12 @@ public class LiveClassBean {
    public void setChecked(boolean checked) {
        this.checked = checked;
    }
+
+    public int getChannel_show() {
+        return channel_show;
+    }
+
+    public void setChannel_show(int channel_show) {
+        this.channel_show = channel_show;
+    }
 }
--- a/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java
+++ b/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java
@@ -64,6 +64,39 @@ public class LiveGiftBean {
    private String namingStatus;
    @JSONField(name = "naming_coin")
    private String namingCoin;
+    @JSONField(name = "naming_user_coin")
+    private String namingUserCoin;
+    @JSONField(name = "blind_box_ticket")
+    private int blindBoxTicket;
+    @JSONField(name = "blind_box_ticket_id")
+    private int blindBoxTicketId;
+
+    public int getBlindBoxTicketId() {
+        return blindBoxTicketId;
+    }
+
+    public LiveGiftBean setBlindBoxTicketId(int blindBoxTicketId) {
+        this.blindBoxTicketId = blindBoxTicketId;
+        return this;
+    }
+
+    public int getBlindBoxTicket() {
+        return blindBoxTicket;
+    }
+
+    public LiveGiftBean setBlindBoxTicket(int blindBoxTicket) {
+        this.blindBoxTicket = blindBoxTicket;
+        return this;
+    }
+
+    public String getNamingUserCoin() {
+        return namingUserCoin;
+    }
+
+    public LiveGiftBean setNamingUserCoin(String namingUserCoin) {
+        this.namingUserCoin = namingUserCoin;
+        return this;
+    }

    public View getmView() {
        return mView;
@@ -191,6 +224,16 @@ public class LiveGiftBean {
        return this;
    }

+    private int fansGiftLevel = 0;//粉丝团礼物等级要求
+
+    public int getFansGiftLevel() {
+        return fansGiftLevel;
+    }
+
+    public void setFansGiftLevel(int fansGiftLevel) {
+        this.fansGiftLevel = fansGiftLevel;
+    }
+
    public int getBlind_box_type() {
        return blind_box_type;
    }
--- a/common/src/main/java/com/yunbao/common/bean/LiveUserMailBoxModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/LiveUserMailBoxModel.java
@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import com.google.gson.annotations.SerializedName;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.utils.StringUtil;
+import com.yunbao.common.utils.WordUtil;

 public class LiveUserMailBoxModel extends BaseModel {
    @SerializedName("id")
@@ -127,7 +128,7 @@ public class LiveUserMailBoxModel extends BaseModel {
                url += "?";
            }
            url += "uid=" + CommonAppConfig.getInstance().getUid() + "&token="
-                    + CommonAppConfig.getInstance().getToken();
+                    + CommonAppConfig.getInstance().getToken()+ "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
        }
        return url;
    }
--- a/common/src/main/java/com/yunbao/common/bean/OpenAdModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/OpenAdModel.java
@@ -0,0 +1,169 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.StringUtil;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+public class OpenAdModel extends BaseModel {
+    public static final int TYPE_HOME = 1;//主页
+    public static final int TYPE_LIVE = 2;//直播间
+    public static final int TYPE_LIVE_DELAY = 3;//直播间延迟
+    public static final int MODEL_SQUARE = 1;//正方形
+    public static final int MODEL_RECTANGLE = 2;//长方形
+    public static final int MODEL_BOTTOM = 3;//底部
+    @SerializedName("id")
+    private int id;
+    @SerializedName("popup_location")
+    private int type = TYPE_HOME;
+    @SerializedName("activity_url")
+    private String url;
+    @SerializedName("image_url")
+    private String imageUrl;
+    @SerializedName("display_time")
+    private int showTime; //持续展示时间
+    @SerializedName("delay_show_time")
+    private int delayShowTime;//延迟展示时间
+    @SerializedName("popup_model")
+    private int model = MODEL_SQUARE;
+    @SerializedName("start_show_time")
+    private String startTime;//活动开始时间
+    @SerializedName("end_show_time")
+    private String endTime;//活动结束时间
+    @SerializedName("popup_permission")
+    private int permission;
+
+
+    public OpenAdModel() {
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getUrl() {
+        if (!url.startsWith("http://") || !url.startsWith("https://")) {
+            url = CommonAppConfig.HOST + url;
+        }
+        return url + "?t=" + System.currentTimeMillis() / 1000;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public int getShowTime() {
+        return showTime * 1000;
+    }
+
+    public void setShowTime(int showTime) {
+        this.showTime = showTime;
+    }
+
+    public int getDelayShowTime() {
+        return delayShowTime * 1000;
+    }
+
+    public void setDelayShowTime(int delayShowTime) {
+        this.delayShowTime = delayShowTime;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public int getModel() {
+        return model;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public void setModel(int model) {
+        this.model = model;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getPermission() {
+        return permission;
+    }
+
+    public void setPermission(int permission) {
+        this.permission = permission;
+    }
+
+    public boolean isInTime() {
+        if (StringUtil.isEmpty(startTime, endTime)) {
+            return true;
+        }
+        Date startTime = null;
+        Date endTime = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
+
+        try {
+            startTime = sdf.parse(this.startTime);
+            endTime = sdf.parse(this.endTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        long time = System.currentTimeMillis();
+        return startTime.getTime() <= time && time <= endTime.getTime();
+    }
+
+    public boolean userIsPermission(boolean isGuard) {
+        if (permission == 4 && !isGuard) {//守护不可见
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "OpenAdModel{" +
+                "id=" + id +
+                ", type=" + type +
+                ", url='" + url + '\'' +
+                ", imageUrl='" + imageUrl + '\'' +
+                ", showTime=" + showTime +
+                ", delayShowTime=" + delayShowTime +
+                ", model=" + model +
+                ", startTime='" + startTime + '\'' +
+                ", endTime='" + endTime + '\'' +
+                ", permission='" + permission + '\'' +
+                '}';
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/PkRankBean.java
+++ b/common/src/main/java/com/yunbao/common/bean/PkRankBean.java
@@ -23,6 +23,8 @@ public class PkRankBean extends BaseModel {
    public String clickUrl;
    @SerializedName("vs_img")
    public String vsImgUrl;
+    @SerializedName("new_rank_name_en")
+    public String newRankNameEn;

    public int getId() {
        return id;
@@ -94,6 +96,14 @@ public class PkRankBean extends BaseModel {
        this.vsImgUrl = vsImgUrl;
    }

+    public String getNewRankNameEn() {
+        return newRankNameEn;
+    }
+
+    public void setNewRankNameEn(String newRankNameEn) {
+        this.newRankNameEn = newRankNameEn;
+    }
+
    @Override
    public String toString() {
        return "PkRankBean{" +
@@ -105,6 +115,7 @@ public class PkRankBean extends BaseModel {
                ", pkTopImgUrl='" + pkTopImgUrl + '\'' +
                ", clickUrl='" + clickUrl + '\'' +
                ", vsImgUrl='" + vsImgUrl + '\'' +
+                ", newRankNameEn='" + newRankNameEn + '\'' +
                '}';
    }
 }
--- a/common/src/main/java/com/yunbao/common/bean/RedPacketInfoModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/RedPacketInfoModel.java
@@ -19,6 +19,8 @@ public class RedPacketInfoModel extends BaseModel {
    private String redPacketMoney;
    @SerializedName("red_packet_quantity")
    private String redPacketQuantity;
+    @SerializedName("is_fans")
+    private String isFans;
    @SerializedName("conditions")
    private String conditions;
    @SerializedName("create_time")
@@ -270,4 +272,12 @@ public class RedPacketInfoModel extends BaseModel {
        this.userGoldenBean = userGoldenBean;
        return this;
    }
+
+    public boolean getIsFans() {
+        return isFans.equals("1");
+    }
+
+    public void setIsFans(String isFans) {
+        this.isFans = isFans;
+    }
 }
--- a/common/src/main/java/com/yunbao/common/bean/SudRoomListModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/SudRoomListModel.java
@@ -0,0 +1,212 @@
+package com.yunbao.common.bean;
+
+import android.text.TextUtils;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SudRoomListModel extends BaseModel {
+
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("room_holder_id")
+    private String roomHolderId;
+    @SerializedName("room_name")
+    private String roomName;
+    @SerializedName("room_holder_type")
+    private String roomHolderType;
+    @SerializedName("sud_game_id")
+    private String sudGameId;
+    @SerializedName("golden_bean_number")
+    private String goldenBeanNumber;
+    @SerializedName("room_status")
+    private String roomStatus;
+    @SerializedName("sud_game_room_id")
+    private String sudGameRoomId;
+    @SerializedName("room_holder_name")
+    private String roomHolderName;
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("sud_game_name")
+    private String sudGameName;
+    @SerializedName("player_total")
+    private String playerTotal;
+    @SerializedName("ob_total")
+    private String obTotal;
+    @SerializedName("liveuid")
+    private String liveUid;
+    @SerializedName("sex")
+    private String sex;
+    @SerializedName("sud_game_icon")
+    private String sudgameicon;
+
+    public String getSudgameicon() {
+        return sudgameicon;
+    }
+
+    public SudRoomListModel setSudgameicon(String sudgameicon) {
+        this.sudgameicon = sudgameicon;
+        return this;
+    }
+
+    public String getLiveUid() {
+        return liveUid;
+    }
+
+    public SudRoomListModel setLiveUid(String liveUid) {
+        this.liveUid = liveUid;
+        return this;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public SudRoomListModel setSex(String sex) {
+        this.sex = sex;
+        return this;
+    }
+
+    @SerializedName("player_object")
+    private List<playerObject> playerObjects = new ArrayList<>();
+
+    public String getId() {
+        return id;
+    }
+
+    public SudRoomListModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getRoomHolderId() {
+        return roomHolderId;
+    }
+
+    public SudRoomListModel setRoomHolderId(String roomHolderId) {
+        this.roomHolderId = roomHolderId;
+        return this;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public SudRoomListModel setRoomName(String roomName) {
+        this.roomName = roomName;
+        return this;
+    }
+
+    public String getRoomHolderType() {
+        return roomHolderType;
+    }
+
+    public SudRoomListModel setRoomHolderType(String roomHolderType) {
+        this.roomHolderType = roomHolderType;
+        return this;
+    }
+
+    public String getSudGameId() {
+        return sudGameId;
+    }
+
+    public SudRoomListModel setSudGameId(String sudGameId) {
+        this.sudGameId = sudGameId;
+        return this;
+    }
+
+    public String getGoldenBeanNumber() {
+        return goldenBeanNumber;
+    }
+
+    public SudRoomListModel setGoldenBeanNumber(String goldenBeanNumber) {
+        this.goldenBeanNumber = goldenBeanNumber;
+        return this;
+    }
+
+    public String getRoomStatus() {
+        return roomStatus;
+    }
+
+    public SudRoomListModel setRoomStatus(String roomStatus) {
+        this.roomStatus = roomStatus;
+        return this;
+    }
+
+    public String getSudGameRoomId() {
+        return sudGameRoomId;
+    }
+
+    public SudRoomListModel setSudGameRoomId(String sudGameRoomId) {
+        this.sudGameRoomId = sudGameRoomId;
+        return this;
+    }
+
+    public String getRoomHolderName() {
+        return roomHolderName;
+    }
+
+    public SudRoomListModel setRoomHolderName(String roomHolderName) {
+        this.roomHolderName = roomHolderName;
+        return this;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public SudRoomListModel setAvatar(String avatar) {
+        this.avatar = avatar;
+        return this;
+    }
+
+    public String getSudGameName() {
+        return sudGameName;
+    }
+
+    public SudRoomListModel setSudGameName(String sudGameName) {
+        this.sudGameName = sudGameName;
+        return this;
+    }
+
+    public String getPlayerTotal() {
+        return playerTotal;
+    }
+
+    public SudRoomListModel setPlayerTotal(String playerTotal) {
+        this.playerTotal = playerTotal;
+        return this;
+    }
+
+    public String getObTotal() {
+        return obTotal;
+    }
+
+    public SudRoomListModel setObTotal(String obTotal) {
+        this.obTotal = obTotal;
+        return this;
+    }
+
+    public List<playerObject> getPlayerObjects() {
+        return playerObjects;
+    }
+
+    public SudRoomListModel setPlayerObjects(List<playerObject> playerObjects) {
+        this.playerObjects = playerObjects;
+        return this;
+    }
+
+    public String getTotal() {
+        if (TextUtils.isEmpty(obTotal)&&TextUtils.isEmpty(playerTotal)){
+            return "0";
+        }else {
+            int obT = Integer.parseInt(obTotal);
+            int playerO = Integer.parseInt(playerTotal);
+            return String.valueOf(obT + playerO);
+        }
+
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/SudgameCodeModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/SudgameCodeModel.java
@@ -0,0 +1,28 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SudgameCodeModel extends BaseModel {
+    @SerializedName("code")
+    private String code;
+    @SerializedName("expireDate")
+    private long expireDate;
+
+    public String getCode() {
+        return code;
+    }
+
+    public SudgameCodeModel setCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    public long getExpireDate() {
+        return expireDate;
+    }
+
+    public SudgameCodeModel setExpireDate(long expireDate) {
+        this.expireDate = expireDate;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/UserAvatarSelectBean.java
+++ b/common/src/main/java/com/yunbao/common/bean/UserAvatarSelectBean.java
@@ -0,0 +1,46 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class UserAvatarSelectBean extends BaseModel {
+    @SerializedName("id")
+    private int id;
+    @SerializedName("name")
+    private String name;
+    @SerializedName("path")
+    private String path;
+    @SerializedName("checked")
+    private int checked;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public int getChecked() {
+        return checked;
+    }
+
+    public void setChecked(int checked) {
+        this.checked = checked;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/bean/UserBean.java
+++ b/common/src/main/java/com/yunbao/common/bean/UserBean.java
@@ -68,6 +68,10 @@ public class UserBean implements Parcelable {
    private String mRankPkImgUrl;
    //是否填写完整资料
    private int user_info_complete;
+    //粉丝团等级
+    private int fansLevel;
+    //粉丝团进场皮肤
+    private String fansEnterRoomUrl;

    public int getUserInfoComplete() {
        return user_info_complete;
@@ -78,6 +82,22 @@ public class UserBean implements Parcelable {
        return this;
    }

+    public int getFansLevel() {
+        return fansLevel;
+    }
+
+    public void setFansLevel(int fansLevel) {
+        this.fansLevel = fansLevel;
+    }
+
+    public String getFansEnterRoomUrl() {
+        return fansEnterRoomUrl;
+    }
+
+    public void setFansEnterRoomUrl(String fansEnterRoomUrl) {
+        this.fansEnterRoomUrl = fansEnterRoomUrl;
+    }
+
    public boolean isRandomPk() {
        return randomPk;
    }
--- a/common/src/main/java/com/yunbao/common/bean/playerObject.java
+++ b/common/src/main/java/com/yunbao/common/bean/playerObject.java
@@ -0,0 +1,38 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class playerObject extends BaseModel {
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("id")
+    private String id;
+    public boolean isChange = false;
+
+    public boolean isChange() {
+        return isChange;
+    }
+
+    public playerObject setChange(boolean change) {
+        isChange = change;
+        return this;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public playerObject setAvatar(String avatar) {
+        this.avatar = avatar;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public playerObject setId(String id) {
+        this.id = id;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java
+++ b/common/src/main/java/com/yunbao/common/custom/CommonRefreshView.java
@@ -17,7 +17,6 @@ import androidx.recyclerview.widget.SimpleItemAnimator;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
-import com.scwang.smartrefresh.layout.header.ClassicsHeader;
 import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.yunbao.common.R;
@@ -188,7 +187,7 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen
                    if (mRecyclerView != null) {
                        RecyclerView.Adapter adapter = mRecyclerView.getAdapter();
                        if (adapter != null && adapter.getItemCount() > 0) {
-                            ToastUtil.show(R.string.load_failure);
+                            ToastUtil.show(mContext.getString(R.string.load_failure));
                        } else {
                            mLoadFailureView.setVisibility(View.VISIBLE);
                        }
@@ -196,7 +195,7 @@ public class CommonRefreshView extends FrameLayout implements View.OnClickListen
                        mLoadFailureView.setVisibility(View.VISIBLE);
                    }
                } else {
-                    ToastUtil.show(R.string.load_failure);
+                    ToastUtil.show(mContext.getString(R.string.load_failure));
                }
            }
            if (mDataHelper != null) {
--- a/common/src/main/java/com/yunbao/common/dialog/AbsDialogCenterPopupWindow.java
+++ b/common/src/main/java/com/yunbao/common/dialog/AbsDialogCenterPopupWindow.java
@@ -0,0 +1,39 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.core.CenterPopupView;
+
+/**
+ * 居中弹窗
+ */
+public abstract class AbsDialogCenterPopupWindow extends CenterPopupView {
+    public final Context mContext;
+
+    public AbsDialogCenterPopupWindow(@NonNull Context context) {
+        super(context);
+        this.mContext = context;
+    }
+
+    /**
+     * <a href="https://github.com/li-xiaojun/XPopup/wiki/5.-%E5%B8%B8%E7%94%A8%E8%AE%BE%E7%BD%AE">参考配置</a>
+     */
+    public abstract void buildDialog(XPopup.Builder builder);
+    public abstract int bindLayoutId();
+
+    @Override
+    protected int getImplLayoutId() {
+        return bindLayoutId();
+    }
+
+    public void showDialog() {
+        XPopup.Builder builder = new XPopup.Builder(mContext);
+        builder.isDestroyOnDismiss(true);
+        builder.enableDrag(false);
+        buildDialog(builder);
+        builder.asCustom(this).show();
+    }
+}
--- a/common/src/main/java/com/yunbao/common/dialog/AbsDialogFullScreenPopupWindow.java
+++ b/common/src/main/java/com/yunbao/common/dialog/AbsDialogFullScreenPopupWindow.java
@@ -0,0 +1,39 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.impl.FullScreenPopupView;
+
+/**
+ * 居中弹窗
+ */
+public abstract class AbsDialogFullScreenPopupWindow extends FullScreenPopupView {
+    public final Context mContext;
+
+    public AbsDialogFullScreenPopupWindow(@NonNull Context context) {
+        super(context);
+        this.mContext = context;
+    }
+
+    /**
+     * <a href="https://github.com/li-xiaojun/XPopup/wiki/5.-%E5%B8%B8%E7%94%A8%E8%AE%BE%E7%BD%AE">参考配置</a>
+     */
+    public abstract void buildDialog(XPopup.Builder builder);
+    public abstract int bindLayoutId();
+
+    @Override
+    protected int getImplLayoutId() {
+        return bindLayoutId();
+    }
+
+    public void showDialog() {
+        XPopup.Builder builder = new XPopup.Builder(mContext);
+        builder.isDestroyOnDismiss(true);
+        builder.enableDrag(false);
+        buildDialog(builder);
+        builder.asCustom(this).show();
+    }
+}
--- a/common/src/main/java/com/yunbao/common/dialog/AbsDialogPopupWindow.java
+++ b/common/src/main/java/com/yunbao/common/dialog/AbsDialogPopupWindow.java
@@ -7,9 +7,11 @@ import androidx.annotation.NonNull;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.core.BottomPopupView;

-
+/**
+ * 底部弹窗
+ */
 public abstract class AbsDialogPopupWindow extends BottomPopupView {
-    private final Context mContext;
+    public final Context mContext;

    public AbsDialogPopupWindow(@NonNull Context context) {
        super(context);
--- a/common/src/main/java/com/yunbao/common/dialog/AbsDialogPositionPopupWindow.java
+++ b/common/src/main/java/com/yunbao/common/dialog/AbsDialogPositionPopupWindow.java
@@ -0,0 +1,39 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.core.PositionPopupView;
+
+/**
+ * 自定义位置弹窗
+ */
+public abstract class AbsDialogPositionPopupWindow extends PositionPopupView {
+    public final Context mContext;
+
+    public AbsDialogPositionPopupWindow(@NonNull Context context) {
+        super(context);
+        this.mContext = context;
+    }
+
+    /**
+     * <a href="https://github.com/li-xiaojun/XPopup/wiki/5.-%E5%B8%B8%E7%94%A8%E8%AE%BE%E7%BD%AE">参考配置</a>
+     */
+    public abstract void buildDialog(XPopup.Builder builder);
+    public abstract int bindLayoutId();
+
+    @Override
+    protected int getImplLayoutId() {
+        return bindLayoutId();
+    }
+
+    public void showDialog() {
+        XPopup.Builder builder = new XPopup.Builder(mContext);
+        builder.isDestroyOnDismiss(true);
+        builder.enableDrag(false);
+        buildDialog(builder);
+        builder.asCustom(this).show();
+    }
+}
--- a/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java
@@ -0,0 +1,242 @@
+package com.yunbao.common.dialog;
+
+import static androidx.core.content.ContextCompat.getSystemService;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.core.BottomPopupView;
+import com.lxj.xpopup.enums.PopupPosition;
+import com.yunbao.common.R;
+import com.yunbao.common.activity.SudGameActivity;
+import com.yunbao.common.bean.CreateSudRoomModel;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+import com.yunbao.common.event.CreateSudGameEvent;
+import com.yunbao.common.event.SudGameListDissMissEvent;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.views.LiveSudGamePopup;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+public class CreateSudGamePopup extends BottomPopupView {
+    private List<CustomSidebarChildModel> customSidebarChildModels = new ArrayList<>();
+    private TextView createGameType;
+    private EditText roomName, gameSill;
+    private long interactionID = 0;
+    private String id;
+    private boolean isHomeView;
+    private boolean isHome = false;
+
+    public CreateSudGamePopup(@NonNull Context context, List<CustomSidebarChildModel> child, boolean isHome) {
+        super(context);
+        customSidebarChildModels = child;
+        this.isHome = isHome;
+    }
+
+    public CreateSudGamePopup setHomeView(boolean homeView) {
+        isHomeView = homeView;
+        return this;
+    }
+
+    // 返回自定义弹窗的布局
+    @Override
+    protected int getImplLayoutId() {
+        if (isHomeView) {
+            return R.layout.dialog_home_create_sud_game;
+        }
+        return R.layout.dialog_create_sud_game;
+    }
+
+    // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        Bus.getOn(this);
+        initView();
+        initDate();
+
+    }
+
+    private void initDate() {
+
+    }
+
+    private void initView() {
+        createGameType = findViewById(R.id.create_game_type);
+        roomName = findViewById(R.id.room_name);
+        gameSill = findViewById(R.id.game_sill);
+        ViewClicksAntiShake.clicksAntiShake(createGameType, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                if (hasMoveUp) {
+                    InputMethodManager imm = getSystemService(getContext(), InputMethodManager.class);
+                    if (imm != null) {
+                        imm.hideSoftInputFromWindow(roomName.getWindowToken(), 0);
+                        imm.hideSoftInputFromWindow(gameSill.getWindowToken(), 0);
+                    }
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            XPopup.Builder builder = new XPopup.Builder(getContext()).atView(createGameType);
+                            builder.hasShadowBg(false)
+                                    .isDestroyOnDismiss(true)
+                                    .isLightStatusBar(false)
+                                    .popupPosition(PopupPosition.Bottom)
+                                    .asCustom(new SudGameListSelectPopup(getContext(), 4, customSidebarChildModels, interactionID))
+                                    .show();
+                        }
+                    }, 500);
+                } else {
+                    XPopup.Builder builder = new XPopup.Builder(getContext()).atView(createGameType);
+                    builder.hasShadowBg(false)
+                            .isDestroyOnDismiss(true)
+                            .isLightStatusBar(false)
+                            .popupPosition(PopupPosition.Bottom)
+                            .asCustom(new SudGameListSelectPopup(getContext(), 4, customSidebarChildModels, interactionID))
+                            .show();
+                }
+
+
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.room_back),
+                new ViewClicksAntiShake.ViewClicksCallBack() {
+                    @Override
+                    public void onViewClicks() {
+                        dismiss();
+                    }
+                });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.create_room), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                String sill = gameSill.getText().toString();
+                String name = roomName.getText().toString();
+                if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                    if (name.length() > 10) {
+                        ToastUtil.show("房間名长度为[1-10]");
+                        return;
+                    }
+
+                }
+                if (IMLoginManager.get(getContext()).getLocaleLanguage() != Locale.SIMPLIFIED_CHINESE) {
+                    if (name.length() > 15) {
+                        ToastUtil.show("Room name length is [1-15]");
+                        return;
+                    }
+
+                }
+                if (TextUtils.isEmpty(name)) {
+                    if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                        ToastUtil.show("房间名不能为空");
+                    } else {
+                        ToastUtil.show("The room name cannot be empty");
+                    }
+                    return;
+                }
+                if (TextUtils.isEmpty(id)) {
+                    if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                        ToastUtil.show("还未选择游戏");
+                    } else {
+                        ToastUtil.show("No game has been selected");
+                    }
+                    return;
+                }
+                if (TextUtils.isEmpty(sill)) {
+                    if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                        ToastUtil.show("数量区间为100--5W");
+                    } else {
+                        ToastUtil.show("The quantity range is 100 to 5 W");
+                    }
+                    return;
+                }
+                if (sill.length() > 6 ){
+                    if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                        ToastUtil.show("数量区间为100--5W");
+                    } else {
+                        ToastUtil.show("The quantity range is 100 to 5 W");
+                    }
+                    return;
+                }else {
+                    int sillNumber = Integer.parseInt(sill);
+                    if (sillNumber < 100 || sillNumber > 50000) {
+                        if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                            ToastUtil.show("数量区间为100--5W");
+                        } else {
+                            ToastUtil.show("The quantity range is 100 to 5 W");
+                        }
+                        return;
+                    }
+                    if (sillNumber%10!=0){
+                        if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                            ToastUtil.show("金豆數量必須為10的倍數");
+                        } else {
+                            ToastUtil.show("The number of golden beans must be a multiple of 10");
+                        }
+                        return;
+                    }
+                }
+
+                LiveNetManager.get(getContext())
+                        .createSudRoom(name, sill, id, new HttpCallback<CreateSudRoomModel>() {
+                            @Override
+                            public void onSuccess(CreateSudRoomModel data) {
+                                if (isHome) {
+                                    dialog.dismiss();
+                                    Intent intent = new Intent(getContext(), SudGameActivity.class);
+                                    intent.putExtra("CreateSudRoom", new Gson().toJson(data));
+                                    getContext().startActivity(intent);
+                                } else {
+                                    new XPopup.Builder(getContext())
+                                            .enableDrag(false)
+                                            .dismissOnTouchOutside(false)
+                                            .dismissOnBackPressed(false)
+                                            .asCustom(new LiveSudGamePopup(getContext(), data))
+                                            .show();
+                                    dialog.dismiss();
+                                    Bus.get().post(new SudGameListDissMissEvent());
+                                }
+
+                            }
+
+                            @Override
+                            public void onError(String error) {
+                                ToastUtil.show(error);
+                            }
+                        });
+            }
+        });
+    }
+
+    @Override
+    protected void onDismiss() {
+        Bus.getOff(this);
+        super.onDismiss();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onSudGameListEvent(CreateSudGameEvent event) {
+        interactionID = event.getInteractionID();
+        createGameType.setText(event.getTitle());
+        id = event.getId();
+
+    }
+}
--- a/common/src/main/java/com/yunbao/common/dialog/LiveNewRolePopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/LiveNewRolePopup.java
@@ -0,0 +1,87 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.lxj.xpopup.core.BottomPopupView;
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.LiveNewRolerPopupAdapter;
+import com.yunbao.common.bean.CustomSidebarInfoModel;
+import com.yunbao.common.event.LiveNewRoleEvent;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.List;
+
+public class LiveNewRolePopup extends BottomPopupView {
+    private boolean showRed = false;
+
+    public LiveNewRolePopup(@NonNull Context context, boolean showRed) {
+        super(context);
+        mContext = context;
+        this.showRed = showRed;
+    }
+
+    private RecyclerView drawerList;
+    private LiveNewRolerPopupAdapter adapter;
+    private Context mContext;
+
+    // 返回自定义弹窗的布局
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.dialog_live_new_role;
+    }
+
+    // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        Bus.getOn(this);
+        initView();
+        initDate();
+
+    }
+
+    private void initDate() {
+        LiveNetManager.get(mContext)
+                .getCustomSidebarInfo("1", new com.yunbao.common.http.base.HttpCallback<List<CustomSidebarInfoModel>>() {
+                    @Override
+                    public void onSuccess(List<CustomSidebarInfoModel> data) {
+                        adapter.updateData(data);
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
+                    }
+                });
+    }
+
+    private void initView() {
+        drawerList = findViewById(R.id.drawerList);
+        adapter = new LiveNewRolerPopupAdapter(mContext, showRed);
+        drawerList.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
+        drawerList.setAdapter(adapter);
+    }
+
+    @Override
+    protected void onDismiss() {
+        Bus.getOff(this);
+
+        super.onDismiss();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onLiveNewRoleEvent(LiveNewRoleEvent event) {
+        dismiss();
+    }
+
+}
--- a/common/src/main/java/com/yunbao/common/dialog/OpenAdBottomDialogPopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/OpenAdBottomDialogPopup.java
@@ -0,0 +1,70 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.XPopup;
+import com.yunbao.common.R;
+import com.yunbao.common.activity.WebViewActivity;
+import com.yunbao.common.bean.OpenAdModel;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.interfaces.OnItemClickListener;
+
+public class OpenAdBottomDialogPopup extends AbsDialogPopupWindow {
+    private ImageView mImageView;
+    private ImageView mClose;
+    private OpenAdModel model;
+    private OnItemClickListener<OpenAdModel> mListener;
+
+    public OpenAdBottomDialogPopup(@NonNull Context context, OpenAdModel model) {
+        super(context);
+        this.model = model;
+    }
+
+
+    @Override
+    public void buildDialog(XPopup.Builder builder) {
+
+    }
+
+    @Override
+    public int bindLayoutId() {
+        return R.layout.dialog_open_bottom_ad;
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+        if (mListener != null) {
+            mListener.onItemClick(model, 0);
+            mListener = null;
+        }
+    }
+
+    public OpenAdBottomDialogPopup setListener(OnItemClickListener<OpenAdModel> mListener) {
+        this.mListener = mListener;
+        return this;
+    }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        mImageView = findViewById(R.id.img);
+        mClose = findViewById(R.id.close);
+        mImageView.setOnClickListener(v -> {
+            WebViewActivity.forward(mContext, model.getUrl(), model.getType() != OpenAdModel.TYPE_HOME);
+            if (mListener != null) {
+                mListener.onItemClick(model, 1);
+                mListener = null;
+            }
+            dismiss();
+        });
+        mClose.setOnClickListener(v -> dismiss());
+        ImgLoader.display(mContext, model.getImageUrl(), mImageView);
+        if (model.getShowTime() > 0) {
+            mClose.postDelayed(this::dismiss, model.getShowTime());
+        }
+    }
+}
--- a/common/src/main/java/com/yunbao/common/dialog/OpenAdCenterDialogPopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/OpenAdCenterDialogPopup.java
@@ -0,0 +1,82 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.lxj.xpopup.XPopup;
+import com.yunbao.common.R;
+import com.yunbao.common.activity.WebViewActivity;
+import com.yunbao.common.bean.OpenAdModel;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.utils.DpUtil;
+import com.yunbao.common.utils.ScreenDimenUtil;
+
+public class OpenAdCenterDialogPopup extends AbsDialogFullScreenPopupWindow {
+    private ImageView mImageView;
+    private ImageView mClose;
+    private OpenAdModel model;
+    private OnItemClickListener<OpenAdModel> mListener;
+
+    public OpenAdCenterDialogPopup(@NonNull Context context, OpenAdModel model) {
+        super(context);
+        this.model = model;
+    }
+
+    public OpenAdCenterDialogPopup setListener(OnItemClickListener<OpenAdModel> mListener) {
+        this.mListener = mListener;
+        return this;
+    }
+
+    @Override
+    public void buildDialog(XPopup.Builder builder) {
+    }
+
+    @Override
+    public int bindLayoutId() {
+        return R.layout.dialog_open_center_ad;
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+        if (mListener != null) {
+            mListener.onItemClick(model, 0);
+            mListener = null;
+        }
+    }
+
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        mImageView = findViewById(R.id.img);
+        mClose = findViewById(R.id.close);
+        findViewById(R.id.layout).setOnClickListener(v -> dismiss());
+        mImageView.setOnClickListener(v -> {
+            WebViewActivity.forward(mContext, model.getUrl(), model.getType() != OpenAdModel.TYPE_HOME);
+            if (mListener != null) {
+                mListener.onItemClick(model, 1);
+                mListener = null;
+            }
+            dismiss();
+        });
+        mClose.setOnClickListener(v -> dismiss());
+        ImgLoader.display(mContext, model.getImageUrl(), mImageView);
+        int width = ScreenDimenUtil.getInstance().getScreenWdith() - DpUtil.dp2px(40);
+        int height = (int) (width * 1.4);
+        if (model.getModel() == OpenAdModel.MODEL_SQUARE) {
+            height = width;
+        }
+        ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mImageView.getLayoutParams();
+        params.width = width;
+        params.height = height;
+        mImageView.setLayoutParams(params);
+        if (model.getShowTime() > 0) {
+            mClose.postDelayed(this::dismiss, model.getShowTime());
+        }
+    }
+}
--- a/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/SudGameListPopup.java
@@ -0,0 +1,346 @@
+package com.yunbao.common.dialog;
+
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.animation.LinearInterpolator;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.google.gson.Gson;
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.core.BottomPopupView;
+import com.lxj.xpopup.enums.PopupPosition;
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.RefreshAdapter;
+import com.yunbao.common.adapter.SudGameListAdapter;
+import com.yunbao.common.bean.CreateSudRoomModel;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+import com.yunbao.common.bean.SudRoomListModel;
+import com.yunbao.common.custom.CommonRefreshView;
+import com.yunbao.common.event.RoomHolderTypeEvent;
+import com.yunbao.common.event.SudGameListDissMissEvent;
+import com.yunbao.common.event.SudGameListEvent;
+import com.yunbao.common.event.SudGameListRefreshEvent;
+import com.yunbao.common.event.SudGameListSillEvent;
+import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.views.LiveSudGamePopup;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+public class SudGameListPopup extends BottomPopupView {
+    private long interactionID = 0;
+    private List<CustomSidebarChildModel> customSidebarChildModels = new ArrayList<>();
+    private ImageView roomGameArrow, roomSillArrow, houseOwnerArrow;
+
+    private TextView gameTitle, sillTitle, houseOwnerTitle;
+    private String id = "0", mLiveUid;
+    private int page = 0;
+    private String mSill = "0,0", mSillName, roomHolderType = "0", roomHolderTypeName;
+    private CommonRefreshView mRefreshView;
+    private SudGameListAdapter sudGameListAdapter;
+
+    public SudGameListPopup(@NonNull Context context, long interactionID, List<CustomSidebarChildModel> child, String liveUid) {
+        super(context);
+        this.interactionID = interactionID;
+        customSidebarChildModels = child;
+        mLiveUid = liveUid;
+    }
+
+    // 返回自定义弹窗的布局
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.dialog_sud_game_list;
+    }
+
+    // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        Bus.getOn(this);
+        initView();
+        initDate();
+
+    }
+
+    private void initDate() {
+
+
+    }
+
+    private void initView() {
+        roomGameArrow = findViewById(R.id.room_game_arrow);
+        roomSillArrow = findViewById(R.id.room_sill_arrow);
+        houseOwnerArrow = findViewById(R.id.house_owner_arrow);
+        gameTitle = findViewById(R.id.game_title);
+        sillTitle = findViewById(R.id.room_sill_text);
+        houseOwnerTitle = findViewById(R.id.house_owner_text);
+
+        mRefreshView = findViewById(R.id.refreshView);
+        mRefreshView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+        sudGameListAdapter = new SudGameListAdapter(getContext(), false);
+        mRefreshView.setLoadMoreEnable(true);
+        mRefreshView.setRecyclerViewAdapter(sudGameListAdapter);
+
+        for (CustomSidebarChildModel model : customSidebarChildModels) {
+            if (TextUtils.equals(String.valueOf(interactionID), model.getSrc())) {
+                gameTitle.setText(model.getTitle().substring(0, 2));
+                id = model.getId();
+            }
+        }
+
+        mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<SudRoomListModel>() {
+            @Override
+            public RefreshAdapter<SudRoomListModel> getAdapter() {
+                return null;
+            }
+
+            @Override
+            public void loadData(int p, HttpCallback callback) {
+                page = p;
+                LiveHttpUtil.getRoomList(id, mSill, roomHolderType, mLiveUid, p - 1, callback);
+            }
+
+            @Override
+            public List<SudRoomListModel> processData(String[] info) {
+                if (info.length > 0) {
+                    List<SudRoomListModel> sudRoomListModels = new ArrayList<>();
+                    for (String json : info) {
+                        SudRoomListModel model = new Gson().fromJson(json, SudRoomListModel.class);
+                        sudRoomListModels.add(model);
+                    }
+                    return sudRoomListModels;
+                } else {
+                    return new ArrayList<>();
+                }
+
+            }
+
+            @Override
+            public void onRefreshSuccess(List<SudRoomListModel> list, int listCount) {
+                Log.i("onRefreshSuccess", listCount + "");
+            }
+
+            @Override
+            public void onRefreshFailure() {
+
+            }
+
+            @Override
+            public void onLoadMoreSuccess(List<SudRoomListModel> loadItemList, int loadItemCount) {
+                sudGameListAdapter.insertList(loadItemList);
+            }
+
+            @Override
+            public void onLoadMoreFailure() {
+
+            }
+        });
+        mRefreshView.initData();
+        mRefreshView.setEmptyLayoutId(R.layout.sud_no_data1);
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.random_start), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                LiveNetManager.get(getContext())
+                        .randomRoom(id, mSill, roomHolderType,new com.yunbao.common.http.base.HttpCallback<CreateSudRoomModel>() {
+                            @Override
+                            public void onSuccess(CreateSudRoomModel data) {
+                                if (data != null) {
+                                    new XPopup.Builder(getContext())
+                                            .enableDrag(false)
+                                            .dismissOnTouchOutside(false)
+                                            .dismissOnBackPressed(false)
+                                            .asCustom(new LiveSudGamePopup(getContext(), data))
+                                            .show();
+                                    dialog.dismiss();
+                                }else {
+                                    if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                                        ToastUtil.show("当前没有可加入的房间");
+                                    } else {
+                                        ToastUtil.show("There are currently no rooms to join");
+                                    }
+                                }
+                            }
+
+                            @Override
+                            public void onError(String error) {
+                                if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                                    ToastUtil.show("当前没有可加入的房间");
+                                } else {
+                                    ToastUtil.show("There are currently no rooms to join");
+                                }
+                            }
+                        });
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.search), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                new SudGameSearchDialogPopup(getContext(), false).showDialog();
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.interactive_game_room_game), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                ObjectAnimator animator = ObjectAnimator.ofFloat(roomGameArrow, "rotation", 0f, 90f);
+                animator.setDuration(500);
+                animator.setInterpolator(new LinearInterpolator());
+                animator.start();
+                XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.interactive_game_room_game));
+                builder.hasShadowBg(false)
+                        .isDestroyOnDismiss(true)
+                        .isLightStatusBar(false)
+                        .popupPosition(PopupPosition.Bottom)
+                        .asCustom(new SudGameListSelectPopup(getContext(), 0, customSidebarChildModels, interactionID))
+                        .show();
+
+
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.room_sill), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                ObjectAnimator animator = ObjectAnimator.ofFloat(roomSillArrow, "rotation", 0f, 90f);
+                animator.setDuration(500);
+                animator.setInterpolator(new LinearInterpolator());
+                animator.start();
+                XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.room_sill));
+                builder.hasShadowBg(false)
+                        .isDestroyOnDismiss(true)
+                        .isLightStatusBar(false)
+                        .popupPosition(PopupPosition.Bottom)
+                        .asCustom(new SudGameListSelectPopup(getContext(), 1, mSillName))
+                        .show();
+
+
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.house_owner), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                ObjectAnimator animator = ObjectAnimator.ofFloat(houseOwnerArrow, "rotation", 0f, 90f);
+                animator.setDuration(500);
+                animator.setInterpolator(new LinearInterpolator());
+                animator.start();
+                XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.house_owner));
+                builder.hasShadowBg(false)
+                        .isDestroyOnDismiss(true)
+                        .isLightStatusBar(false)
+                        .popupPosition(PopupPosition.Bottom)
+                        .asCustom(new SudGameListSelectPopup(getContext(), 2, roomHolderTypeName))
+                        .show();
+
+
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.interactive_game_add), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                new XPopup.Builder(getContext())
+                        .enableDrag(false)
+                        .moveUpToKeyboard(true)
+                        .asCustom(new CreateSudGamePopup(getContext(), customSidebarChildModels, false))
+
+                        .show();
+            }
+        });
+
+    }
+
+    @Override
+    public void dismiss() {
+        Bus.getOff(this);
+        super.dismiss();
+    }
+
+    @Override
+    protected void onDismiss() {
+
+
+        super.onDismiss();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onSudGameListEvent(SudGameListEvent event) {
+        interactionID = event.getInteractionID();
+        if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+            gameTitle.setText(event.getTitle().substring(0, 2));
+        } else {
+            if (event.getTitle().contains("All")) {
+                gameTitle.setText("All");
+            } else {
+                if ((event.getTitle().length() > 6)) {
+                    gameTitle.setText(event.getTitle().substring(0, 5));
+                } else {
+                    gameTitle.setText(event.getTitle());
+                }
+
+            }
+        }
+
+        id = event.getId();
+        ObjectAnimator animator = ObjectAnimator.ofFloat(roomGameArrow, "rotation", 90f, 0f);
+        animator.setDuration(500);
+        animator.setInterpolator(new LinearInterpolator());
+        animator.start();
+        mRefreshView.initData();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onSudGameListSillEvent(SudGameListSillEvent event) {
+        mSill = event.getSill();
+        mSillName = event.getSillName();
+        if (TextUtils.equals("0,0", mSill)) {
+            sillTitle.setText(mSillName);
+        } else {
+            sillTitle.setText(mSillName.substring(0, mSillName.length() - 2));
+        }
+
+
+        ObjectAnimator animator = ObjectAnimator.ofFloat(roomSillArrow, "rotation", 90f, 0f);
+        animator.setDuration(500);
+        animator.setInterpolator(new LinearInterpolator());
+        animator.start();
+        mRefreshView.initData();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onRoomHolderTypeEvent(RoomHolderTypeEvent event) {
+        roomHolderType = event.getRoomHolderType();
+        roomHolderTypeName = event.getRoomHolderTypeName();
+        houseOwnerTitle.setText(roomHolderTypeName);
+        ObjectAnimator animator = ObjectAnimator.ofFloat(houseOwnerArrow, "rotation", 90f, 0f);
+        animator.setDuration(500);
+        animator.setInterpolator(new LinearInterpolator());
+        animator.start();
+        mRefreshView.initData();
+    }
+
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onSudGameListDissMissEvent(SudGameListDissMissEvent event) {
+        dialog.dismiss();
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onSudGameListRefreshEvent(SudGameListRefreshEvent event) {
+        mRefreshView.initData();
+    }
+
+
+}
--- a/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java
@@ -0,0 +1,180 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.text.TextUtils;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.lxj.xpopup.core.AttachPopupView;
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.SudTitleSelectAdapter;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+import com.yunbao.common.event.CreateSudGameEvent;
+import com.yunbao.common.event.RoomHolderTypeEvent;
+import com.yunbao.common.event.SudGameListEvent;
+import com.yunbao.common.event.SudGameListSillEvent;
+import com.yunbao.common.utils.Bus;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SudGameListSelectPopup extends AttachPopupView {
+    private int mType;
+    private List<CustomSidebarChildModel> customSidebarChildModels = new ArrayList<>();
+    private List<String> selectString = new ArrayList<>();
+    private Map<String, String> selectSill = new HashMap<>();
+    private TextView topSelect;
+
+    private RecyclerView sudTitleSelect;
+
+    private SudTitleSelectAdapter sudTitleSelectAdapter;
+    private long interactionID = 0;
+    private DialogInterface.OnDismissListener onDismissListener;
+    private String mSill;
+
+    public SudGameListSelectPopup(@NonNull Context context, int type, List<CustomSidebarChildModel> child, long interactionID) {
+        super(context);
+        customSidebarChildModels = child;
+        mType = type;
+        this.interactionID = interactionID;
+    }
+
+    public SudGameListSelectPopup setOnDismissListener(DialogInterface.OnDismissListener onDismissListener) {
+        this.onDismissListener = onDismissListener;
+        return this;
+    }
+
+    public SudGameListSelectPopup(@NonNull Context context, int mType, String sill) {
+        super(context);
+        this.mType = mType;
+        mSill = sill;
+    }
+
+
+    protected int getImplLayoutId() {
+        return R.layout.view_sud_game_slelect;
+    }
+
+    @Override
+    protected void onCreate() {
+        topSelect = findViewById(R.id.top_select);
+        sudTitleSelect = findViewById(R.id.sud_title_select);
+        int index = -1;
+        if (mType == 0 || mType == 4) {
+            topSelect.setText(getContext().getString(R.string.interactive_game_room_all));
+            for (int i = 0; i < customSidebarChildModels.size(); i++) {
+                selectString.add(customSidebarChildModels.get(i).getTitle());
+                if (TextUtils.equals(String.valueOf(interactionID), customSidebarChildModels.get(i).getSrc())) {
+                    index = i;
+                }
+            }
+            sudTitleSelectAdapter = new SudTitleSelectAdapter(selectString, index, mType);
+            sudTitleSelect.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+            sudTitleSelect.setAdapter(sudTitleSelectAdapter);
+            if (interactionID == 0) {
+                topSelect.setSelected(true);
+            }
+            if (mType == 4) {
+                topSelect.setVisibility(GONE);
+            }
+
+            sudTitleSelectAdapter.setSudTitleSelectCallBack(new SudTitleSelectAdapter.SudTitleSelectCallBack() {
+                @Override
+                public void onSudTitleSelectCallBack(int index) {
+                    if (mType == 0) {
+                        Bus.get().post(new SudGameListEvent()
+                                .setInteractionID(Long.parseLong(customSidebarChildModels.get(index).getSrc()))
+                                .setId(customSidebarChildModels.get(index).getId())
+                                .setTitle(customSidebarChildModels.get(index).getTitle()));
+                    } else {
+                        Bus.get().post(new CreateSudGameEvent()
+                                .setInteractionID(Long.parseLong(customSidebarChildModels.get(index).getSrc()))
+                                .setId(customSidebarChildModels.get(index).getId())
+                                .setTitle(customSidebarChildModels.get(index).getTitle()));
+                    }
+
+                    dialog.dismiss();
+                }
+            });
+        } else if (mType == 1) {
+            selectString.add(getContext().getString(R.string.interactive_game_create_unlimited));
+            selectString.add(getContext().getString(R.string.interactive_game_create_0_1));
+            selectString.add(getContext().getString(R.string.interactive_game_create_1_2));
+            selectString.add(getContext().getString(R.string.interactive_game_create_2_5));
+            selectString.add(getContext().getString(R.string.interactive_game_create_5));
+            selectSill.put(getContext().getString(R.string.interactive_game_create_unlimited), "0,0");
+            selectSill.put(getContext().getString(R.string.interactive_game_create_0_1), "0,1");
+            selectSill.put(getContext().getString(R.string.interactive_game_create_1_2), "1,2");
+            selectSill.put(getContext().getString(R.string.interactive_game_create_2_5), "2,5");
+            selectSill.put(getContext().getString(R.string.interactive_game_create_5), "5,0");
+            index = 0;
+            for (int i = 0; i < selectString.size(); i++) {
+                if (TextUtils.equals(mSill, selectString.get(i))) {
+                    index = i;
+                }
+            }
+            sudTitleSelectAdapter = new SudTitleSelectAdapter(selectString, index, mType);
+            sudTitleSelect.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+            sudTitleSelect.setAdapter(sudTitleSelectAdapter);
+            topSelect.setVisibility(GONE);
+            sudTitleSelectAdapter.setSudTitleSelectCallBack(new SudTitleSelectAdapter.SudTitleSelectCallBack() {
+                @Override
+                public void onSudTitleSelectCallBack(int index) {
+                    String sillName = selectString.get(index);
+                    String sill = selectSill.get(sillName);
+                    Bus.get().post(new SudGameListSillEvent().setSill(sill).setSillName(sillName));
+                    dialog.dismiss();
+                }
+            });
+        } else if (mType == 2) {
+            selectString.add(getContext().getString(R.string.interactive_game_create_unlimited));
+            selectString.add(getContext().getString(R.string.live_anchor));
+            selectString.add(getContext().getString(R.string.interactive_game_player));
+            selectSill.put(getContext().getString(R.string.interactive_game_create_unlimited), "0");
+            selectSill.put(getContext().getString(R.string.live_anchor), "1");
+            selectSill.put(getContext().getString(R.string.interactive_game_player), "2");
+            index = 0;
+            for (int i = 0; i < selectString.size(); i++) {
+                if (TextUtils.equals(mSill, selectString.get(i))) {
+                    index = i;
+                }
+            }
+            sudTitleSelectAdapter = new SudTitleSelectAdapter(selectString, index, mType);
+            sudTitleSelect.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+            sudTitleSelect.setAdapter(sudTitleSelectAdapter);
+            topSelect.setVisibility(GONE);
+            sudTitleSelectAdapter.setSudTitleSelectCallBack(new SudTitleSelectAdapter.SudTitleSelectCallBack() {
+                @Override
+                public void onSudTitleSelectCallBack(int index) {
+                    String roomHolderTypeName = selectString.get(index);
+                    String roomHolderType = selectSill.get(roomHolderTypeName);
+                    Bus.get().post(new RoomHolderTypeEvent().setRoomHolderType(roomHolderType).setRoomHolderTypeName(roomHolderTypeName));
+                    dialog.dismiss();
+                }
+            });
+        }
+        ViewClicksAntiShake.clicksAntiShake(topSelect, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                Bus.get().post(new SudGameListEvent().setInteractionID(0L).setTitle(getContext().getString(R.string.interactive_game_room_all)).setId("0"));
+                dialog.dismiss();
+            }
+        });
+    }
+
+    @Override
+    protected void onDismiss() {
+        super.onDismiss();
+        if(onDismissListener!=null){
+            onDismissListener.onDismiss(null);
+        }
+    }
+}
--- a/common/src/main/java/com/yunbao/common/dialog/SudGameSearchDialogPopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/SudGameSearchDialogPopup.java
@@ -0,0 +1,245 @@
+package com.yunbao.common.dialog;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.alibaba.fastjson.JSONArray;
+import com.lxj.xpopup.XPopup;
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.SudHomeGameListAdapter;
+import com.yunbao.common.bean.CreateSudRoomModel;
+import com.yunbao.common.bean.SudRoomListModel;
+import com.yunbao.common.event.SudRoomListModelEvent;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.utils.SpUtil;
+import com.yunbao.common.utils.StringUtil;
+import com.yunbao.common.views.FlowLayout;
+import com.yunbao.common.views.LiveSudGamePopup;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SudGameSearchDialogPopup extends AbsDialogPopupWindow {
+    private static final String SP_HISTORY = "sud_game_search_history";
+    private EditText editSearch;
+    private RecyclerView listRoom;//listHistory, ;
+    private View history;
+    private FlowLayout searchHistory;
+    //    private SudGameSearchHistoryListAdapter historyListAdapter;
+    private SudHomeGameListAdapter sudGameListAdapter;
+    private boolean isHome = false;
+
+    public SudGameSearchDialogPopup(@NonNull Context context, boolean isHome) {
+        super(context);
+        this.isHome = isHome;
+    }
+
+    @Override
+    public void buildDialog(XPopup.Builder builder) {
+        builder.moveUpToKeyboard(false);
+    }
+
+    @Override
+    public int bindLayoutId() {
+        if (isHome) {
+            return R.layout.dialog_home_search_sud_game;
+        } else {
+            return R.layout.dialog_search_sud_game;
+        }
+
+    }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        editSearch = findViewById(R.id.edit_search);
+//        listHistory = findViewById(R.id.list_history);
+        listRoom = findViewById(R.id.list_room);
+        history = findViewById(R.id.layout_history);
+        findViewById(R.id.layout_history_empty).setVisibility(GONE);
+        searchHistory = findViewById(R.id.search_history);
+        searchHistory.removeAllViews();
+        sudGameListAdapter = new SudHomeGameListAdapter(mContext, isHome);
+        listRoom.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
+        listRoom.setAdapter(sudGameListAdapter);
+        initHistoryData();
+        switchList(true);
+
+        editSearch.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                String value = s.toString();
+                if (!StringUtil.isEmpty(value)) {
+                    search(value);
+
+                } else {
+                    findViewById(R.id.layout_history_empty).setVisibility(GONE);
+                    switchList(true);
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.btn_back), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                dialog.dismiss();
+            }
+        });
+    }
+
+    private List<String> historyList;
+
+    private void addHistoryData(String str) {
+        LinearLayout.LayoutParams layoutParams =
+                new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        layoutParams.setMargins(15, 10, 15, 7);
+        TextView chip = new TextView(mContext);
+        chip.setText(str);
+        chip.setMaxEms(10);
+        chip.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
+        chip.setSingleLine();
+        if (isHome) {
+
+            chip.setBackgroundResource(R.drawable.bg_item_search_history);
+            chip.setTextColor(Color.parseColor("#FF999999"));
+        } else {
+
+            chip.setBackgroundResource(R.drawable.bg_item_home_search_history);
+            chip.setTextColor(Color.parseColor("#FFFFFF"));
+        }
+
+        chip.setLayoutParams(layoutParams);
+        searchHistory.addView(chip, layoutParams);
+
+        chip.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                editSearch.setText(str);
+            }
+        });
+    }
+
+    private void initHistoryData() {
+        searchHistory.removeAllViews();
+        String value = SpUtil.getStringValue(SP_HISTORY);
+        historyList = new ArrayList<>();
+        if (!StringUtil.isEmpty(value)) {
+            historyList = JSONArray.parseArray(value, String.class);
+        }
+
+
+        for (String str : historyList) {
+            addHistoryData(str);
+        }
+    }
+
+    private void search(String value) {
+
+        LiveNetManager.get(mContext)
+                .searchRoomList("0", "0,0", "0", value, 0, new HttpCallback<List<SudRoomListModel>>() {
+                    @Override
+                    public void onSuccess(List<SudRoomListModel> data) {
+                        if (data.size() > 0) {
+                            switchList(false);
+                            sudGameListAdapter.setList(data);
+
+                            findViewById(R.id.layout_history_empty).setVisibility(GONE);
+                            boolean isValue = false;
+                            for (String str : historyList) {
+                                if (!isValue) {
+                                    isValue = TextUtils.equals(value, str);
+                                }
+
+                            }
+                            if (!isValue) {
+
+                                if (historyList.size() < 6) {
+                                    if (historyList.size() == 5) {
+                                        historyList.remove(0);
+                                    }
+                                    historyList.add(value);
+                                    SpUtil.setStringValue(SP_HISTORY, JSONArray.toJSONString(historyList));
+                                    searchHistory.removeAllViews();
+
+                                    for (String str : historyList) {
+                                        addHistoryData(str);
+                                    }
+                                }
+
+                            }
+                        }else {
+                            findViewById(R.id.layout_history_empty).setVisibility(VISIBLE);
+                            listRoom.setVisibility(GONE);
+                            history.setVisibility(GONE);
+                        }
+
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        findViewById(R.id.layout_history_empty).setVisibility(VISIBLE);
+                        switchList(false);
+                    }
+                });
+    }
+
+    private void switchList(boolean isHistory) {
+        if (isHistory) {
+            history.setVisibility(VISIBLE);
+            listRoom.setVisibility(GONE);
+        } else {
+            listRoom.setVisibility(VISIBLE);
+            history.setVisibility(GONE);
+        }
+    }
+
+    @Override
+    protected void onDismiss() {
+        super.onDismiss();
+
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onSudGameListEvent(SudRoomListModelEvent event) {
+        CreateSudRoomModel createSudRoomModel = new CreateSudRoomModel();
+        createSudRoomModel.setSudGameId(event.getModel().getSudGameId());
+        createSudRoomModel.setSudGameRoomId(event.getModel().getSudGameRoomId());
+        createSudRoomModel.setAvatar(event.getModel().getAvatar());
+        createSudRoomModel.setRoomName(event.getModel().getRoomName());
+        createSudRoomModel.setSudGameName(event.getModel().getSudGameName());
+        new XPopup.Builder(getContext())
+                .enableDrag(false)
+                .dismissOnTouchOutside(false)
+                .dismissOnBackPressed(false)
+                .asCustom(new LiveSudGamePopup(getContext(), createSudRoomModel))
+                .show();
+        dialog.dismiss();
+    }
+}
--- a/common/src/main/java/com/yunbao/common/event/AllServerNotifyEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/AllServerNotifyEvent.java
@@ -13,6 +13,7 @@ public class AllServerNotifyEvent extends BaseModel {
    //礼物名称
    @SerializedName("giftname")
    private String giftName;
+
    //盲盒名称
    @SerializedName("box_type_name")
    private String boxTypeName;
--- a/common/src/main/java/com/yunbao/common/event/CheckRemainingBalanceEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/CheckRemainingBalanceEvent.java
@@ -0,0 +1,30 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+import com.yunbao.common.sud.state.SudMGPMGState;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CheckRemainingBalanceEvent extends BaseModel {
+    public int seatIndex;
+    public List<SudMGPMGState.MGCommonGameSettle.PlayerResult> results = new ArrayList<>();
+
+    public List<SudMGPMGState.MGCommonGameSettle.PlayerResult> getResults() {
+        return results;
+    }
+
+    public CheckRemainingBalanceEvent setResults(List<SudMGPMGState.MGCommonGameSettle.PlayerResult> results) {
+        this.results = results;
+        return this;
+    }
+
+    public int getSeatIndex() {
+        return seatIndex;
+    }
+
+    public CheckRemainingBalanceEvent setSeatIndex(int seatIndex) {
+        this.seatIndex = seatIndex;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/event/CreateSudGameEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/CreateSudGameEvent.java
@@ -0,0 +1,38 @@
+package com.yunbao.common.event;
+
+import android.widget.TextView;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class CreateSudGameEvent extends BaseModel {
+    private long interactionID = 0;
+    private String title;
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    public CreateSudGameEvent setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public CreateSudGameEvent setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public long getInteractionID() {
+        return interactionID;
+    }
+
+    public CreateSudGameEvent setInteractionID(long interactionID) {
+        this.interactionID = interactionID;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/CustomDrawerPopupEvent.java
@@ -1,6 +1,10 @@
 package com.yunbao.common.event;

 import com.yunbao.common.bean.BaseModel;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+
+import java.util.ArrayList;
+import java.util.List;

 public class CustomDrawerPopupEvent extends BaseModel {
    //是否关闭弹窗
@@ -28,6 +32,37 @@ public class CustomDrawerPopupEvent extends BaseModel {
    //畫質選擇
    private boolean qualitySelection = false;
    private boolean fontSize = false;
+    private boolean interaction = false;
+    private long interactionID;
+
+    private List<CustomSidebarChildModel> child = new ArrayList<>();
+
+    public List<CustomSidebarChildModel> getChild() {
+        return child;
+    }
+
+    public CustomDrawerPopupEvent setChild(List<CustomSidebarChildModel> child) {
+        this.child = child;
+        return this;
+    }
+
+    public boolean isInteraction() {
+        return interaction;
+    }
+
+    public CustomDrawerPopupEvent setInteraction(boolean interaction) {
+        this.interaction = interaction;
+        return this;
+    }
+
+    public long getInteractionID() {
+        return interactionID;
+    }
+
+    public CustomDrawerPopupEvent setInteractionID(long interactionID) {
+        this.interactionID = interactionID;
+        return this;
+    }

    public boolean isSmallWindow() {
        return smallWindow;
--- a/common/src/main/java/com/yunbao/common/event/GiftWallItemEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/GiftWallItemEvent.java
@@ -7,6 +7,17 @@ public class GiftWallItemEvent extends BaseModel {
    private GiftWallModel giftWallModel;
    private boolean unlit;

+    private boolean csb;
+
+    public boolean isCsb() {
+        return csb;
+    }
+
+    public GiftWallItemEvent setCsb(boolean csb) {
+        this.csb = csb;
+        return this;
+    }
+
    public GiftWallModel getGiftWallModel() {
        return giftWallModel;
    }
--- a/common/src/main/java/com/yunbao/common/event/LiveErrorEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/LiveErrorEvent.java
@@ -0,0 +1,6 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class LiveErrorEvent extends BaseModel {
+}
--- a/common/src/main/java/com/yunbao/common/event/LiveNewRoleEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/LiveNewRoleEvent.java
@@ -0,0 +1,4 @@
+package com.yunbao.common.event;
+
+public class LiveNewRoleEvent {
+}
--- a/common/src/main/java/com/yunbao/common/event/LiveOpenSudRoomEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/LiveOpenSudRoomEvent.java
@@ -0,0 +1,17 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+import com.yunbao.common.bean.CreateSudRoomModel;
+
+public class LiveOpenSudRoomEvent extends BaseModel {
+    private CreateSudRoomModel createSudRoomModel = null;
+
+    public CreateSudRoomModel getCreateSudRoomModel() {
+        return createSudRoomModel;
+    }
+
+    public LiveOpenSudRoomEvent setCreateSudRoomModel(CreateSudRoomModel createSudRoomModel) {
+        this.createSudRoomModel = createSudRoomModel;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/event/LiveRoomChangeEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/LiveRoomChangeEvent.java
@@ -1,4 +1,4 @@
-package com.yunbao.live.event;
+package com.yunbao.common.event;

 import com.yunbao.common.bean.LiveBean;

--- a/common/src/main/java/com/yunbao/common/event/NewRoleCustomDrawerPopupEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/NewRoleCustomDrawerPopupEvent.java
@@ -0,0 +1,182 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class NewRoleCustomDrawerPopupEvent extends BaseModel {
+    //是否关闭弹窗
+    private boolean isDisMiss = false;
+    //权益的名字
+    private String rightsInterests = "";
+    //活动的id
+    private int activityId = 0;
+    //跳转网页地址
+    private String htmlUrl;
+    //是否半屏展示
+    private boolean screen = false;
+    //系统消息
+    private boolean systemNotice = false;
+    //在线客服
+    private boolean online = false;
+    //举报
+    private boolean reportLayout = false;
+    //刷新
+    private boolean refresh = false;
+    //特效設置
+    private boolean effects = false;
+    //小窗播放
+    private boolean smallWindow = false;
+    //畫質選擇
+    private boolean qualitySelection = false;
+    private boolean fontSize = false;
+    private boolean interaction = false;
+    private long interactionID;
+    private List<CustomSidebarChildModel> child = new ArrayList<>();
+
+    public List<CustomSidebarChildModel> getChild() {
+        return child;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setChild(List<CustomSidebarChildModel> child) {
+        this.child = child;
+        return this;
+    }
+
+    public boolean isInteraction() {
+        return interaction;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setInteraction(boolean interaction) {
+        this.interaction = interaction;
+        return this;
+    }
+
+    public long getInteractionID() {
+        return interactionID;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setInteractionID(long interactionID) {
+        this.interactionID = interactionID;
+        return this;
+    }
+
+    public boolean isSmallWindow() {
+        return smallWindow;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setSmallWindow(boolean smallWindow) {
+        this.smallWindow = smallWindow;
+        return this;
+    }
+
+    public boolean isQualitySelection() {
+        return qualitySelection;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setQualitySelection(boolean qualitySelection) {
+        this.qualitySelection = qualitySelection;
+        return this;
+    }
+
+    public boolean isRefresh() {
+        return refresh;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setRefresh(boolean refresh) {
+        this.refresh = refresh;
+        return this;
+    }
+
+    public boolean isSystemNotice() {
+        return systemNotice;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setSystemNotice(boolean systemNotice) {
+        this.systemNotice = systemNotice;
+        return this;
+    }
+
+    public boolean isOnline() {
+        return online;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setOnline(boolean online) {
+        this.online = online;
+        return this;
+    }
+
+    public boolean isReportLayout() {
+        return reportLayout;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setReportLayout(boolean reportLayout) {
+        this.reportLayout = reportLayout;
+        return this;
+    }
+
+    public String getHtmlUrl() {
+        return htmlUrl;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setHtmlUrl(String htmlUrl) {
+        this.htmlUrl = htmlUrl;
+        return this;
+    }
+
+    public boolean isScreen() {
+        return screen;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setScreen(boolean screen) {
+        this.screen = screen;
+        return this;
+    }
+
+    public int getActivityId() {
+        return activityId;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setActivityId(int activityId) {
+        this.activityId = activityId;
+        return this;
+    }
+
+    public String getRightsInterests() {
+        return rightsInterests;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setRightsInterests(String rightsInterests) {
+        this.rightsInterests = rightsInterests;
+        return this;
+    }
+
+    public boolean isDisMiss() {
+        return isDisMiss;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setDisMiss(boolean disMiss) {
+        isDisMiss = disMiss;
+        return this;
+    }
+
+    public boolean isEffects() {
+        return effects;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setEffects(boolean effects) {
+        this.effects = effects;
+        return this;
+    }
+
+    public boolean isFontSize() {
+        return fontSize;
+    }
+
+    public NewRoleCustomDrawerPopupEvent setFontSize(boolean fontSize) {
+        this.fontSize = fontSize;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/event/RoomHolderTypeEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/RoomHolderTypeEvent.java
@@ -0,0 +1,26 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class RoomHolderTypeEvent extends BaseModel {
+    private String roomHolderType;
+    private String roomHolderTypeName;
+
+    public String getRoomHolderType() {
+        return roomHolderType;
+    }
+
+    public RoomHolderTypeEvent setRoomHolderType(String roomHolderType) {
+        this.roomHolderType = roomHolderType;
+        return this;
+    }
+
+    public String getRoomHolderTypeName() {
+        return roomHolderTypeName;
+    }
+
+    public RoomHolderTypeEvent setRoomHolderTypeName(String roomHolderTypeName) {
+        this.roomHolderTypeName = roomHolderTypeName;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java
@@ -1,5 +1,7 @@
 package com.yunbao.common.event;

+import android.text.TextUtils;
+
 import com.google.gson.annotations.SerializedName;
 import com.yunbao.common.bean.BaseModel;

@@ -21,6 +23,8 @@ public class SendBlindGiftEvent extends BaseModel {
    private String totalcoin;
    @SerializedName("giftname")
    private String giftname;
+    @SerializedName("giftname_en")
+    private String giftname_en;
    @SerializedName("giftnameen")
    private String giftnameen;
    @SerializedName("gifticon")
@@ -69,6 +73,8 @@ public class SendBlindGiftEvent extends BaseModel {
    private String needcoin;
    @SerializedName("gift_msg")
    private String giftMsg;
+    @SerializedName("gift_msg_en")
+    private String giftMsgen;
    @SerializedName("gift_colour")
    private String giftColour;
    @SerializedName("box_type")
@@ -85,6 +91,8 @@ public class SendBlindGiftEvent extends BaseModel {
    private Object dressId;
    @SerializedName("dress_name")
    private String dressName;
+    @SerializedName("dress_nameen")
+    private String dress_nameen;
    @SerializedName("display_src")
    private Object displaySrc;
    @SerializedName("effect_src")
@@ -95,6 +103,8 @@ public class SendBlindGiftEvent extends BaseModel {
    private Object nobleDress;
    @SerializedName("dress_msg")
    private String dressMsg;
+    @SerializedName("dress_msg_en")
+    private String dressMsgEN;
    @SerializedName("dress_colour")
    private String dressColour;
    @SerializedName("dress_threshold_value")
@@ -119,11 +129,29 @@ public class SendBlindGiftEvent extends BaseModel {
        return this;
    }

+    public String getGiftMsgen() {
+        return giftMsgen;
+    }
+
+    public SendBlindGiftEvent setGiftMsgen(String giftMsgen) {
+        this.giftMsgen = giftMsgen;
+        return this;
+    }
+
    public SendBlindGiftEvent setUserNiceName(String userNiceName) {
        this.userNiceName = userNiceName;
        return this;
    }

+    public String getDress_nameen() {
+        return dress_nameen;
+    }
+
+    public SendBlindGiftEvent setDress_nameen(String dress_nameen) {
+        this.dress_nameen = dress_nameen;
+        return this;
+    }
+
    public String getUid() {
        return uid;
    }
@@ -530,6 +558,15 @@ public class SendBlindGiftEvent extends BaseModel {
        return this;
    }

+    public String getDressMsgEN() {
+        return dressMsgEN;
+    }
+
+    public SendBlindGiftEvent setDressMsgEN(String dressMsgEN) {
+        this.dressMsgEN = dressMsgEN;
+        return this;
+    }
+
    public String getDressColour() {
        return dressColour;
    }
@@ -556,4 +593,13 @@ public class SendBlindGiftEvent extends BaseModel {
        this.liveGiftNotify = liveGiftNotify;
        return this;
    }
+
+    public String getGiftname_en() {
+        return TextUtils.isEmpty(giftname_en)?giftnameen:giftname_en;
+    }
+
+    public SendBlindGiftEvent setGiftname_en(String giftname_en) {
+        this.giftname_en = giftname_en;
+        return this;
+    }
 }
--- a/common/src/main/java/com/yunbao/common/event/SudGameListDissMissEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/SudGameListDissMissEvent.java
@@ -0,0 +1,6 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class SudGameListDissMissEvent extends BaseModel {
+}
--- a/common/src/main/java/com/yunbao/common/event/SudGameListEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/SudGameListEvent.java
@@ -0,0 +1,36 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class SudGameListEvent extends BaseModel {
+    private long interactionID = 0;
+    private String title;
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    public SudGameListEvent setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public SudGameListEvent setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public long getInteractionID() {
+        return interactionID;
+    }
+
+    public SudGameListEvent setInteractionID(long interactionID) {
+        this.interactionID = interactionID;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/event/SudGameListRefreshEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/SudGameListRefreshEvent.java
@@ -0,0 +1,6 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class SudGameListRefreshEvent extends BaseModel {
+}
--- a/common/src/main/java/com/yunbao/common/event/SudGameListSillEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/SudGameListSillEvent.java
@@ -0,0 +1,26 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class SudGameListSillEvent extends BaseModel {
+    private String sillName;
+    private String sill;
+
+    public String getSillName() {
+        return sillName;
+    }
+
+    public SudGameListSillEvent setSillName(String sillName) {
+        this.sillName = sillName;
+        return this;
+    }
+
+    public String getSill() {
+        return sill;
+    }
+
+    public SudGameListSillEvent setSill(String sill) {
+        this.sill = sill;
+        return this;
+    }
+}
--- a/common/src/main/java/com/yunbao/common/event/SudRoomListModelEvent.java
+++ b/common/src/main/java/com/yunbao/common/event/SudRoomListModelEvent.java
@@ -0,0 +1,17 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+import com.yunbao.common.bean.SudRoomListModel;
+
+public class SudRoomListModelEvent extends BaseModel {
+    private SudRoomListModel model;
+
+    public SudRoomListModel getModel() {
+        return model;
+    }
+
+    public SudRoomListModelEvent setModel(SudRoomListModel model) {
+        this.model = model;
+        return this;
+    }
+}
--- 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,12 @@ 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.utils.WordUtil;
+import com.yunbao.common.views.HintCustomPopup;
 import com.yunbao.common.views.LiveNewWishGiftPopup;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;

@@ -66,7 +67,7 @@ public class LiveNewWishListFragment extends BaseFragment {
            @Override
            public void onViewClicks() {
                saveWish();
-                Bus.get().post(new PopupViewDismissEvent());
+
            }
        });
    }
@@ -82,7 +83,7 @@ public class LiveNewWishListFragment extends BaseFragment {

            @Override
            public void onError(String error) {
-                ToastUtil.show(R.string.net_error);
+                ToastUtil.show(getActivity().getString(R.string.net_error));
            }
        });
    }
@@ -105,52 +106,110 @@ 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);
            }

        }
+        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) {
-            Bus.get().post(new PopupViewDismissEvent());
+            LiveNetManager.get(getContext()).
+                    setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
+                        @Override
+                        public void onSuccess(String data) {
+                            ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
+                        }
+
+                        @Override
+                        public void onError(String error) {
+                            ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
+                        }
+                    });
+        } 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(getActivity().getString(R.string.must_hint));
+                                        return;
+                                    }
+                                    LiveNetManager.get(getContext()).
+                                            setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
+                                                @Override
+                                                public void onSuccess(String data) {
+                                                    ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
+                                                }
+
+                                                @Override
+                                                public void onError(String error) {
+                                                      ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
+                                                }
+                                            });
+                                }
+                            })).show();
        } else {
-            if (wishList2.size()>10){
-                ToastUtil.show(R.string.must_hint);
+            if (wishList2.size() > 10) {
+                ToastUtil.show(getContext().getString(R.string.must_hint));
                return;
            }
            LiveNetManager.get(getContext()).
                    setWishlistV2(type, gson.toJson(wishList2), new HttpCallback<String>() {
                        @Override
                        public void onSuccess(String data) {
-
+                            ToastUtil.show(WordUtil.isNewZh()?"修改成功":"Success");
                        }

                        @Override
                        public void onError(String error) {
-                            ToastUtil.show(R.string.net_error);
+                              ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
                        }
                    });
-            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;
-            }
+
        }
-
-
    }
 }
--- a/common/src/main/java/com/yunbao/common/fragment/ProcessFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/ProcessFragment.java
@@ -81,20 +81,20 @@ public class ProcessFragment extends Fragment {
        switch (permission) {
            case Manifest.permission.READ_EXTERNAL_STORAGE:
            case Manifest.permission.WRITE_EXTERNAL_STORAGE:
-                ToastUtil.show(R.string.permission_storage_refused);
+                ToastUtil.show(getActivity().getString(R.string.permission_storage_refused));
                break;
            case Manifest.permission.CAMERA:
-                ToastUtil.show(R.string.permission_camera_refused);
+                ToastUtil.show(getActivity().getString(R.string.permission_camera_refused));
                break;
            case Manifest.permission.RECORD_AUDIO:
-                ToastUtil.show(R.string.permission_record_audio_refused);
+                ToastUtil.show(getActivity().getString(R.string.permission_record_audio_refused));
                break;
            case Manifest.permission.ACCESS_COARSE_LOCATION:
-                ToastUtil.show(R.string.permission_location_refused);
+                ToastUtil.show(getActivity().getString(R.string.permission_location_refused));
                CommonAppConfig.getInstance().clearLocationInfo();
                break;
            case Manifest.permission.READ_PHONE_STATE:
-                ToastUtil.show(R.string.permission_read_phone_state_refused);
+                ToastUtil.show(getActivity().getString(R.string.permission_read_phone_state_refused));
                break;
        }
    }
--- a/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
+++ b/common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
@@ -13,6 +13,7 @@ import com.lzy.okgo.callback.StringCallback;
 import com.lzy.okgo.model.Response;
 import com.lzy.okgo.request.PostRequest;
 import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.R;
 import com.yunbao.common.activity.ErrorActivity;
 import com.yunbao.common.bean.ConfigBean;
@@ -162,7 +163,7 @@ public class CommonHttpUtil {
            } else {
                locale = IMLoginManager.get(context).getLocaleLanguage();
            }
-            if (locale.getLanguage().equals("zh")) {
+            if (WordUtil.isNewZh()) {
                lang = "chinese";

            } else {
@@ -198,6 +199,10 @@ public class CommonHttpUtil {
                                if (obj.containsKey("is_chat")) {
                                    IMLoginManager.get(context).initChat(String.valueOf(obj.getInteger("is_chat")));
                                }
+                                if (obj.containsKey("levelfans")) {
+                                    JSONArray levelArray = obj.getJSONArray("levelfans");
+                                    new NewLevelManager(context).upDataFansLevel(levelArray.toJSONString());
+                                }
                                if (obj.containsKey("level_new")) {//缓存等级数据
                                    JSONArray levelArray = obj.getJSONArray("level_new");
                                    new NewLevelManager(context).UpDataLevel(levelArray.toJSONString());
@@ -256,6 +261,8 @@ public class CommonHttpUtil {
                                            AppManager.getInstance().AppExit();
                                        }
                                    }).build().show();
+                        } else {
+                            ToastUtil.show(CommonAppContext.getTopActivity().getString(R.string.net_error) + "code:" + code + " msg:" + msg);
                        }
                    }

@@ -310,8 +317,15 @@ public class CommonHttpUtil {
                .execute(new HttpCallback() {
                    @Override
                    public void onSuccess(int code, String msg, String[] info) {
-                        if (code == 0 && info.length > 0) {
+                        if (code == 0 && info.length > 0 || code == 1001) {
                            int isAttention = JSON.parseObject(info[0]).getIntValue("isattent");//1是 关注  0是未关注
+                           /* if (code == 1001) {
+                                if (WordUtil.isNewZh()) {
+                                    ToastUtil.show("粉絲團等級已清零，待領取獎勵已自動領取至【個性裝扮】");
+                                } else {
+                                    ToastUtil.show("The level of the fan club has been cleared, and the rewards to be claimed have been automatically received to [Personalized Dressing]");
+                                }
+                            }*/
                            EventBus.getDefault().post(new FollowEvent(touid, isAttention));
                            if (callback != null) {
                                callback.callback(isAttention);
--- a/common/src/main/java/com/yunbao/common/http/HttpCallback.java
+++ b/common/src/main/java/com/yunbao/common/http/HttpCallback.java
@@ -8,10 +8,10 @@ import com.google.gson.Gson;
 import com.lzy.okgo.callback.AbsCallback;
 import com.lzy.okgo.model.Response;
 import com.lzy.okgo.request.base.Request;
-import com.yunbao.common.R;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;

 import java.net.ConnectException;
 import java.net.SocketException;
@@ -36,7 +36,7 @@ public abstract class HttpCallback extends AbsCallback<JsonBean> {
    public void onSuccess(Response<JsonBean> response) {
        JsonBean bean = response.body();
        String gson = new Gson().toJson(bean);
-        Log.e("onSuccess",gson);
+        Log.e("onSuccess", gson);
        if (bean != null) {
            if (200 == bean.getRet()) {
                Data data = bean.getData();
@@ -65,7 +65,7 @@ public abstract class HttpCallback extends AbsCallback<JsonBean> {
        t.printStackTrace();
        L.e("网络请求错误---->" + t.getClass() + " : " + t.getMessage());
        if (t instanceof SocketTimeoutException || t instanceof ConnectException || t instanceof UnknownHostException || t instanceof UnknownServiceException || t instanceof SocketException) {
-            ToastUtil.show(R.string.load_failure);
+            ToastUtil.show(WordUtil.isNewZh() ? "網絡請求失敗" : "Network request failed");
        }
 //        if (showLoadingDialog() && mLoadingDialog != null) {
 //            mLoadingDialog.dismiss();
--- a/common/src/main/java/com/yunbao/common/http/LiveHttpConsts.java
+++ b/common/src/main/java/com/yunbao/common/http/LiveHttpConsts.java
@@ -1,4 +1,4 @@
-package com.yunbao.live.http;
+package com.yunbao.common.http;

 /**
 * Created by cxf on 2019/3/21.
--- a/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java
+++ b/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java
@@ -1,4 +1,4 @@
-package com.yunbao.live.http;
+package com.yunbao.common.http;

 import android.text.TextUtils;

@@ -6,10 +6,6 @@ import com.lzy.okgo.request.GetRequest;
 import com.lzy.okgo.request.PostRequest;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
-import com.yunbao.common.http.CommonHttpUtil;
-import com.yunbao.common.http.HttpCallback;
-import com.yunbao.common.http.HttpClient;
-import com.yunbao.common.http.JsonBean;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.MD5Util;
@@ -292,6 +288,7 @@ public class LiveHttpUtil {

    /**
     * 主播或管理员禁言
+     *
     * @param time 禁言时间 （分）
     */
    public static void setShutUp(String liveUid, String stream, int type, String touid, String time, HttpCallback callback) {
@@ -619,7 +616,11 @@ public class LiveHttpUtil {
     * 观众给主播送礼物
     */
    public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, HttpCallback callback) {
-        sendGift(by, liveUid, stream, giftId, giftCount, 0, callback);
+        sendGift(by, liveUid, stream, giftId, giftCount, 0, false, callback);
+    }
+
+    public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, HttpCallback callback) {
+        sendGift(by, liveUid, stream, giftId, giftCount, isContactGift, false, callback);
    }

    /**
@@ -627,7 +628,7 @@ public class LiveHttpUtil {
     *
     * @param isContactGift 是否为联系方式礼物
     */
-    public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, HttpCallback callback) {
+    public static void sendGift(String by, String liveUid, String stream, int giftId, String giftCount, int isContactGift, boolean isFansGroupGift, HttpCallback callback) {
        HttpClient.getInstance().get("Live.sendGift", LiveHttpConsts.SEND_GIFT)
                .params("liveuid", liveUid)
                .params("stream", stream)
@@ -635,6 +636,20 @@ public class LiveHttpUtil {
                .params("isContactGift", isContactGift)
                .params("giftcount", giftCount)
                .params("isprank", by)
+                .params("fans_exclusive_pack", isFansGroupGift ? "1" : "0")
+                .params("appVersion", CommonAppConfig.getInstance().getVersion())
+                .execute(callback);
+    }
+
+    public static void sendBlindBoxTicket(String by, String liveUid, String stream, int giftId, HttpCallback callback) {
+        HttpClient.getInstance().get("Live.sendBlindBoxTicket", LiveHttpConsts.SEND_GIFT)
+                .params("liveuid", liveUid)
+                .params("stream", stream)
+                .params("giftid", giftId)
+                .params("isContactGift", 0)
+                .params("giftcount", "1")
+                .params("isprank", by)
+                .params("fans_exclusive_pack", "0")
                .params("appVersion", CommonAppConfig.getInstance().getVersion())
                .execute(callback);
    }
@@ -952,6 +967,16 @@ public class LiveHttpUtil {
        HttpClient.getInstance().get("Home.getFollow", "Home.getFollow")
                .params("p", p)
                .execute(callback);
+
    }

+    public static void getRoomList(String sudGameId, String threshold, String roomHolderType, String liveUid,int page,HttpCallback callback ) {
+        HttpClient.getInstance().get("Sudgameserver.getRoomList", "Sudgameserver.getRoomList")
+                .params("sud_game_id",sudGameId)
+                .params("threshold",threshold)
+                .params("room_holder_type",roomHolderType)
+                .params("liveuid",liveUid)
+                .params("page",page)
+                .execute(callback);
+    }
 }
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -7,13 +7,19 @@ import com.yunbao.common.bean.AnchorRecommendModel;
 import com.yunbao.common.bean.BaseModel;
 import com.yunbao.common.bean.BlindBoxInfoModel;
 import com.yunbao.common.bean.CheckLiveModel;
+import com.yunbao.common.bean.CheckRemainingBalance;
 import com.yunbao.common.bean.ContributeModel;
+import com.yunbao.common.bean.CreateSudRoomModel;
 import com.yunbao.common.bean.CustomSidebarInfoModel;
 import com.yunbao.common.bean.DiscountsModel;
 import com.yunbao.common.bean.EnterRoomNewModel;
 import com.yunbao.common.bean.FaceBookUpModel;
+import com.yunbao.common.bean.FansCheckRed;
+import com.yunbao.common.bean.FansGroupGiftPack;
+import com.yunbao.common.bean.FansGroupGiftPackInfo;
 import com.yunbao.common.bean.GiftAlreadyWallModel;
 import com.yunbao.common.bean.GiftGuideModel;
+import com.yunbao.common.bean.GiftNamingInfoModel;
 import com.yunbao.common.bean.GiftWallGiftDetail;
 import com.yunbao.common.bean.GiftWallModel;
 import com.yunbao.common.bean.HourRank;
@@ -36,6 +42,7 @@ import com.yunbao.common.bean.MsgSwitchDetailModel;
 import com.yunbao.common.bean.NewPeopleInfo;
 import com.yunbao.common.bean.NobleRankHideUserListModel;
 import com.yunbao.common.bean.NobleTrumpetModel;
+import com.yunbao.common.bean.OpenAdModel;
 import com.yunbao.common.bean.PkRankBean;
 import com.yunbao.common.bean.PrankGiftBean;
 import com.yunbao.common.bean.PrankHttpTurntableBean;
@@ -49,7 +56,10 @@ import com.yunbao.common.bean.SearchModel;
 import com.yunbao.common.bean.SetAttentsModel;
 import com.yunbao.common.bean.SlideInBannerModel;
 import com.yunbao.common.bean.StarChallengeStatusModel;
+import com.yunbao.common.bean.SudRoomListModel;
+import com.yunbao.common.bean.SudgameCodeModel;
 import com.yunbao.common.bean.UserAreaBean;
+import com.yunbao.common.bean.UserAvatarSelectBean;
 import com.yunbao.common.bean.VipModel;
 import com.yunbao.common.bean.WishListGiftConfModel;
 import com.yunbao.common.bean.WishListModel;
@@ -291,7 +301,7 @@ public interface PDLiveApi {
     * 新侧边栏请求
     */
    @GET("/api/public/?service=Live.getCustomSidebarInfo")
-    Observable<ResponseModel<List<CustomSidebarInfoModel>>> getCustomSidebarInfo();
+    Observable<ResponseModel<List<CustomSidebarInfoModel>>> getCustomSidebarInfo(@Query("type") String type);

    /**
     * 任务领取接口
@@ -761,18 +771,19 @@ public interface PDLiveApi {


    /**
-     * 获取盲盒礼物当前数据
+     * 创建红包
     */
    @GET("/api/public/?service=Live.createRedPacket")
    Observable<ResponseModel<Object>> createRedPacket(
            @Query("liveuid") String liveUid,
+            @Query("is_fans") int needFansGroup,
            @Query("red_packet_money") String redPacketMoney,
            @Query("red_packet_quantity") String redPacketQuantity,
            @Query("conditions") String conditions
    );

    /**
-     * 获取盲盒礼物当前数据
+     * 获取红包数据
     */
    @GET("/api/public/?service=Live.redPacketInfo")
    Observable<ResponseModel<RedPacketInfoModel>> redPacketInfo(
@@ -835,6 +846,22 @@ public interface PDLiveApi {
            @Query("red_packet_id") String redPacketId
    );

+    /**
+     * 获取系统默认头像列表
+     */
+    @GET("/api/public/?service=Userhome.getDefaultAvatarList")
+    Observable<ResponseModel<List<UserAvatarSelectBean>>> getSystemUserAvatar();
+
+    /**
+     * 设置系统默认头像
+     *
+     * @param id 头像id
+     */
+    @GET("/api/public/?service=Userhome.setAvatar")
+    Observable<ResponseModel<Object>> setSystemUserAvatar(
+            @Query("avatar_id") int id
+    );
+
    /**
     * 礼物墙已点亮
     */
@@ -844,6 +871,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
+    );
+
    /**
     * 礼物墙未点亮
     */
@@ -859,7 +895,8 @@ public interface PDLiveApi {
    @GET("/api/public/?service=Gift.giftDetail")
    Observable<ResponseModel<GiftWallGiftDetail>> giftDetail(
            @Query("liveuid") String liveUid,
-            @Query("gift_id") String giftId
+            @Query("gift_id") String giftId,
+            @Query("to_uid") String toUid
    );

    /**
@@ -885,18 +922,126 @@ public interface PDLiveApi {
     */
    @GET("/api/public/?service=Gift.getGiftGuide")
    Observable<ResponseModel<List<GiftGuideModel>>> getGiftGuide(
-            @Query("liveuid") String liveUid
+            @Query("liveuid") String liveUid,
+            @Query("to_uid") String toUid
    );

    @GET("/api/public/?service=Gift.getGiftGuideHistory")
    Observable<ResponseModel<List<GiftGuideModel>>> getGiftGuideHistory(
-            @Query("liveuid") String liveUid
+            @Query("liveuid") String liveUid,
+            @Query("to_uid") String toUid
    );

    @GET("/api/public/?service=Gift.getUserMedalList")
    Observable<ResponseModel<MedalAchievementModel>> getUserMedalList(@Query("to_uid") String toUid);

    @GET("/api/public/?service=Gift.getLiveMedalList")
-    Observable<ResponseModel<MedalAchievementModel>> getLiveMedalList();
+    Observable<ResponseModel<MedalAchievementModel>> getLiveMedalList(@Query("liveuid") String liveUid);
+
+    /**
+     * 获取粉丝团礼物信息
+     *
+     * @param packId 礼包id
+     */
+    @GET("/api/public/?service=Fans.getFansExclusivePack")
+    Observable<ResponseModel<FansGroupGiftPackInfo>> getFansExclusivePack(@Query("liveuid") String liveUid,
+                                                                          @Query("pack_id") String packId
+    );
+
+    /**
+     * 购买粉丝团礼包
+     *
+     * @param packId 礼包id
+     */
+    @GET("/api/public/?service=Fans.buyFansExclusivePack")
+    Observable<ResponseModel<HttpCallbackModel>> buyFansExclusivePack(@Query("liveuid") String liveUid,
+                                                                      @Query("pack_id") String packId,
+                                                                      @Query("stream") String stream
+    );
+
+    /**
+     * 获取粉丝团礼物包裹
+     */
+    @GET("/api/public/?service=Fans.userFansExclusivePackList")
+    Observable<ResponseModel<List<FansGroupGiftPack>>> userFansExclusivePackList(@Query("liveuid") String liveUid);
+
+    /**
+     * 获取粉丝团礼物包裹
+     */
+    @GET("/api/public/?service=Fans.getCheckFansLevelUpgrade")
+    Observable<ResponseModel<FansCheckRed>> getCheckFansLevelUpgrade(@Query("liveuid") String liveUid);
+
+    @GET("/api/public/?service=gift.getGiftNamingInfo")
+    Observable<ResponseModel<GiftNamingInfoModel>> getGiftNamingInfo(@Query("gift_id") String giftId);
+
+    /**
+     * 获取游戏code
+     *
+     * @return
+     */
+    @GET("/api/public/?service=Sudgame.getCode")
+    Observable<ResponseModel<List<SudgameCodeModel>>> getCode();
+
+    /**
+     * 创建游戏房
+     *
+     * @return
+     */
+    @GET("/api/public/?service=Sudgameserver.createSudRoom")
+    Observable<ResponseModel<CreateSudRoomModel>> createSudRoom(
+            @Query("room_name") String roomName,
+            @Query("golden_bean_number") String goldenBeanNumber,
+            @Query("game_id") String gameId);
+
+    /**
+     * 获取游戏房列表
+     *
+     * @return
+     */
+    @GET("/api/public/?service=Sudgameserver.getRoomList")
+    Observable<ResponseModel<List<SudRoomListModel>>> getRoomList(
+            @Query("sud_game_id") String sudGameId,
+            @Query("threshold") String threshold,
+            @Query("room_holder_type") String roomHolderType,
+            @Query("liveuid") String liveUid,
+            @Query("page") int page
+    );
+
+    /**
+     * 获取游戏房列表 - 搜索
+     */
+    @GET("/api/public/?service=Sudgameserver.getRoomList")
+    Observable<ResponseModel<List<SudRoomListModel>>> searchRoomList(
+            @Query("sud_game_id") String sudGameId,
+            @Query("threshold") String threshold,
+            @Query("room_holder_type") String roomHolderType,
+            @Query("liveuid") String liveUid,
+            @Query("search") String search,
+            @Query("page") int page
+    );
+
+    @GET("/api/public/?service=Sudgameserver.checkRemainingBalance")
+    Observable<ResponseModel<CheckRemainingBalance>> checkRemainingBalance(
+            @Query("room_id") String roomId
+    );
+
+    @GET("/api/public/?service=Sudgameserver.randomRoom")
+    Observable<ResponseModel<CreateSudRoomModel>> randomRoom(
+            @Query("sud_game_id") String sudGameId,
+            @Query("threshold") String threshold,
+            @Query("room_holder_type") String roomHolderType
+    );
+
+    @GET("/api/public/?service=Sudgameserver.checkRoomStatus")
+    Observable<ResponseModel<CreateSudRoomModel>> checkRoomStatus(
+            @Query("room_id") String roomId
+    );
+
+    /**
+     * 活动弹窗
+     */
+    @GET("/api/public/?service=Home.activityPopup")
+    Observable<ResponseModel<List<OpenAdModel>>> activityPopup();
+

 }
--- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
+++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
@@ -10,11 +10,17 @@ import com.yunbao.common.bean.ActiveModel;
 import com.yunbao.common.bean.BaseModel;
 import com.yunbao.common.bean.BlindBoxInfoModel;
 import com.yunbao.common.bean.CheckLiveModel;
+import com.yunbao.common.bean.CheckRemainingBalance;
+import com.yunbao.common.bean.CreateSudRoomModel;
 import com.yunbao.common.bean.CustomSidebarInfoModel;
 import com.yunbao.common.bean.DiscountsModel;
 import com.yunbao.common.bean.EnterRoomNewModel;
+import com.yunbao.common.bean.FansCheckRed;
+import com.yunbao.common.bean.FansGroupGiftPack;
+import com.yunbao.common.bean.FansGroupGiftPackInfo;
 import com.yunbao.common.bean.GiftAlreadyWallModel;
 import com.yunbao.common.bean.GiftGuideModel;
+import com.yunbao.common.bean.GiftNamingInfoModel;
 import com.yunbao.common.bean.GiftWallGiftDetail;
 import com.yunbao.common.bean.GiftWallModel;
 import com.yunbao.common.bean.HttpCallbackModel;
@@ -34,6 +40,7 @@ import com.yunbao.common.bean.LiveUserMailBoxModel;
 import com.yunbao.common.bean.MedalAchievementModel;
 import com.yunbao.common.bean.NobleRankHideUserListModel;
 import com.yunbao.common.bean.NobleTrumpetModel;
+import com.yunbao.common.bean.OpenAdModel;
 import com.yunbao.common.bean.PkRankBean;
 import com.yunbao.common.bean.PrankGiftBean;
 import com.yunbao.common.bean.PrankHttpTurntableBean;
@@ -45,7 +52,10 @@ import com.yunbao.common.bean.RedPacketInfoModel;
 import com.yunbao.common.bean.RedPacketListBean;
 import com.yunbao.common.bean.SetAttentsModel;
 import com.yunbao.common.bean.StarChallengeStatusModel;
+import com.yunbao.common.bean.SudRoomListModel;
+import com.yunbao.common.bean.SudgameCodeModel;
 import com.yunbao.common.bean.UserAreaBean;
+import com.yunbao.common.bean.UserAvatarSelectBean;
 import com.yunbao.common.bean.VipModel;
 import com.yunbao.common.bean.WishListGiftConfModel;
 import com.yunbao.common.bean.WishListModel;
@@ -172,8 +182,16 @@ public class LiveNetManager {
                .subscribe(listResponseModel -> {
                    List<SetAttentsModel> setAttentsModels = listResponseModel.getData().getInfo();
                    if (setAttentsModels.size() > 0) {
-                        if (callback != null)
+                        if (callback != null) {
+                           /* if (listResponseModel.getData().getCode() == 1001) {
+                                if (WordUtil.isNewZh()) {
+                                    ToastUtil.show("粉絲團等級已清零，待領取獎勵已自動領取至【個性裝扮】");
+                                } else {
+                                    ToastUtil.show("The level of the fan club has been cleared, and the rewards to be claimed have been automatically received to [Personalized Dressing]");
+                                }
+                            }*/
                            callback.onSuccess(setAttentsModels.get(0));
+                        }
                    } else {
                        if (callback != null)
                            callback.onError("操作失效");
@@ -300,9 +318,9 @@ public class LiveNetManager {
     *
     * @param callback
     */
-    public void getCustomSidebarInfo(HttpCallback<List<CustomSidebarInfoModel>> callback) {
+    public void getCustomSidebarInfo(String type, HttpCallback<List<CustomSidebarInfoModel>> callback) {
        API.get().pdLiveApi(mContext)
-                .getCustomSidebarInfo()
+                .getCustomSidebarInfo(type)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(listResponseModel -> callback.onSuccess(listResponseModel.getData().getInfo()), throwable -> {
@@ -1617,10 +1635,11 @@ public class LiveNetManager {
     * @param redPacketMoney    红包金额
     * @param redPacketQuantity 红包数量
     * @param conditions        红包领取条件 0.无 1.关注主播
+     * @param needFansGroup     是否需要加入粉丝团条件
     */
-    public void createRedPacket(String liveUid, String redPacketMoney, String redPacketQuantity, String conditions, HttpCallback<String> callback) {
+    public void createRedPacket(String liveUid, String redPacketMoney, String redPacketQuantity, String conditions, boolean needFansGroup, HttpCallback<String> callback) {
        API.get().pdLiveApi(mContext)
-                .createRedPacket(liveUid, redPacketMoney, redPacketQuantity, conditions)
+                .createRedPacket(liveUid, needFansGroup ? 1 : 0, redPacketMoney, redPacketQuantity, conditions)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new Consumer<ResponseModel<Object>>() {
@@ -1801,6 +1820,54 @@ public class LiveNetManager {
                }).isDisposed();
    }

+    public void getSystemUserAvatar(HttpCallback<List<UserAvatarSelectBean>> callback) {
+        API.get().pdLiveApi(mContext)
+                .getSystemUserAvatar()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<UserAvatarSelectBean>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<UserAvatarSelectBean>> objectResponseModel) throws Exception {
+                        if (objectResponseModel.getData().getCode() == 0) {
+                            callback.onSuccess(objectResponseModel.getData().getInfo());
+                        } else {
+                            callback.onError(objectResponseModel.getData().getMsg());
+                        }
+                    }
+                }, 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 setSystemUserAvatar(int id, HttpCallback<String> callback) {
+        API.get().pdLiveApi(mContext)
+                .setSystemUserAvatar(id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<Object>>() {
+                    @Override
+                    public void accept(ResponseModel<Object> objectResponseModel) throws Exception {
+                        if (objectResponseModel.getData().getCode() == 0) {
+                            callback.onSuccess(objectResponseModel.getData().getMsg());
+                        } else {
+                            callback.onError(objectResponseModel.getData().getMsg());
+                        }
+                    }
+                }, 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 giftAlreadyWall(String liveUid, String toUid, HttpCallback<GiftAlreadyWallModel> callback) {
        API.get().pdLiveApi(mContext)
                .giftAlreadyWall(liveUid, toUid)
@@ -1823,6 +1890,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)
@@ -1845,9 +1934,9 @@ public class LiveNetManager {
                }).isDisposed();
    }

-    public void giftDetail(String liveUid, String giftId, HttpCallback<GiftWallGiftDetail> callback) {
+    public void giftDetail(String liveUid, String giftId, String toUid, HttpCallback<GiftWallGiftDetail> callback) {
        API.get().pdLiveApi(mContext)
-                .giftDetail(liveUid, giftId)
+                .giftDetail(liveUid, giftId, toUid)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new Consumer<ResponseModel<GiftWallGiftDetail>>() {
@@ -1911,9 +2000,9 @@ public class LiveNetManager {
                }).isDisposed();
    }

-    public void getGiftGuide(String liveUid, HttpCallback<List<GiftGuideModel>> callback) {
+    public void getGiftGuide(String liveUid, String toUid, HttpCallback<List<GiftGuideModel>> callback) {
        API.get().pdLiveApi(mContext)
-                .getGiftGuide(liveUid)
+                .getGiftGuide(liveUid, toUid)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new Consumer<ResponseModel<List<GiftGuideModel>>>() {
@@ -1933,9 +2022,9 @@ public class LiveNetManager {
                }).isDisposed();
    }

-    public void getGiftGuideHistory(String liveUid, HttpCallback<List<GiftGuideModel>> callback) {
+    public void getGiftGuideHistory(String toUid, String liveUid, HttpCallback<List<GiftGuideModel>> callback) {
        API.get().pdLiveApi(mContext)
-                .getGiftGuideHistory(liveUid)
+                .getGiftGuideHistory(liveUid, toUid)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new Consumer<ResponseModel<List<GiftGuideModel>>>() {
@@ -1977,9 +2066,9 @@ public class LiveNetManager {
                }).isDisposed();
    }

-    public void getLiveMedalList(HttpCallback<MedalAchievementModel> callback) {
+    public void getLiveMedalList(String liveUid, HttpCallback<MedalAchievementModel> callback) {
        API.get().pdLiveApi(mContext)
-                .getLiveMedalList()
+                .getLiveMedalList(liveUid)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new Consumer<ResponseModel<MedalAchievementModel>>() {
@@ -1999,6 +2088,300 @@ public class LiveNetManager {
                }).isDisposed();
    }

+    public void getFansExclusivePack(String liveUid, String packId, HttpCallback<FansGroupGiftPackInfo> callback) {
+        API.get().pdLiveApi(mContext)
+                .getFansExclusivePack(liveUid, packId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<FansGroupGiftPackInfo>>() {
+                    @Override
+                    public void accept(ResponseModel<FansGroupGiftPackInfo> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.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 buyFansExclusivePack(String liveUid, String packId, String stream, HttpCallback<HttpCallbackModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .buyFansExclusivePack(liveUid, packId, stream)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<HttpCallbackModel>>() {
+                    @Override
+                    public void accept(ResponseModel<HttpCallbackModel> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.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 userFansExclusivePackList(String liveUid, HttpCallback<List<FansGroupGiftPack>> callback) {
+        API.get().pdLiveApi(mContext)
+                .userFansExclusivePackList(liveUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<FansGroupGiftPack>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<FansGroupGiftPack>> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.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 getCheckFansLevelUpgrade(String liveUid, HttpCallback<FansCheckRed> callback) {
+        API.get().pdLiveApi(mContext)
+                .getCheckFansLevelUpgrade(liveUid)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<FansCheckRed>>() {
+                    @Override
+                    public void accept(ResponseModel<FansCheckRed> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.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 getGiftNamingInfo(String giftId, HttpCallback<GiftNamingInfoModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .getGiftNamingInfo(giftId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<GiftNamingInfoModel>>() {
+                    @Override
+                    public void accept(ResponseModel<GiftNamingInfoModel> liveGiftBeanResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(liveGiftBeanResponseModel.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 activityPopup(HttpCallback<List<OpenAdModel>> callback) {
+        API.get().pdLiveApi(mContext)
+                .activityPopup()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<OpenAdModel>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<OpenAdModel>> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        throwable.printStackTrace();
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void getCode(HttpCallback<List<SudgameCodeModel>> callback) {
+        API.get().pdLiveApi(mContext)
+                .getCode()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<SudgameCodeModel>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<SudgameCodeModel>> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.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 createSudRoom(String roomName, String goldenBeanNumber, String gameId, HttpCallback<CreateSudRoomModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .createSudRoom(roomName, goldenBeanNumber, gameId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<CreateSudRoomModel>>() {
+                    @Override
+                    public void accept(ResponseModel<CreateSudRoomModel> createSudRoomModelResponseModel) throws Exception {
+                        if (callback != null) {
+                            if (createSudRoomModelResponseModel.getData().getCode() == 0) {
+                                callback.onSuccess(createSudRoomModelResponseModel.getData().getInfo());
+                            } else {
+                                callback.onError(createSudRoomModelResponseModel.getData().getMsg());
+                            }
+
+                        }
+                    }
+                }, 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 randomRoom(String sudGameId, String threshold, String roomHolderType, HttpCallback<CreateSudRoomModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .randomRoom(sudGameId, threshold, roomHolderType)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<CreateSudRoomModel>>() {
+                    @Override
+                    public void accept(ResponseModel<CreateSudRoomModel> createSudRoomModelResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(createSudRoomModelResponseModel.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 checkRoomStatus(String roomId, HttpCallback<CreateSudRoomModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .checkRoomStatus(roomId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<CreateSudRoomModel>>() {
+                    @Override
+                    public void accept(ResponseModel<CreateSudRoomModel> createSudRoomModelResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(createSudRoomModelResponseModel.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 getRoomList(String sudGameId, String threshold, String roomHolderType, String liveUid, int page, HttpCallback<List<SudRoomListModel>> callback) {
+        API.get().pdLiveApi(mContext)
+                .getRoomList(sudGameId, threshold, roomHolderType, liveUid, page)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<SudRoomListModel>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<SudRoomListModel>> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.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 searchRoomList(String sudGameId, String threshold, String roomHolderType, String search, int page, HttpCallback<List<SudRoomListModel>> callback) {
+        API.get().pdLiveApi(mContext)
+                .searchRoomList(sudGameId, threshold, roomHolderType, "0", search, page)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<List<SudRoomListModel>>>() {
+                    @Override
+                    public void accept(ResponseModel<List<SudRoomListModel>> listResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(listResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        throwable.printStackTrace();
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void checkRemainingBalance(String roomId, HttpCallback<CheckRemainingBalance> callback) {
+        API.get().pdLiveApi(mContext)
+                .checkRemainingBalance(roomId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<ResponseModel<CheckRemainingBalance>>() {
+                    @Override
+                    public void accept(ResponseModel<CheckRemainingBalance> checkRemainingBalanceResponseModel) throws Exception {
+                        if (callback != null) {
+                            callback.onSuccess(checkRemainingBalanceResponseModel.getData().getInfo());
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        throwable.printStackTrace();
+                        if (callback != null) {
+                            callback.onError(mContext.getString(R.string.net_error));
+                        }
+                    }
+                }).isDisposed();
+    }
+
    /**
     * 直播间取消网络请求
     */
--- a/common/src/main/java/com/yunbao/common/manager/GiftQuantityManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/GiftQuantityManager.java
@@ -29,13 +29,13 @@ public class GiftQuantityManager extends BaseCacheManager {
        List<GiftQuantityModel> giftQuantityModels = getList(KEY_GIFT_QUANTITY, new TypeToken<List<GiftQuantityModel>>() {
        }.getType());
        if (giftQuantityModels == null || giftQuantityModels.size() == 0) {
-            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("1").setFontColour("#ffffff"));
-            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("10").setFontColour("#ffffff"));
-            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("66").setFontColour("#ffffff"));
-            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("88").setFontColour("#FA62A1"));
-            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("100").setFontColour("#9B62FF"));
-            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("520").setFontColour("#65BFFB"));
            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("1314").setFontColour("#05F3EC"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("520").setFontColour("#65BFFB"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("100").setFontColour("#9B62FF"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("88").setFontColour("#FA62A1"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("66").setFontColour("#ffffff"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("10").setFontColour("#ffffff"));
+            giftQuantityModels.add(new GiftQuantityModel().setGiftQuantity("1").setFontColour("#ffffff"));
        }
        return giftQuantityModels;
    }
--- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
@@ -10,6 +10,7 @@ import androidx.annotation.NonNull;

 import com.google.gson.Gson;
 import com.lzf.easyfloat.EasyFloat;
+import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.event.DataUserInfoEvent;
@@ -47,8 +48,27 @@ public class IMLoginManager extends BaseCacheManager {
    private final String keyDefaultBubbleUrl = "defaultBubbleUrl";
    private final String STATUS_ANCHOR_SAY = "anchorSay";
    private final String STATUS_ANCHOR_CALL = "anchorCallMe";
+    private final String LIVE_NOTIFY_SETTINGS = "liveNotifySettings";//开播通知

    private final String KEY_LANGUAGE = "language";
+    private final String KEY_GAME = "key_game";
+
+    public void setRedPoint() {
+        put("RedPoint", "1");
+    }
+
+    public boolean getRedPoint() {
+        return !TextUtils.isEmpty(getString("RedPoint")) && !TextUtils.equals(getString("RedPoint"), "1");
+    }
+
+    public void setSudGame(String sudGameJson) {
+        put(KEY_GAME, sudGameJson);
+    }
+
+
+    public String getSudGame() {
+        return getString(KEY_GAME);
+    }

    public void setLanguage(boolean isEnglish) {
        put(KEY_LANGUAGE, isEnglish);
@@ -280,6 +300,10 @@ public class IMLoginManager extends BaseCacheManager {
        return userInfo;
    }

+    public void setMedalName(String medalName) {
+        userInfo.setMedalName(medalName);
+    }
+
    /**
     * 判断是否已登录
     *
@@ -296,6 +320,8 @@ public class IMLoginManager extends BaseCacheManager {
     * @param model
     */
    public void setupLoginUser(@NonNull IMLoginModel model) {
+        //当用户使用自有账号登录时，可以这样统计：
+        MobclickAgent.onProfileSignIn(String.valueOf(model.getId()));
        this.userInfo = model;
        if (userInfo != null && !TextUtils.isEmpty(userInfo.getToken())) {
            token = userInfo.getToken();
@@ -354,6 +380,14 @@ public class IMLoginManager extends BaseCacheManager {
        return getBoolean(GiftEffect, !(Build.VERSION.SDK_INT < Build.VERSION_CODES.O));
    }

+    public void setLiveNotifySettings(boolean isTrue) {
+        put(LIVE_NOTIFY_SETTINGS, isTrue);
+    }
+
+    public boolean isLiveNotifySettings() {
+        return getBoolean(LIVE_NOTIFY_SETTINGS, true);
+    }
+
    /**
     * 重新请求管理员身份信息
     */
@@ -412,6 +446,8 @@ public class IMLoginManager extends BaseCacheManager {
 //        IMCenter.getInstance().clearConversations(null,   Conversation.ConversationType.PRIVATE);
        RongcloudIMManager.logoutIM();
        MessageIMManager.get(activity).logout();
+        //登出
+        MobclickAgent.onProfileSignOff();
        put(IS_HINT, 0);
        APPEasyFloat.getInstance().dismiss(activity);
        if (EasyFloat.isShow("LiveFloatView")) {
--- a/common/src/main/java/com/yunbao/common/manager/IMRTCManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/IMRTCManager.java
@@ -6,6 +6,7 @@ import android.os.Handler;
 import android.os.Looper;

 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;

 import java.util.ArrayList;
 import java.util.List;
@@ -100,7 +101,11 @@ public class IMRTCManager {
                public void onSuccess() {
                    callback.onSuccess();
                    if (!RandomPkManager.getInstance().isRandomModel()) {
-                        ToastUtil.show("发起邀请成功");
+                        if(WordUtil.isNewZh()) {
+                            ToastUtil.show("发起邀请成功");
+                        }else{
+                            ToastUtil.show("successful");
+                        }
                    }
                    requestUid.add(liveUid);
                    startRequestTimeoutTask(liveUid);
@@ -109,7 +114,11 @@ public class IMRTCManager {
                @Override
                public void onFailed(RTCErrorCode errorCode) {
                    if (!RandomPkManager.getInstance().isRandomModel()) {
-                        ToastUtil.show("邀请失败 " + errorCode.getValue());
+                        if(WordUtil.isNewZh()) {
+                            ToastUtil.show("邀请失败 " + errorCode.getValue());
+                        }else{
+                            ToastUtil.show("invite failed:" +errorCode.getValue());
+                        }
                    }
                    if (RandomPkManager.getInstance().isRequestPk()) {
                        RandomPkManager.getInstance().setPkStatus(RandomPkManager.PK_STATUS_REFUSE);
--- a/common/src/main/java/com/yunbao/common/manager/NewLevelManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/NewLevelManager.java
@@ -4,6 +4,7 @@ import android.content.Context;

 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.yunbao.common.bean.FansModel;
 import com.yunbao.common.bean.NewLevelModel;
 import com.yunbao.common.manager.base.BaseCacheManager;

@@ -17,9 +18,11 @@ public class NewLevelManager extends BaseCacheManager {
    private final String KEY_USER_LEVEL = "keyUserLevel";
    private final String KEY_ANCHOR_LEVEL = "keyAnchorLevel";
    private final String KEY_LIVE_LEVEL = "keyLiveLevel";
+    private final String KEY_FANS_LEVEL = "keyFansLevel";

    private List<NewLevelModel> newLevelModels = new ArrayList<>();
    private List<NewLevelModel> keyAnchorLevel = new ArrayList<>();
+    private List<FansModel> fansModels = new ArrayList<>();

    public NewLevelManager(Context context) {
        super(context);
@@ -36,6 +39,29 @@ public class NewLevelManager extends BaseCacheManager {
        put(KEY_USER_LEVEL, newLevelModels);
    }

+    public void upDataFansLevel(String json) {
+        fansModels = new Gson().fromJson(json, new TypeToken<List<FansModel>>() {
+        }.getType());
+        put(KEY_FANS_LEVEL, fansModels);
+    }
+
+    public List<FansModel> getFansLevel() {
+        fansModels = getList(KEY_FANS_LEVEL, new TypeToken<List<FansModel>>() {
+        }.getType());
+        return fansModels;
+    }
+
+    public FansModel getFansModel(int level) {
+        getFansLevel();
+        FansModel fansModel = null;
+        for (FansModel model : fansModels) {
+            if (model.getLevelid() == level) {
+                fansModel = model;
+            }
+        }
+        return fansModel;
+    }
+
    /**
     * 获取等级数据
     *
@@ -45,6 +71,7 @@ public class NewLevelManager extends BaseCacheManager {
        return getList(KEY_USER_LEVEL, new TypeToken<List<NewLevelModel>>() {
        }.getType());
    }
+
    /**
     * 缓存等级图标
     *
--- a/common/src/main/java/com/yunbao/common/manager/OpenAdManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/OpenAdManager.java
@@ -0,0 +1,178 @@
+package com.yunbao.common.manager;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+
+import com.yunbao.common.CommonAppContext;
+import com.yunbao.common.bean.OpenAdModel;
+import com.yunbao.common.dialog.OpenAdBottomDialogPopup;
+import com.yunbao.common.dialog.OpenAdCenterDialogPopup;
+import com.yunbao.common.http.base.HttpCallback;
+import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.utils.ToastUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+public class OpenAdManager {
+    public static final int TYPE_HOME = 1;
+    public static final int TYPE_LIVE = 2;
+    private static final String TAG = "-----弹窗-----";
+    private Map<Integer, Boolean> showMap;
+    private List<OpenAdModel> list = null;
+    private Handler handler = new Handler(Looper.getMainLooper());
+    private Map<Integer, AdRunnable> runnableMap = new HashMap<>();
+    private int showType;
+
+    private OpenAdManager() {
+        showMap = new HashMap<>();
+        init(false);
+    }
+
+    public void reset() {
+        dismiss();
+        runnableMap.clear();
+        showMap.clear();
+        list.clear();
+    }
+
+    private static final class MInstanceHolder {
+        static final OpenAdManager mInstance = new OpenAdManager();
+    }
+
+    public static OpenAdManager getInstance() {
+        return MInstanceHolder.mInstance;
+    }
+
+    private void init(boolean isShow) {
+        if (list != null && list.isEmpty()) {
+            return;
+        }
+        if(CommonAppContext.getTopActivity()==null){
+            return;
+        }
+        LiveNetManager.get(CommonAppContext.getTopActivity())
+                .activityPopup(new HttpCallback<List<OpenAdModel>>() {
+                    @Override
+                    public void onSuccess(List<OpenAdModel> data) {
+                        if (data == null || data.isEmpty()) {
+                            Log.i(TAG, "onSuccess: 没有数据");
+                            list = new ArrayList<>();
+                            return;
+                        }
+                        list = data;
+                        if (isShow) {
+                            show(TYPE_HOME, false);
+                        }
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        System.err.println("弹框列表:" + error);
+                    }
+                });
+    }
+
+
+    public synchronized void show(int type, boolean isGuard) {
+        if (list == null) {
+            init(true);
+            return;
+        }
+        showType = type;
+        for (OpenAdModel model : list) {
+            if (model.getType() == type) {
+                if (type == OpenAdModel.TYPE_LIVE && !model.userIsPermission(isGuard)) {
+                    continue;
+                }
+                if (runnableMap.containsKey(model.getId())) {
+                    AdRunnable runnable = runnableMap.get(model.getId());
+                    if (runnable != null) {
+                        Log.d(TAG, "reset: " + model);
+                        handler.removeCallbacks(runnable);
+                        runnableMap.remove(model.getId());
+                    }
+                }
+
+                if (!isShow(model)) {
+                    Log.i(TAG, "show: " + model);
+                    handler.postDelayed(new AdRunnable(model), model.getDelayShowTime());
+                } else {
+                    Log.i(TAG, "notshow: " + model);
+                }
+
+            }
+        }
+        Log.i(TAG, "------------------------------");
+
+    }
+
+    public synchronized void dismiss() {
+        Log.d(TAG, "准备dismiss:" + runnableMap.size());
+        for (Integer model : runnableMap.keySet()) {
+            AdRunnable runnable = runnableMap.get(model);
+            Log.d(TAG, "dismiss:" + runnable);
+            if (runnable != null) {
+                runnable.dismiss();
+                handler.removeCallbacks(runnable);
+            }
+        }
+        runnableMap.clear();
+    }
+
+    private synchronized boolean isShow(OpenAdModel type) {
+        if (showMap.containsKey(type.getId()) && showMap.get(type.getId()) != null) {
+            return Boolean.TRUE.equals(showMap.get(type.getId()));
+        }
+        return false;
+    }
+
+    private class AdRunnable implements Runnable {
+        OpenAdModel model;
+
+        public AdRunnable(OpenAdModel model) {
+            this.model = model;
+            runnableMap.put(model.getId(), this);
+        }
+
+        public void dismiss() {
+            Log.e(TAG, "dismiss: " + model);
+        }
+
+        @Override
+        public synchronized void run() {
+            Log.i(TAG, "run: " + model);
+            if (model == null) {
+                ToastUtil.showDebug("model为空");
+                return;
+            }
+            if (!model.isInTime()) {
+                ToastUtil.showDebug("不在展示时间内：" + model.getStartTime() + "|" + model.getEndTime());
+                return;
+            }
+            if (isShow(model)) {
+                ToastUtil.showDebug(model.getId() + "|model展示过了");
+                return;
+            }
+            if (model.getType() != showType) {
+                return;
+            }
+            showMap.put(model.getId(), true);
+            if (model.getModel() == OpenAdModel.MODEL_BOTTOM) {
+                new OpenAdBottomDialogPopup(CommonAppContext.getTopActivity(), model)
+                        .setListener((bean, position) -> {
+                        })
+                        .showDialog();
+            } else {
+                new OpenAdCenterDialogPopup(CommonAppContext.getTopActivity(), model)
+                        .setListener((bean, position) -> {
+                        })
+                        .showDialog();
+            }
+        }
+    }
+}
--- a/common/src/main/java/com/yunbao/common/manager/RandomPkManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/RandomPkManager.java
@@ -10,6 +10,7 @@ import com.yunbao.common.bean.RankPkInfoBean;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;

 import java.util.ArrayList;
 import java.util.List;
@@ -342,7 +343,7 @@ public class RandomPkManager {

                    @Override
                    public void onError(String error) {
-                        ToastUtil.show(R.string.net_error);
+                          ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
                    }
                });
    }
@@ -401,7 +402,7 @@ public class RandomPkManager {
     * 清空状态，下播时调用
     */
    public void release() {
-        status = PK_STATUS_REQUEST;
+        status = PK_STATUS_DEFAULT;
        if (task != null) {
            task.cancel();
        }
--- a/common/src/main/java/com/yunbao/common/pay/PayPresenter.java
+++ b/common/src/main/java/com/yunbao/common/pay/PayPresenter.java
@@ -1,11 +1,11 @@
 package com.yunbao.common.pay;

 import android.app.Activity;
-
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;

+import androidx.annotation.NonNull;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.android.billingclient.api.Purchase;
@@ -18,13 +18,14 @@ import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.event.CoinChangeEvent;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
-import com.yunbao.common.pay.ali.AliPayBuilder;
 import com.yunbao.common.pay.wx.WxPayBuilder;
 import com.yunbao.common.utils.GoogleBillingUtil;
 import com.yunbao.common.utils.OnGoogleBillingListener;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
+
 import org.greenrobot.eventbus.EventBus;
+
 import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Locale;
@@ -48,16 +49,16 @@ public class PayPresenter {


    private GoogleBillingUtil googleBillingUtil;
-    private String TAG="PayPresenter";
-    private String [] arrPro = {"1"};
+    private String TAG = "PayPresenter";
+    private String[] arrPro = {"1"};
    private String mOrderid;

    public PayPresenter(Activity activity) {
        mActivity = new WeakReference<>(activity).get();
    }

-    public void setPayCallback(PayCallback callback){
-        mPayCallback=callback;
+    public void setPayCallback(PayCallback callback) {
+        mPayCallback = callback;
    }

    public long getBalanceValue() {
@@ -96,9 +97,10 @@ public class PayPresenter {
    public void setAliCallbackUrl(String aliCallbackUrl) {
        mAliCallbackUrl = aliCallbackUrl;
    }
+
    public void pay(String payType, String money, String goodsName, String orderParams) {
        if (TextUtils.isEmpty(payType)) {
-            ToastUtil.show(R.string.wallet_tip_5);
+            ToastUtil.show(mActivity.getString(R.string.wallet_tip_5));
            return;
        }
        //L.e("《==》支付按钮4--->" +payType);
@@ -128,40 +130,42 @@ public class PayPresenter {
            case Constants.PAY_TYPE_GOOGLE://google支付
                googlePay(orderParams);
                break;
-                default:
-                    otherPay(orderParams,payType);
-                    break;
+            default:
+                otherPay(orderParams, payType);
+                break;
        }
    }

    //谷歌支付
    private void googlePay(String orderParams) {
-        mOrderid="1";
-        String pid="2";
-        if (pid != null && !pid.isEmpty()){
-            arrPro[0]=pid;
+        mOrderid = "1";
+        String pid = "2";
+        if (pid != null && !pid.isEmpty()) {
+            arrPro[0] = pid;
            initGooglePay();
        }

-        String newParm= StringUtil.contact("Charge.getGoogleOrder",orderParams,"&type=android",
-                "&appname=",mActivity.getString(R.string.app_name),
-                "&desc="+mActivity.getPackageName()+"&source=android"
+        String newParm = StringUtil.contact("Charge.getGoogleOrder", orderParams, "&type=android",
+                "&appname=", mActivity.getString(R.string.app_name),
+                "&desc=" + mActivity.getPackageName() + "&source=android"
        );
        CommonHttpUtil.getWxH5Order(newParm, new HttpCallback() {
            @Override
            public void onSuccess(int code, String msg, String[] info) {
-                if(code==0){
+                if (code == 0) {
                    try {
                        ToastUtil.show("开始支付，请稍后");
-                        org.json.JSONObject jsonObject=new org.json.JSONObject(info[0]);
-                        mOrderid=jsonObject.getString("orderid");
-                        String pid=jsonObject.getString("pid");
-                        if (pid != null && !pid.isEmpty()){
-                            arrPro[0]=pid;
+                        org.json.JSONObject jsonObject = new org.json.JSONObject(info[0]);
+                        mOrderid = jsonObject.getString("orderid");
+                        String pid = jsonObject.getString("pid");
+                        if (pid != null && !pid.isEmpty()) {
+                            arrPro[0] = pid;
                            initGooglePay();
                        }
-                    }catch (Exception e){ e.printStackTrace(); }
-                }else {
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } else {
                    ToastUtil.show("无法支付，请联系客服");
                }

@@ -171,7 +175,7 @@ public class PayPresenter {

    private void initGooglePay() {
        GoogleBillingUtil.isDebug(true);
-        GoogleBillingUtil.setSkus(arrPro,null);
+        GoogleBillingUtil.setSkus(arrPro, null);
        GoogleBillingUtil.setIsAutoAcknowledgePurchase(true);//设置自动确认购买
        googleBillingUtil = GoogleBillingUtil.getInstance()
                .addOnGoogleBillingListener(mActivity, mOnMyGoogleBillingListener)
@@ -179,35 +183,35 @@ public class PayPresenter {
    }

    private void paypalPay(String orderParams) {
-        String url1="/index.php?m=App&a=paypal" +orderParams +"&source=android";
-        String url2= CommonAppConfig.HOST+url1;
+        String url1 = "/index.php?m=App&a=paypal" + orderParams + "&source=android";
+        String url2 = CommonAppConfig.HOST + url1;
        open(url2);
    }

    private void payssionPay(String orderParams) {
-        String url1="/index.php?m=App&a=pay" +orderParams +"&source=android";
-        String url2= CommonAppConfig.HOST+url1;
+        String url1 = "/index.php?m=App&a=pay" + orderParams + "&source=android";
+        String url2 = CommonAppConfig.HOST + url1;
        open(url2);

    }

    private void yunquPay(String orderParams) {
-        String newParm= StringUtil.contact("Charge.getYunquOrder",orderParams,"&type=android",
-                "&appname=",mActivity.getString(R.string.app_name),
-                "&desc="+mActivity.getPackageName()+"&source=android"
+        String newParm = StringUtil.contact("Charge.getYunquOrder", orderParams, "&type=android",
+                "&appname=", mActivity.getString(R.string.app_name),
+                "&desc=" + mActivity.getPackageName() + "&source=android"
        );
        //L.e("《==》支付URL--->" +newParm);
        CommonHttpUtil.getWxH5Order(newParm, new HttpCallback() {
            @Override
            public void onSuccess(int code, String msg, String[] info) {
-                if(code==0){
+                if (code == 0) {
                    try {
-                        org.json.JSONObject jsonObject=new org.json.JSONObject(info[0]);
-                        String payment_url=jsonObject.getString("payment_url");
+                        org.json.JSONObject jsonObject = new org.json.JSONObject(info[0]);
+                        String payment_url = jsonObject.getString("payment_url");
                        open(payment_url);
                        // L.e("《==》支付URL--->" +payment_url);

-                    }catch (Exception e){
+                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
@@ -216,20 +220,20 @@ public class PayPresenter {
    }

    private void hfbPay(String orderParams) {
-       String newParm= StringUtil.contact("Charge.getWxH5Order",orderParams,"&type=android",
-                "&appname=",mActivity.getString(R.string.app_name),
-                 "&desc="+mActivity.getPackageName()
-                );
+        String newParm = StringUtil.contact("Charge.getWxH5Order", orderParams, "&type=android",
+                "&appname=", mActivity.getString(R.string.app_name),
+                "&desc=" + mActivity.getPackageName()
+        );

        CommonHttpUtil.getCashierOrder(newParm, new HttpCallback() {
            @Override
            public void onSuccess(int code, String msg, String[] info) {
-                if(code==0){
+                if (code == 0) {
                    try {
-                        org.json.JSONObject jsonObject=new org.json.JSONObject(info[0]);
-                        String redirectUrl=jsonObject.getString("redirectUrl");
+                        org.json.JSONObject jsonObject = new org.json.JSONObject(info[0]);
+                        String redirectUrl = jsonObject.getString("redirectUrl");
                        open(redirectUrl);
-                    }catch (Exception e){
+                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
@@ -237,66 +241,68 @@ public class PayPresenter {
        });
    }

-    public void open(String url){
+    public void open(String url) {
        //支付时内部跳转  false要添加
-        WebViewActivity.forward(mActivity,url,false);
+        WebViewActivity.forward(mActivity, url, false, false);
    }


    private void hwPay(String orderParams) {
-        String newParm= StringUtil.contact("Charge.getCashierOrder",orderParams,"&type=android",
-                "&appname=",mActivity.getString(R.string.app_name),
-                "&desc="+mActivity.getPackageName()+"&source=android"
+        String newParm = StringUtil.contact("Charge.getCashierOrder", orderParams, "&type=android",
+                "&appname=", mActivity.getString(R.string.app_name),
+                "&desc=" + mActivity.getPackageName() + "&source=android"
        );
        //L.e("《==》支付URL--->" +newParm);
        CommonHttpUtil.getWxH5Order(newParm, new HttpCallback() {
            @Override
            public void onSuccess(int code, String msg, String[] info) {
-                if(code==0){
+                if (code == 0) {
                    try {
-                        org.json.JSONObject jsonObject=new org.json.JSONObject(info[0]);
-                        String payment_url=jsonObject.getString("payment_url");
+                        org.json.JSONObject jsonObject = new org.json.JSONObject(info[0]);
+                        String payment_url = jsonObject.getString("payment_url");
                        open(payment_url);
-                       // L.e("《==》支付URL--->" +payment_url);
+                        // L.e("《==》支付URL--->" +payment_url);

-                    }catch (Exception e){
+                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
            }
        });
    }
-    private void otherPay(String orderParams,String payType) {
-        String newParm= StringUtil.contact("Charge.getOtherPayOrder",orderParams,"&type=android",
-                "&appname=",mActivity.getString(R.string.app_name),
-                "&desc="+mActivity.getPackageName()+"&source=android&payType="+payType
+
+    private void otherPay(String orderParams, String payType) {
+        String newParm = StringUtil.contact("Charge.getOtherPayOrder", orderParams, "&type=android",
+                "&appname=", mActivity.getString(R.string.app_name),
+                "&desc=" + mActivity.getPackageName() + "&source=android&payType=" + payType
        );
        CommonHttpUtil.getWxH5Order(newParm, new HttpCallback() {
            @Override
            public void onSuccess(int code, String msg, String[] info) {
-                if(code==0){
+                if (code == 0) {
                    try {
-                        org.json.JSONObject jsonObject=new org.json.JSONObject(info[0]);
-                        String payment_url=jsonObject.getString("payment_url");
+                        org.json.JSONObject jsonObject = new org.json.JSONObject(info[0]);
+                        String payment_url = jsonObject.getString("payment_url");
                        open(payment_url);
                        // L.e("《==》支付URL--->" +payment_url);

-                    }catch (Exception e){
+                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
            }
        });
    }
+
    /**
     * 支付宝支付
     */
    private void aliPay(String money, String goodsName, String orderParams) {
-        if (mActivity == null || TextUtils.isEmpty(mServiceNameAli)|| TextUtils.isEmpty(mAliCallbackUrl)) {
+        if (mActivity == null || TextUtils.isEmpty(mServiceNameAli) || TextUtils.isEmpty(mAliCallbackUrl)) {
            return;
        }
 //        if (!CommonAppConfig.isAppExist(Constants.PACKAGE_NAME_ALI)) {
-//            ToastUtil.show(R.string.coin_ali_not_install);
+//            ToastUtil.show(mContext.getString(R.string.coin_ali_not_install);
 //            return;
 //        }
        if (TextUtils.isEmpty(mAliPartner) || TextUtils.isEmpty(mAliSellerId) || TextUtils.isEmpty(mAliPrivateKey)) {
@@ -321,7 +327,7 @@ public class PayPresenter {
            return;
        }
        if (!CommonAppConfig.isAppExist(Constants.PACKAGE_NAME_WX)) {
-            ToastUtil.show(R.string.coin_wx_not_install);
+            ToastUtil.show(mActivity.getString(R.string.coin_wx_not_install));
            return;
        }
        if (TextUtils.isEmpty(mWxAppID)) {
@@ -351,12 +357,12 @@ public class PayPresenter {
                    long goldValue = Long.parseLong(goldCoin);
                    if (balanceValue > mBalanceValue) {
                        mBalanceValue = balanceValue;
-                        ToastUtil.show(R.string.coin_charge_success);
+                        ToastUtil.show(mActivity.getString(R.string.coin_charge_success));
                        UserBean u = CommonAppConfig.getInstance().getUserBean();
                        if (u != null) {
                            u.setCoin(coin);
                        }
-                        EventBus.getDefault().post(new CoinChangeEvent(coin,goldCoin, true));
+                        EventBus.getDefault().post(new CoinChangeEvent(coin, goldCoin, true));
                    }
                }
            }
@@ -364,11 +370,11 @@ public class PayPresenter {
    }


-    private OnGoogleBillingListener mOnMyGoogleBillingListener=new OnGoogleBillingListener(){
+    private OnGoogleBillingListener mOnMyGoogleBillingListener = new OnGoogleBillingListener() {
        @Override
        public void onSetupSuccess(boolean isSelf) {
            super.onSetupSuccess(isSelf);
-            Log.d(TAG,"内购服务初始化完成");
+            Log.d(TAG, "内购服务初始化完成");
            checkSubs();
        }

@@ -393,30 +399,30 @@ public class PayPresenter {
 //            }
 //            googleBillingUtil.purchaseInApp(mActivity,"zs640");

-            googleBillingUtil.purchaseInApp(mActivity,googleBillingUtil.getInAppSkuByPosition(0));
+            googleBillingUtil.purchaseInApp(mActivity, googleBillingUtil.getInAppSkuByPosition(0));

 //            Log.d(TAG,tempBuffer.toString());
        }

        @Override
        public boolean onPurchaseSuccess(@NonNull Purchase purchase, boolean isSelf) {
-            StringBuffer tempBuffer =new StringBuffer();
-            if(purchase.getPurchaseState()==Purchase.PurchaseState.PURCHASED){
+            StringBuffer tempBuffer = new StringBuffer();
+            if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
                tempBuffer.append("购买成功:");
                //通知自己服务器
-                if (mOrderid == null || purchase.getOrderId() == null){
+                if (mOrderid == null || purchase.getOrderId() == null) {
                    return false;
                }
-                String allData="";
-                allData="OrderId=" +purchase.getOrderId()+
-                        ",PackageName="+purchase.getPackageName() +
-                        ",Sku=" +"purchase.getSku()"+
-                        ",PurchaseTime=" +purchase.getPurchaseTime()+
-                        ",PurchaseToken=" +purchase.getPurchaseToken()+
-                        ",DeveloperPayload=" +purchase.getDeveloperPayload()+
-                        ",OriginalJson=" +purchase.getOriginalJson()+
-                        ",PurchaseState=" +purchase.getPurchaseState()+
-                        ",Signature="+purchase.getSignature();
+                String allData = "";
+                allData = "OrderId=" + purchase.getOrderId() +
+                        ",PackageName=" + purchase.getPackageName() +
+                        ",Sku=" + "purchase.getSku()" +
+                        ",PurchaseTime=" + purchase.getPurchaseTime() +
+                        ",PurchaseToken=" + purchase.getPurchaseToken() +
+                        ",DeveloperPayload=" + purchase.getDeveloperPayload() +
+                        ",OriginalJson=" + purchase.getOriginalJson() +
+                        ",PurchaseState=" + purchase.getPurchaseState() +
+                        ",Signature=" + purchase.getSignature();
 //                CommonHttpUtil.notifyGoogle("1",mOrderid,purchase.getOrderId(),allData, new HttpCallback() {
 //                    @Override
 //                    public void onSuccess(int code, String msg, String[] info) {
@@ -433,22 +439,21 @@ public class PayPresenter {
 //                });


-            }else{
+            } else {
                tempBuffer.append("暂未支付:");
            }
-            String details = String.format(Locale.getDefault(),"%s \n"," purchase.getSku()");
+            String details = String.format(Locale.getDefault(), "%s \n", " purchase.getSku()");
            tempBuffer.append(details);
-            Log.d(TAG,tempBuffer.toString());
-            return true ;//自动消耗(只有当isSelf为true,并且支付状态为PURCHASED时，该值才会生效)
+            Log.d(TAG, tempBuffer.toString());
+            return true;//自动消耗(只有当isSelf为true,并且支付状态为PURCHASED时，该值才会生效)
        }


-
        @Override
        public boolean onRecheck(@NonNull String skuType, @NonNull Purchase purchase, boolean isSelf) {
-            StringBuffer tempBuffer =new StringBuffer();
+            StringBuffer tempBuffer = new StringBuffer();
            tempBuffer.append("检测到未处理的订单($skuType):${purchase.sku}()");
-            Log.d(TAG,tempBuffer.toString());
+            Log.d(TAG, tempBuffer.toString());
            return true;
        }

@@ -459,43 +464,43 @@ public class PayPresenter {

        @Override
        public void onConsumeSuccess(@NonNull String purchaseToken, boolean isSelf) {
-            Log.d(TAG,"消耗商品成功:$purchaseToken");
+            Log.d(TAG, "消耗商品成功:$purchaseToken");

        }

        @Override
        public void onAcknowledgePurchaseSuccess(boolean isSelf) {
-            Log.d(TAG,"确认购买商品成功");
+            Log.d(TAG, "确认购买商品成功");

        }

        @Override
        public void onFail(@NonNull GoogleBillingUtil.GoogleBillingListenerTag tag, int responseCode, boolean isSelf) {
-            Log.d(TAG,"操作失败:tag=${" + tag.name() + "responseCode=" + responseCode);
+            Log.d(TAG, "操作失败:tag=${" + tag.name() + "responseCode=" + responseCode);

        }

        @Override
        public void onError(@NonNull GoogleBillingUtil.GoogleBillingListenerTag tag, boolean isSelf) {
-            Log.d(TAG,"发生错误:tag="+tag.name());
+            Log.d(TAG, "发生错误:tag=" + tag.name());
        }

    };

    private void checkSubs() {
        int size = googleBillingUtil.getPurchasesSizeSubs(mActivity);
-        switch (size){
+        switch (size) {
            case 0:
                //不具备有效订阅
-                Log.d(TAG,"有效订阅数:0(无有效订阅)");
+                Log.d(TAG, "有效订阅数:0(无有效订阅)");
                break;
            case -1:
                //查询失败
-                Log.d(TAG,"有效订阅数:-1(查询失败)");
+                Log.d(TAG, "有效订阅数:-1(查询失败)");
                break;
            default:
                //具有有效订阅
-                Log.d(TAG,"有效订阅数:$size(具备有效订阅)");
+                Log.d(TAG, "有效订阅数:$size(具备有效订阅)");
                break;
        }
    }
@@ -504,7 +509,7 @@ public class PayPresenter {
        mActivity = null;
        mPayCallback = null;

-        if (googleBillingUtil != null){
+        if (googleBillingUtil != null) {
            googleBillingUtil.onDestroy(mActivity);
            //退出程序的时候可以调用(实验性)
            GoogleBillingUtil.endConnection();
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
18401019693	d8a0427791	修改中英文	2023-10-16 16:30:54 +08:00
18401019693	8abf92d42c	修改中英文	2023-10-14 17:05:14 +08:00
18401019693	fc2d700a31	修改中英文	2023-10-13 17:48:42 +08:00
18401019693	867029fa3a	修改中英文	2023-10-13 16:06:07 +08:00
18401019693	52e199b901	修改中英文	2023-10-13 14:09:34 +08:00
18401019693	c5d537fb4d	修改中英文	2023-10-12 16:19:27 +08:00
18401019693	e081f1e058	修改中英文	2023-10-12 14:26:10 +08:00
18401019693	7bedf93dd5	修改中英文	2023-10-11 17:26:07 +08:00
18401019693	000929fd02	修改中英文	2023-10-11 15:40:39 +08:00
18401019693	3e5ba2ba19	修改中英文	2023-10-11 13:39:31 +08:00
18401019693	a25ce2034f	修改中英文	2023-10-10 17:03:51 +08:00
18401019693	1625135d0c	修改中英文	2023-10-10 14:15:52 +08:00
18401019693	add3589683	修改中英文	2023-10-09 17:57:03 +08:00
18401019693	45a5d6ad61	修改中英文	2023-10-09 17:24:05 +08:00
18401019693	7b62409bf1	中英文修改	2023-10-09 16:27:54 +08:00
18401019693	45ad8a9810	盲盒头条英文图	2023-10-07 16:14:59 +08:00
18401019693	a788c347de	修改游戏的new图标展示，网页中英文检测	2023-10-07 15:20:13 +08:00
18401019693	c3d4cb8d62	Merge branch 'master' into master_sud # Conflicts: # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java # common/src/main/res/values-en-rUS/string.xml # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # config.gradle	2023-10-07 14:46:22 +08:00
18401019693	916a1447f0	修改游戏的new图标展示，网页中英文检测	2023-10-07 14:21:20 +08:00
18401019693	b2ee091c03	修改游戏的new图标展示，网页中英文检测	2023-10-07 11:21:03 +08:00
18401019693	cf169e9a4e	修改游戏的new图标展示，网页中英文检测	2023-10-07 10:31:13 +08:00
18401019693	ea0ff70595	网页拼接中英文字段	2023-10-06 17:04:52 +08:00
18401019693	ce37918745	修改游戏问题	2023-10-06 16:30:02 +08:00
18401019693	260b615d2b	修改游戏问题	2023-10-06 15:43:34 +08:00
18401019693	45566001a7	修改游戏问题	2023-10-06 15:22:59 +08:00
18401019693	12482b6624	修改游戏问题	2023-10-06 13:45:47 +08:00
18401019693	2d7684a5c8	添加游戏列表点击查询游戏状态	2023-10-06 10:01:39 +08:00
18401019693	c1d6b67322	游戏修改，粉丝团提示修改	2023-10-05 15:44:37 +08:00
18401019693	69c0d5f28a	游戏修改，粉丝团提示修改	2023-10-05 13:46:45 +08:00
18401019693	d541a4d506	游戏修改，粉丝团提示修改	2023-10-05 10:52:54 +08:00
18401019693	4b46c72f5a	中英文页面适配修改	2023-09-28 14:47:10 +08:00
18401019693	e191fb82a3	sud游戏搜索页面优化更改	2023-09-27 17:20:29 +08:00
18401019693	32ebfa719d	sud游戏搜索页面优化更改	2023-09-27 17:08:14 +08:00
18401019693	c94f549531	修改随机开始，修改游戏的上座和结束的逻辑，添加中英文	2023-09-27 16:28:43 +08:00
18401019693	6d98afa319	全屏游戏	2023-09-27 14:06:22 +08:00
zlzw	20ccb37ccf	udpate	2023-09-27 09:34:07 +08:00
18401019693	79fa6be313	全屏游戏	2023-09-26 16:05:30 +08:00
18401019693	210e755fed	游戏列表跳转游戏	2023-09-26 14:56:55 +08:00
zlzw	a6faf12ff6	update 首页游戏专区	2023-09-26 10:31:39 +08:00
18401019693	e2148c3f31	游戏列表跳转游戏	2023-09-26 09:53:00 +08:00
18401019693	869ca75464	游戏列表跳转游戏	2023-09-25 17:56:52 +08:00
18401019693	ce48a7dcf0	创建游戏，游戏界面完成	2023-09-25 17:24:49 +08:00
18401019693	866024ae95	创建游戏，游戏界面完成	2023-09-25 11:25:03 +08:00
zlzw	b40abb9bc0	fix 修复PK过程中挂后台导致摄像头关闭问题	2023-09-25 09:54:39 +08:00
18401019693	37217e529e	创建游戏，游戏界面完成	2023-09-25 09:52:31 +08:00
18401019693	eedbbb5304	创建游戏房	2023-09-23 17:44:16 +08:00
zlzw	4b3b47b65f	update 布局&中英文	2023-09-23 10:31:06 +08:00
zlzw	c015459cf1	fix 播放器url為空時不播放	2023-09-22 14:27:23 +08:00
zlzw	326ced4646	update 餘額不足時彈框	2023-09-22 14:25:54 +08:00
zlzw	18970c22cf	update 餘額不足時彈框	2023-09-22 13:38:34 +08:00
zlzw	00db8a00c7	fix 修复一些反馈的问题	2023-09-22 11:05:02 +08:00
18401019693	0756dd9560	游戏房入口对接	2023-09-21 17:58:53 +08:00
zlzw	f3195bbcf8	Merge branch 'dev_6.5.6' into master_tmp1	2023-09-21 13:28:01 +08:00
zlzw	4e4b5f90bb	fix 重复调用弹窗接口	2023-09-21 11:14:01 +08:00
zlzw	3150489384	update 中英文 fix 播放器监测	2023-09-20 18:26:59 +08:00
zlzw	9ff382e35b	update 排位赛中英文IM消息	2023-09-16 18:22:51 +08:00
zlzw	bcd8f7af52	Merge branch 'master' into dev_6.5.6	2023-09-16 14:38:28 +08:00
zlzw	3595b89672	fix 调整英文PK惩罚倒计时过长问题	2023-09-16 14:24:06 +08:00
zlzw	6e8842d30d	update config加入网络失败提示	2023-09-16 14:23:43 +08:00
zlzw	7b5cd9b797	update 中英文	2023-09-16 10:53:08 +08:00
zlzw	9ec241f2a3	update 弹窗	2023-09-15 18:28:46 +08:00
zlzw	a876018b0a	update 弹窗布局	2023-09-15 18:12:40 +08:00
zlzw	ea397af123	update 弹窗接口	2023-09-15 16:55:36 +08:00
zlzw	a475e5dc2f	update 中英文	2023-09-15 16:15:51 +08:00
zlzw	54258c3f13	新增【弹框功能优化】	2023-09-15 14:54:45 +08:00
zlzw	d383a08013	新增【弹框功能优化】	2023-09-15 10:04:02 +08:00
18401019693	fed6289f67	修复在直播间内跳转自己的直播间问题	2023-09-14 14:45:29 +08:00
18401019693	9b301eba25	修复在直播间内跳转自己的直播间问题	2023-09-12 17:14:17 +08:00
zlzw	d1edf6bdd8	新增主播关播时，用户端调用离开房间	2023-09-11 10:41:56 +08:00
18401019693	7ca8694aed	修复在直播间内跳转自己的直播间问题	2023-09-11 10:29:16 +08:00
18401019693	406c67bf3a	修复在直播间内跳转自己的直播间问题	2023-09-08 15:58:32 +08:00
18401019693	d643df72bc	埋点配置	2023-09-08 15:57:33 +08:00
zlzw	a3dacf1f59	调整盲盒说明页面地址	2023-09-06 18:28:10 +08:00
zlzw	37605f46b7	調整中英文	2023-09-06 15:27:03 +08:00
18401019693	a4895df622	埋点配置	2023-09-06 14:40:45 +08:00
zlzw	fc63cbbf50	update	2023-09-06 11:09:50 +08:00
zlzw	b7ba717cb9	Merge branch 'dev_6.5.5' # Conflicts: # common/src/main/res/values-en-rUS/string.xml # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java	2023-09-06 10:42:05 +08:00
zlzw	0c5ef0befe	跳转七日留存：新增点击打开用户卡片，新增@用户名颜色	2023-09-05 17:59:29 +08:00
18401019693	84d4423069	埋点配置	2023-09-05 14:25:50 +08:00
18401019693	0721ff4f37	Merge branch 'master_umeng' # Conflicts: # app/proguard-rules.pro # common/src/main/res/values/strings.xml # live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java	2023-09-05 14:18:42 +08:00
zlzw	a5b0ee757c	新增H5网页跳转直播间并打开礼物栏选中礼物功能	2023-09-05 13:52:45 +08:00
18401019693	82fd35305a	埋点配置	2023-09-05 13:24:21 +08:00
zlzw	e89e82483b	调整中英文调整开播频道接口	2023-09-04 16:25:06 +08:00
zlzw	57bda40a82	调整中英文调整开播频道接口	2023-09-02 11:16:01 +08:00
18401019693	93aa8e55e5	埋点配置	2023-09-02 10:10:50 +08:00
zlzw	2e907bc1ed	移除重复点击事件监听	2023-08-31 16:16:36 +08:00
zlzw	8d984951c3	新增主動PK結束通知	2023-08-31 15:14:15 +08:00
18401019693	dd6600a89e	埋点配置	2023-08-31 09:56:41 +08:00
18401019693	233469c7e4	埋点配置	2023-08-30 13:44:56 +08:00
zlzw	357ece2ebe	补充Android13权限问题	2023-08-30 13:28:42 +08:00
18401019693	72e9633045	埋点配置	2023-08-30 13:21:40 +08:00
18401019693	7a31ca52da	埋点配置	2023-08-30 09:44:26 +08:00
18401019693	33930f3e32	埋点配置	2023-08-29 13:35:38 +08:00
zlzw	8e19ddcc99	兼容Android13 连麦权限问题	2023-08-29 09:54:21 +08:00
18401019693	1a58311e26	埋点配置	2023-08-28 16:52:19 +08:00
zlzw	9360e5438c	修复svga库被混淆不显示问题	2023-08-28 10:30:56 +08:00
zlzw	fa8d8a7421	调整红包倒计时范围	2023-08-28 10:14:38 +08:00
18401019693	bebf0820ca	埋点配置	2023-08-25 15:12:48 +08:00
zlzw	e1f4e8dde4	update 6.5.5	2023-08-24 16:31:14 +08:00
zlzw	2b59b1b4fe	Merge branch 'master' into dev_6.5.5	2023-08-24 15:02:05 +08:00
zlzw	cee1476ab1	update 6.5.5	2023-08-24 14:26:38 +08:00
zlzw	20a6bae5ff	更新美颜中英文繁体	2023-08-24 13:34:08 +08:00
zlzw	b6732adfd2	调整礼物栏触碰事件拦截	2023-08-24 10:54:12 +08:00
zlzw	bec031688e	调整礼物栏触碰事件拦截	2023-08-24 10:46:40 +08:00
zlzw	7f11195ede	update 6.5.5	2023-08-24 09:43:33 +08:00
zlzw	d4ff9c3072	兼容Android13权限问题	2023-08-23 17:10:52 +08:00
zlzw	0a442e7df9	兼容Android13权限问题	2023-08-23 17:02:16 +08:00
zlzw	52f1a78e36	update 红包优化	2023-08-23 16:37:53 +08:00
18401019693	6bcaf2ba9c	埋点配置	2023-08-23 15:05:32 +08:00
18401019693	75b176a81e	6.5.4礼物冠名	2023-08-22 14:10:09 +08:00
18401019693	3de972d12c	6.5.4礼物冠名	2023-08-22 14:03:04 +08:00
18401019693	95252f2f02	6.5.4礼物冠名	2023-08-22 13:31:32 +08:00
18401019693	3b351ffad8	6.5.4礼物冠名	2023-08-22 10:13:57 +08:00
zlzw	2332255b37	礼物栏等级页面补充中英文标识	2023-08-21 17:38:41 +08:00
18401019693	90c2f3e2da	6.5.4礼物冠名	2023-08-21 17:20:29 +08:00
18401019693	644615ffc0	6.5.4礼物冠名	2023-08-21 15:28:29 +08:00
18401019693	345c9067aa	6.5.4礼物冠名	2023-08-19 16:05:30 +08:00
18401019693	c20312b982	6.5.4礼物冠名	2023-08-18 18:43:47 +08:00
18401019693	643568f63b	6.5.4礼物冠名	2023-08-18 18:08:15 +08:00
18401019693	f03ba293b5	6.5.4礼物冠名	2023-08-18 17:43:13 +08:00
zlzw	a2f954b28a	Merge remote-tracking branch 'origin/master'	2023-08-18 14:48:41 +08:00
zlzw	d4549793d1	调整头像相关	2023-08-18 14:48:33 +08:00
18401019693	5da8855948	6.5.4礼物冠名	2023-08-18 14:17:46 +08:00
18401019693	348dca8474	6.5.4礼物冠名	2023-08-18 13:49:20 +08:00
18401019693	5afed0ee43	6.5.4礼物冠名	2023-08-18 11:04:21 +08:00
18401019693	d065726274	6.5.4礼物冠名	2023-08-17 18:20:53 +08:00
18401019693	8f9d558043	6.5.4礼物冠名	2023-08-17 18:15:25 +08:00
zlzw	c594364574	调整关注逻辑	2023-08-17 17:17:06 +08:00
18401019693	68140c8a3a	6.5.4礼物冠名	2023-08-17 15:38:59 +08:00
zlzw	5a4001c858	调整退出粉丝团逻辑	2023-08-17 13:45:40 +08:00
18401019693	d5953bd651	6.5.4礼物冠名	2023-08-17 13:19:04 +08:00
18401019693	17a2f5e091	6.5.4礼物冠名	2023-08-16 20:01:46 +08:00
18401019693	b2297b062e	6.5.4礼物冠名	2023-08-16 18:17:26 +08:00
zlzw	b53472de28	調整文案	2023-08-16 17:32:29 +08:00
18401019693	9bce235817	6.5.4礼物冠名	2023-08-16 16:23:28 +08:00
18401019693	60ce5572cf	6.5.4礼物冠名	2023-08-16 15:37:07 +08:00
18401019693	3761cad653	6.5.4礼物冠名	2023-08-16 14:50:50 +08:00
18401019693	2a276503b5	6.5.4礼物冠名	2023-08-16 13:31:56 +08:00
zlzw	fd0ad36a58	补充英文	2023-08-15 14:07:33 +08:00
zlzw	41c8783b53	调整一处英文UI下字数过长问题	2023-08-15 14:00:36 +08:00
18401019693	7226add482	6.5.4礼物冠名	2023-08-15 11:29:39 +08:00
zlzw	09e5f9b984	Merge remote-tracking branch 'origin/master'	2023-08-15 10:37:25 +08:00
zlzw	83ee1f94df	修复一处闪退bug	2023-08-15 10:37:06 +08:00
18401019693	7e1b054a98	6.5.4礼物冠名	2023-08-14 21:05:15 +08:00
18401019693	9e0c437af5	6.5.4礼物冠名	2023-08-14 19:55:58 +08:00
18401019693	ad26ae7db8	6.5.4礼物冠名	2023-08-14 19:16:02 +08:00
18401019693	84230e517e	6.5.4礼物冠名	2023-08-14 18:40:25 +08:00
zlzw	9818a1af74	新增关注的code提示	2023-08-14 18:05:55 +08:00
zlzw	f91ba79c5c	新增关注的code提示	2023-08-14 17:54:27 +08:00
18401019693	0ea9ffc2e8	6.5.4礼物冠名	2023-08-14 17:40:52 +08:00
18401019693	defb5fdd02	6.5.4礼物冠名	2023-08-14 15:50:35 +08:00
zlzw	b443fdd683	调整页面英文UI	2023-08-14 14:58:13 +08:00
18401019693	c11c66f56f	6.5.4礼物冠名	2023-08-14 13:47:09 +08:00
18401019693	a618bee6b7	6.5.4礼物冠名	2023-08-14 11:18:33 +08:00
zlzw	399bedb874	调整购买守护页面英文UI	2023-08-14 10:57:38 +08:00
18401019693	3b6e2d47f4	6.5.4礼物冠名	2023-08-14 10:31:01 +08:00
18401019693	96daf73a5c	6.5.4礼物冠名	2023-08-14 10:16:06 +08:00
18401019693	55cbd0ff5b	6.5.4礼物冠名	2023-08-11 14:37:35 +08:00
18401019693	a3ab9ff03e	6.5.4礼物冠名	2023-08-11 14:19:15 +08:00
18401019693	92ed82ea2a	6.5.4礼物冠名	2023-08-11 13:59:54 +08:00
18401019693	6d262d0c94	6.5.4礼物冠名	2023-08-11 09:42:18 +08:00
18401019693	ce1174a88c	6.5.4礼物冠名	2023-08-10 17:40:57 +08:00
18401019693	2406e9bede	6.5.4礼物冠名	2023-08-10 17:38:06 +08:00
zlzw	9b3a011499	修复英文say hi下格式问题#131	2023-08-10 17:25:53 +08:00
18401019693	7859e7cb29	6.5.4礼物冠名	2023-08-10 17:16:14 +08:00
18401019693	1fd36e3ba0	6.5.4礼物冠名	2023-08-10 17:04:26 +08:00
zlzw	ec3722b7d0	新增粉丝团任务红点提示	2023-08-10 16:53:00 +08:00
18401019693	35917a5848	6.5.4礼物冠名	2023-08-10 15:40:13 +08:00
18401019693	7ea6bb570d	6.5.4礼物冠名	2023-08-10 14:20:40 +08:00
18401019693	43f95260e6	6.5.4礼物冠名	2023-08-10 13:51:49 +08:00
18142669586	54a4c0b590	Merge remote-tracking branch 'origin/master'	2023-08-10 11:15:31 +08:00
18142669586	2057a3575f	修改融云结束连麦还有对方画面的问题	2023-08-10 11:15:06 +08:00
18401019693	aa809ebaf4	6.5.4礼物冠名	2023-08-10 10:03:01 +08:00
18401019693	dffa71e346	6.5.4礼物冠名	2023-08-09 18:11:42 +08:00
18401019693	fea46aab1f	6.5.4礼物冠名	2023-08-09 17:05:51 +08:00
18401019693	e032e0807b	6.5.4礼物冠名	2023-08-09 14:38:33 +08:00
18401019693	24ed313f60	6.5.4礼物冠名	2023-08-09 14:15:03 +08:00
18142669586	02b70d559d	Merge remote-tracking branch 'origin/master'	2023-08-09 14:14:11 +08:00
18142669586	7a26e81f67	修改融云合流不成功的问题，退出画面有问题	2023-08-09 14:13:52 +08:00
zlzw	d07439efcf	update 主播端点礼物墙按钮置灰	2023-08-09 13:53:16 +08:00
18401019693	7bca817633	6.5.4礼物冠名	2023-08-09 13:31:31 +08:00
18401019693	bad2b3689a	6.5.4礼物冠名	2023-08-09 11:01:28 +08:00
zlzw	3cc9b90151	update 简繁	2023-08-09 10:24:13 +08:00
18401019693	e32e6f95b0	6.5.4礼物冠名	2023-08-08 17:09:35 +08:00
18401019693	2162645da1	6.5.4礼物冠名	2023-08-08 16:12:07 +08:00
18401019693	af17c85366	6.5.4礼物冠名	2023-08-08 16:08:43 +08:00
18401019693	20c00e2896	6.5.4礼物冠名	2023-08-08 15:37:11 +08:00
18401019693	44b95cb1c6	6.5.4礼物冠名	2023-08-08 14:50:13 +08:00
zlzw	40e744a533	修复粉丝团包裹为空时会关掉对话框的情况	2023-08-08 13:32:42 +08:00
18401019693	82ccd2d89c	6.5.4礼物冠名	2023-08-08 11:37:19 +08:00
18401019693	994bd2a3aa	6.5.4礼物冠名	2023-08-08 09:34:15 +08:00
zlzw	3ab91a74d1	修复礼物栏自定义数量过长导致的闪退问题	2023-08-07 18:26:45 +08:00
18142669586	d899975495	修改融云合流不成功的问题	2023-08-07 18:06:46 +08:00
zlzw	dbbe753492	调整【围观】为繁体	2023-08-07 17:05:33 +08:00
18401019693	017320ac09	6.5.4礼物冠名	2023-08-07 16:29:02 +08:00
zlzw	7ce0bb3a7c	修复#93测试问题	2023-08-07 15:18:34 +08:00
18401019693	a78d5b4aba	6.5.4礼物冠名	2023-08-07 14:50:29 +08:00
zlzw	37fd1e9f47	调整粉丝团入场英文翻译	2023-08-07 14:39:35 +08:00
18401019693	97ad28ba62	6.5.4礼物冠名	2023-08-07 13:36:59 +08:00
zlzw	3304e8f673	update 粉丝团	2023-08-05 18:04:36 +08:00
zlzw	e7daabe588	Merge branch 'dev_6.5.4'	2023-08-05 16:53:13 +08:00
zlzw	d912ad6119	update 粉丝团	2023-08-05 16:52:48 +08:00
18401019693	dfeb1c246b	6.5.4礼物冠名	2023-08-05 15:22:49 +08:00
18401019693	9588619b73	6.5.4礼物冠名	2023-08-04 16:54:28 +08:00
18401019693	6ba71508ca	6.5.4礼物冠名	2023-08-04 16:28:43 +08:00
zlzw	c8f443c105	Merge branch 'master' into dev_6.5.4_tmp	2023-08-04 16:15:25 +08:00
18401019693	ebcfddf450	6.5.4礼物冠名	2023-08-04 16:14:36 +08:00
zlzw	e43fb5e479	Merge branch 'master' into dev_6.5.4_tmp	2023-08-04 16:13:14 +08:00
18401019693	0c096dcafc	6.5.4礼物冠名	2023-08-04 15:59:20 +08:00
18401019693	545c69ff8b	6.5.4礼物冠名	2023-08-04 15:50:32 +08:00
zlzw	bf8d88608d	Merge branch 'master' into dev_6.5.4_tmp # Conflicts: # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java # common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java # common/src/main/res/values-en-rUS/string.xml # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java	2023-08-04 15:41:11 +08:00
18401019693	45c256cbbb	6.5.4礼物冠名	2023-08-04 15:18:06 +08:00
18401019693	fb1d6c0688	6.5.4礼物冠名	2023-08-04 14:58:26 +08:00
zlzw	fe921e25bb	update 粉丝团	2023-08-04 14:25:49 +08:00
18401019693	d5ca010ec7	6.5.4礼物冠名	2023-08-04 13:57:36 +08:00
18401019693	04259472a1	Merge remote-tracking branch 'origin/dev_gift_6.5.4'	2023-08-04 10:19:18 +08:00
zlzw	fae0d01dc2	update 粉丝团	2023-08-02 15:48:51 +08:00
zlzw	9a8bc0505d	修复#248问题	2023-08-02 15:08:11 +08:00
zlzw	e31fa0310c	修复#250问题	2023-08-02 14:43:20 +08:00
zlzw	2705342e18	修复#249问题	2023-08-02 14:39:56 +08:00
zlzw	1bdf3a2ba3	修复#246问题	2023-08-02 14:20:47 +08:00
zlzw	c53b9a6064	update 粉丝团相关	2023-07-31 16:28:42 +08:00
zlzw	92d4130c45	update 粉丝团相关	2023-07-28 10:01:41 +08:00
zlzw	7e3ca79a01	调整随机PK弹框UI	2023-07-21 14:19:20 +08:00
zlzw	dfeb3a78c1	修复英文模式下，购买是守护文案超长问题	2023-07-21 13:34:31 +08:00
zlzw	e32d450ca1	修复随机PK文案在英文模式下过长问题	2023-07-21 09:45:11 +08:00
zlzw	f29766731c	修复#232问题	2023-07-20 18:12:09 +08:00
zlzw	736592b4e1	新增头像选择界面	2023-07-19 18:30:32 +08:00
zlzw	3108c898c2	Merge branch 'dev_6.5.4_头像优化' into dev_6.5.4_联系方式	2023-07-19 15:35:48 +08:00
zlzw	dd2f3db16a	新增头像选择界面	2023-07-19 15:35:30 +08:00
zlzw	8af231e526	新增头像选择界面	2023-07-19 13:07:27 +08:00
zlzw	fdbbc3b224	修復紅點檢測	2023-07-19 10:25:11 +08:00
zlzw	1e4b0bb536	补充信箱角标点亮和防抖	2023-07-18 18:09:27 +08:00
zlzw	4729f93515	新增获取联系方式的弹框新样式	2023-07-18 15:40:15 +08:00