新增战令购买经验对话框经验条上加入经验文本

调整战令购买等级最大值
新增战令统计直播间发送消息接口

FaceUnity/src/main/java/com/yunbao/faceunity/utils/FURenderer.java

@@ -55,8 +55,8 @@ public class FURenderer extends IFURenderer {
     private FURenderKit mFURenderKit;
 
     /* AI道具*/
-    private String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor_lite.bundle";
-    private String BUNDLE_AI_HUMAN = "model" + File.separator + "ai_human_processor.bundle";
+    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor_lite.bundle";
+    public static  String BUNDLE_AI_HUMAN = "model" + File.separator + "ai_human_processor.bundle";
 
     /* GL 线程 ID */
     private Long mGlThreadId = 0L;

FaceUnity/src/main/java/com/yunbao/faceunity/utils/FileUtils.java

@@ -314,6 +314,35 @@ public class FileUtils {
         return null;
     }
 
+    public static String copyAssetsFile(Context context, String assetsPath, String fileName, String saveFileDir) {
+        File fileDir = new File(saveFileDir);
+        if (!fileDir.exists()) {
+            fileDir.mkdirs();
+        }
+        File file = new File(fileDir, fileName);
+        if (file.exists()) {
+            return file.getAbsolutePath();
+        }
+        try {
+            InputStream inputStream = context.getAssets().open(assetsPath);
+            FileOutputStream fos = new FileOutputStream(file);
+            BufferedInputStream bis = new BufferedInputStream(inputStream);
+            BufferedOutputStream bos = new BufferedOutputStream(fos);
+            byte[] byteArray = new byte[1024];
+            int bytes = bis.read(byteArray);
+            while (bytes > 0) {
+                bos.write(byteArray, 0, bytes);
+                bos.flush();
+                bytes = bis.read(byteArray);
+            }
+            bos.close();
+            fos.close();
+            return file.getAbsolutePath();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
     /**
      * 获取Uri文件绝对路径
@@ -522,6 +551,7 @@ public class FileUtils {
 
     /**
      * 遍历一个文件夹获取改文件夹下所有文件名
+     *
      * @param path
      * @return
      */
@@ -563,7 +593,7 @@ public class FileUtils {
      * @param path String
      * @return Boolean
      */
-    public static Boolean checkIsVideo(Context context,String path) {
+    public static Boolean checkIsVideo(Context context, String path) {
         MediaMetadataRetriever retriever = new MediaMetadataRetriever();
         try {
             retriever.setDataSource(context, Uri.fromFile(new File(path)));

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>
 

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>

FaceUnity/src/test/java/com/yunbao/faceunity/ExampleUnitTest.java

@@ -1,8 +1,5 @@
 package com.yunbao.faceunity;
 
-import org.junit.Test;
-
-import static org.junit.Assert.*;
 
 /**
  * Example local unit test, which will execute on the development machine (host).
@@ -10,8 +7,5 @@ import static org.junit.Assert.*;
  * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
  */
 public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
+
 }

Share/src/main/java/com/yunbao/share/bean/ShareBuilder.java

@@ -3,11 +3,14 @@ package com.yunbao.share.bean;
 import androidx.annotation.NonNull;
 
 import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.CommonAppContext;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.StringUtil;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.Locale;
 
 public class ShareBuilder {
     public static final int APP_FACEBOOK = 0;
@@ -27,23 +30,18 @@ public class ShareBuilder {
     private String anchorAvatar;
 
     public static String createLiveShareLink(String shareUid, String anchorId, String anchorName, String anchorAvatar) {
-        try {
-            return String.format(CommonAppConfig.HOST +
-                            "/h5/activity/FriendInvitation/liveShare.html?user_id=%s&anchor_id=%s&anchor_name=%s&anchor_avatar=%s&isGoogle=%s",
-                    shareUid,
-                    anchorId,
-                    URLEncoder.encode(anchorName, "UTF-8"),
-                    URLEncoder.encode(anchorAvatar, "UTF-8"),
-                    CommonAppConfig.IS_GOOGLE_PLAY ? "1" : "0"
-            );
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
+        return String.format(CommonAppConfig.HOST +
+                        "/index.php?g=Appapi&m=home&a=share&uid=%s&user_id=%s&isGoogle=%s",
+                anchorId,
+                shareUid,
+                CommonAppConfig.IS_GOOGLE_PLAY
+        );
     }
-    public static String createInviteLink(String shareUid){
+
+    public static String createInviteLink(String shareUid) {
         return String.format("https://www.pdlive.com/public/app/download/index.html?user_id=%s&isGoogle=%s",
                 shareUid,
-                CommonAppConfig.IS_GOOGLE_PLAY ? "1" : "0"
+                CommonAppConfig.IS_GOOGLE_PLAY
         );
     }
 

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);
@@ -135,7 +135,7 @@ public class InvitePopDialog extends AbsDialogPopupWindow {
 
     private ShareBuilder builder(int type) {
         ShareBuilder builder = ShareBuilder.builder(type);
-        builder.setText(WordUtil.getString(R.string.dialog_invite_info));
+        builder.setText(getContext().getString(R.string.dialog_invite_info));
         builder.setLink(url);
         builder.setUid(uid);
         builder.setAnchorId(anchorId);
@@ -148,11 +148,11 @@ public class InvitePopDialog extends AbsDialogPopupWindow {
         ClipboardManager cm = (ClipboardManager) getContext().getSystemService(CLIPBOARD_SERVICE);
         ClipData clipData = ClipData.newPlainText("text", info.getText() + "\n" + url);
         cm.setPrimaryClip(clipData);
-        ToastUtil.show(WordUtil.getString(com.yunbao.common.R.string.copy_success));
+        ToastUtil.show(getContext().getString(com.yunbao.common.R.string.copy_success));
     }
 
     public InvitePopDialog setUrl(String data) {
-        this.url = data + "&isGoogle=" + (CommonAppConfig.IS_GOOGLE_PLAY ? "1" : "0");
+        this.url = data + "&isGoogle=" + CommonAppConfig.IS_GOOGLE_PLAY;
         return this;
     }
 }

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,14 +113,15 @@ public class SharePopDialog extends AbsDialogPopupWindow {
                 url = shareLink;
             }
         }
+        url = url + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
         link.setText(url);
-        info.setText(String.format(WordUtil.getString(R.string.dialog_share_info), StringUtil.isEmpty(anchorName) ? "" : anchorName));
+        info.setText(String.format(getContext().getString(R.string.dialog_share_info), StringUtil.isEmpty(anchorName) ? "" : anchorName));
         ImgLoader.display(getContext(), anchorAvatar, avatar);
     }
 
     private ShareBuilder builder(int type) {
         ShareBuilder builder = ShareBuilder.builder(type);
-        builder.setText(String.format(WordUtil.getString(R.string.dialog_share_info), StringUtil.isEmpty(anchorName) ? "" : anchorName));
+        builder.setText(String.format(getContext().getString(R.string.dialog_share_info), StringUtil.isEmpty(anchorName) ? "" : anchorName));
         builder.setUid(uid);
         builder.setAnchorId(anchorId);
         builder.setAnchorName(anchorName);
@@ -139,8 +140,8 @@ 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(WordUtil.getString(com.yunbao.common.R.string.copy_success));
+        ToastUtil.show(getContext().getString(com.yunbao.common.R.string.copy_success));
     }
 }

app/agconnect-services.json

@@ -26,21 +26,21 @@
 		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
 	},
 	"client":{
-		"cp_id":"30086000612391734",
-		"product_id":"99536292102564216",
-		"client_id":"964994320723627840",
-		"client_secret":"6D5FE29D85B967D3A66BDCD473641E4C7B5524F7F4935CA0EF4A842730C3402D",
-		"project_id":"99536292102564216",
-		"app_id":"106936673",
-		"api_key":"DAEDADYGta/0O4ZSdrnug52NgC67/w/RIyTq9A8LyAY0+mp6g6XeJDbxugpluFPLAhaqjaMs5c0PLnRx14UzWbPPADgi1EqihbWLoA==",
+		"cp_id":"30852000032486141",
+		"product_id":"388421841221767494",
+		"client_id":"1283893262452580800",
+		"client_secret":"17BC070420691D35650C694230D6348075CB549F7BBA94EDD49FA9E61A9E5434",
+		"project_id":"388421841221767494",
+		"app_id":"109612651",
+		"api_key":"DAEDAAlBbTFuTuyQWQsyYBZLuyjALH9Y9BNFkVZl1GhI0tRaa6HF1LgzXWy2MZiSFrmpbn1aAvcvzP6aKZtR6MVikS8V4SbBlYUPfQ==",
 		"package_name":"com.pdlive.shayu"
 	},
 	"oauth_client":{
-		"client_id":"106936673",
+		"client_id":"109612651",
 		"client_type":1
 	},
 	"app_info":{
-		"app_id":"106936673",
+		"app_id":"109612651",
 		"package_name":"com.pdlive.shayu"
 	},
 	"service":{
@@ -53,6 +53,10 @@
 			"resource_id":"p1",
 			"channel_id":""
 		},
+		"edukit":{
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
+		},
 		"search":{
 			"url":"https://search-drcn.cloud.huawei.com"
 		},
@@ -77,15 +81,15 @@
 		{
 			"package_name":"com.pdlive.shayu",
 			"client":{
-				"app_id":"106936673"
+				"app_id":"109612651"
 			},
 			"app_info":{
 				"package_name":"com.pdlive.shayu",
-				"app_id":"106936673"
+				"app_id":"109612651"
 			},
 			"oauth_client":{
 				"client_type":1,
-				"client_id":"106936673"
+				"client_id":"109612651"
 			}
 		}
 	]

app/build.gradle

@@ -6,6 +6,9 @@ apply plugin: 'com.alibaba.arouter'
 android {
     dexOptions {
         jumboMode = true
+    }
+    project.tasks.getByName("tasks").doFirst {
+
     }
     /*  applicationVariants.all { variant ->
           variant.mergeAssetsProvider.configure {
@@ -92,6 +95,13 @@ android {
         exclude 'lib/armeabi-v7a/libmmlic.so'
         exclude 'lib/armeabi-v7a/libMNN_CL.so'
         exclude 'lib/armeabi-v7a/libMNN_Express.so'
+        //美颜
+        if (rootProject.ext.manifestPlaceholders.isPluginModel) {
+            exclude 'lib/armeabi-v7a/libCNamaSDK.so'
+            exclude 'lib/arm64-v8a/libCNamaSDK.so'
+            exclude 'lib/armeabi-v7a/libfuai.so'
+            exclude 'lib/arm64-v8a/libfuai.so'
+        }
 
     }
     compileOptions {
@@ -99,6 +109,11 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     applicationVariants.all { variant ->
+        println "清空build文件夹";
+        for (final def project in rootProject.getAllprojects()) {
+            delete project.buildDir
+            println project.buildDir
+        }
         String variantName = variant.name.capitalize()
         def processManifestTask = project.tasks.getByName("process${variantName}Manifest")
         processManifestTask.doLast { pm ->
@@ -115,33 +130,59 @@ android {
         }
         variant.mergeAssetsProvider.configure {
             doLast {
-                delete(fileTree(dir: outputDir, includes: [
-                        'model/ai_bgseg_green.bundle',
-                        'model/ai_face_processor.bundle',
-                        //'model/ai_face_processor_lite.bundle',
-                        'model/ai_hairseg.bundle',
-                        'model/ai_hand_processor.bundle',
-                        'model/ai_human_processor.bundle',
-                        'model/ai_human_processor_gpu.bundle',
-                        'model/ai_human_processor_mb_fast.bundle',
-                        'graphics/body_slim.bundle',
-                        'graphics/controller_cpp.bundle',
-                        //'graphics/face_beautification.bundle',
-                        'graphics/face_makeup.bundle',
-                        'graphics/fuzzytoonfilter.bundle',
-                        'graphics/fxaa.bundle',
-                        'graphics/tongue.bundle',
-                        //旧美颜
-                        'model-all.zip',
-                        'filterData.zip',
-                        'KSYResource/*',
-                        'Resources/*',
-                        'Asset/*',
-                        'image_effect_shaders/*',
-                        'internal/*'
+                delete(fileTree(dir: outputDir, includes: ['model/ai_bgseg_green.bundle',
+                                                           'model/ai_face_processor.bundle',
+                                                           //'model/ai_face_processor_lite.bundle',
+                                                           'model/ai_hairseg.bundle',
+                                                           'model/ai_hand_processor.bundle',
+                                                           'model/ai_human_processor.bundle',
+                                                           'model/ai_human_processor_gpu.bundle',
+                                                           'model/ai_human_processor_mb_fast.bundle',
+                                                           'graphics/body_slim.bundle',
+                                                           'graphics/controller_cpp.bundle',
+                                                           //'graphics/face_beautification.bundle',
+                                                           'graphics/face_makeup.bundle',
+                                                           'graphics/fuzzytoonfilter.bundle',
+                                                           'graphics/fxaa.bundle',
+                                                           'graphics/tongue.bundle',
+                                                           //旧美颜
+                                                           'model-all.zip',
+                                                           'filterData.zip',
+                                                           'KSYResource/*',
+                                                           'Resources/*',
+                                                           'Asset/*',
+                                                           'image_effect_shaders/*',
+                                                           'internal/*'
+                                                           //美颜基础组件
+
                 ]))
+                println "isPluginModel = " + rootProject.ext.manifestPlaceholders.isPluginModel
+                if (rootProject.ext.manifestPlaceholders.isPluginModel) {
+                    delete(fileTree(dir: outputDir, includes: ['model/ai_face_processor_lite.bundle',
+                                                               'graphics/face_beautification.bundle']))
+                } else {
+                    println "不删除bundle"
+                }
             }
         }
+        variant.outputs.all {
+            def isGoogle = "链接"
+            if (rootProject.ext.manifestPlaceholders.isGooglePlay == 1) {
+                isGoogle = "谷歌"
+            } else if (rootProject.ext.manifestPlaceholders.isGooglePlay == 2) {
+                isGoogle = "Huawei"
+            }
+            def isPlugin = "完整"
+            if (rootProject.ext.manifestPlaceholders.isPluginModel) {
+                isPlugin = "插件"
+            }
+            def isTest = "测试服"
+            if (rootProject.ext.manifestPlaceholders.serverHost == "https://napi.yaoulive.com") {
+                isTest = "正式服"
+            }
+            outputFileName = "[${new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${isGoogle}-${isPlugin}-${variant.buildType.name}-${isTest}.apk"
+
+        }
     }
     signingConfigs {
         release {
@@ -189,16 +230,20 @@ android {
                 arguments = [AROUTER_MODULE_NAME: project.getName()]
             }
         }
-
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
+            zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
         debug {
             minifyEnabled false
+            shrinkResources false
+            zipAlignEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
     }
@@ -219,8 +264,8 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 
-    implementation platform('com.google.firebase:firebase-bom:30.5.0')
-    implementation 'com.google.firebase:firebase-crashlytics'
+    //implementation platform('com.google.firebase:firebase-bom:30.5.0')
+    //implementation 'com.google.firebase:firebase-crashlytics'
 
     //直播
     api project(':main')

app/proguard-rules.pro

@@ -12,17 +12,40 @@
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+   public *;
+}
 
 # Uncomment this to preserve the groupLast number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the groupLast number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
+
+-keep class com.yunbao.**{
+  public <methods>;
+  protected <methods>;
+}
+-keep class * implements com.yunbao.common.bean.BaseModel {
+ *;
+}
+-keep class com.yunbao.common.bean.** {
+ *;
+}
+
+-keep class com.yunbao.common.views.weight.VerticalViewPager$LayoutParams{
+    *;
+}
+-keep class android.**{
+    *;
+}
+
+-keep class **.R$* {
+    public static <fields>;
+}
+-keep class com.tencent.** { *; }
 -keep class com.adjust.sdk.**{ *; }
 -keep class com.google.android.gms.common.ConnectionResult {
     int SUCCESS;
@@ -48,6 +71,13 @@
 -keep class okhttp3.internal.**{*;}
 
 -dontwarn okio.**
+#okhttp
+-dontwarn okhttp3.**
+-keep class okhttp3.**{*;}
+
+#okio
+-dontwarn okio.**
+-keep class okio.**{*;}
 
 # Retrofit
 
@@ -55,9 +85,10 @@
 
 -keep class retrofit2.** { *; }
 
--keepattributes Signature-keepattributes Exceptions
+-keepattributes Signature-keepattributes,Exceptions
 
 # RxJava RxAndroid
+-dontwarn java.util.concurrent.Flow*
 
 -dontwarn sun.misc.**
 
@@ -69,20 +100,195 @@ long consumerIndex;
 
 }
 
--keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef* {
 
-rx.internal.util.atomic.LinkedQueueNode producerNode;
+rx.internal.util.atomic.LinkedQueueNode* producerNode;
 
 }
 
--keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef {
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef* {
 
-rx.internal.util.atomic.LinkedQueueNode consumerNode;
+rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 }
 
 # Gson
 
 -keep class com.google.gson.stream.** { *; }
+##---------------Begin: proguard configuration for Gson  ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { <fields>; }
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+
+##---------------End: proguard configuration for Gson  ----------
 
 -keepattributes EnclosingMethod
+#--------融云
+-keepattributes Exceptions,InnerClasses
+-keepattributes Signature
+-keep class io.rong.** {*;}
+-keep class cn.rongcloud.** {*;}
+-keep class * implements io.rong.imlib.model.MessageContent {*;}
+-dontwarn io.rong.push.**
+-dontnote com.xiaomi.**
+-dontnote com.google.android.gms.gcm.**
+-dontnote io.rong.**
+# 下方混淆使用了融云 IMKit 提供的 locationKit 位置插件时才需要配置，可参考高德官网的混淆方式:https://lbs.amap.com/api/android-sdk/guide/create-project/dev-attention
+-keep class com.amap.api.maps.**{*;}
+-keep class com.autonavi.**{*;}
+-keep class com.amap.api.trace.**{*;}
+-keep class com.amap.api.location.**{*;}
+-keep class com.amap.api.fence.**{*;}
+-keep class com.loc.**{*;}
+-keep class com.autonavi.aps.amapapi.model.**{*;}
+-keep class com.amap.api.services.**{*;}
+-ignorewarnings
+
+#--------科大讯飞
+-keep class com.iflytek.**{*;}
+-keepattributes Signature
+#EvenBus
+-keepattributes *Annotation*
+-keepclassmembers class * {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+
+# If using AsyncExecutord, keep required constructor of default event used.
+# Adjust the class name if a custom failure event type is used.
+-keepclassmembers class org.greenrobot.eventbus.util.ThrowableFailureEvent {
+    <init>(java.lang.Throwable);
+}
+
+# Accessed via reflection, avoid renaming or removal
+-keep class org.greenrobot.eventbus.android.AndroidComponentsImpl*
+
+#--------ARouter
+-keep public class com.alibaba.android.arouter.routes.**{*;}
+-keep public class com.alibaba.android.arouter.facade.**{*;}
+-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
+
+# If you use the byType method to obtain Service, add the following rules to protect the interface:
+-keep interface * implements com.alibaba.android.arouter.facade.template.IProvider
+
+# If single-type injection is used, that is, no interface is defined to implement IProvider, the following rules need to be added to protect the implementation
+# -keep class * implements com.alibaba.android.arouter.facade.template.IProvider
+
+#----retrofit2
+-keepattributes Signature, InnerClasses, EnclosingMethod
+-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+-keepattributes AnnotationDefault
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
+    @retrofit2.http.* <methods>;
+}
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement*
+-dontwarn javax.annotation.**
+-dontwarn kotlin.Unit
+-dontwarn retrofit2.KotlinExtensions*
+-dontwarn retrofit2.KotlinExtensions$*
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface * extends <1>
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+-if interface * { @retrofit2.http.* public *** *(...); }
+-keep,allowoptimization,allowshrinking,allowobfuscation class <3>
+
+#-----glide
+-keep public class com.bumptech.glide.** {*;}
+-keep public class jp.co.cyberagent.** {*;}
+-dontwarn jp.co.cyberagent.android.gpuimage.**
+
+-printconfiguration tmp/full-r8-config.txt
+#---美颜模块需要暴露出来的参数名
+-keep class com.yunbao.faceunity.utils.FURenderer{
+   public static java.lang.String BUNDLE_AI_FACE;
+}
+-keep class com.yunbao.faceunity.utils.FaceUnityConfig{
+   public static java.lang.String BUNDLE_FACE_BEAUTIFICATION;
+}
+-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.** {*;}
+
+
+
+-ignorewarnings
+-keepattributes *Annotation*
+-keepattributes Exceptions
+-keepattributes InnerClasses
+-keepattributes Signature
+-keepattributes SourceFile,LineNumberTable
+-keep class com.huawei.hianalytics.**{*;}
+-keep class com.huawei.updatesdk.**{*;}
+-keep class com.huawei.hms.**{*;}
+
+-keep class com.shayu.lib_google.**{*;}
+-keep class com.shayu.lib_huawei.**{*;}

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,11 +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="com.twitter.android" />
+        <package android:name="jp.naver.line.android" />
 
     </queries>
     <application
@@ -94,31 +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"
-        android:usesCleartextTraffic="true"
         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,22 +134,10 @@
                 <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> <!-- keytool -exportcert -alias androiddebugkey -keystore feixiong.jks | openssl sha1 -binary | openssl base64 -->
-        <meta-data
-            android:name="TencentMapSDK"
-            android:value="${txMapAppKey}" />
-        <!-- 百度语音识别 -->
-        <meta-data
-            android:name="com.baidu.speech.APP_ID"
-            android:value="${baiduAppId}" />
-        <meta-data
-            android:name="com.baidu.speech.API_KEY"
-            android:value="${baiduAppKey}" />
-        <meta-data
-            android:name="com.baidu.speech.SECRET_KEY"
-            android:value="${baiduAppSecretKey}" />
+        </activity>
 
         <!-- 服务器地址 -->
         <meta-data
@@ -158,6 +150,9 @@
         <meta-data
             android:name="IS_UPLOAD_ERROR_LOG"
             android:value="${isUploadLog}" />
+        <meta-data
+            android:name="IS_PLUGIN_MODEL"
+            android:value="${isPluginModel}" />
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="${isUploadLog}" />
@@ -172,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">
@@ -196,12 +194,13 @@
                 <action android:name="com.huawei.push.action.MESSAGING_EVENT" />
             </intent-filter>
         </service>
+
         <meta-data
             android:name="com.huawei.hms.client.appid"
-            android:value="106936673"/>
+            android:value="109612651" />
         <meta-data
             android:name="com.huawei.hms.client.cpid"
-            android:value="30086000612391734"/>
+            android:value="30852000032486141" />
     </application>
 
 </manifest>

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

@@ -6,34 +6,35 @@ import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.net.http.HttpResponseCache;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.os.Process;
 import android.text.TextUtils;
 import android.util.Log;
-import android.os.Process;
 
 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;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.analytics.FirebaseAnalytics;
-import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.shayu.phonelive.utils.LogUtils;
 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;
@@ -41,9 +42,10 @@ import com.yunbao.common.manager.imrongcloud.MessageIMManager;
 import com.yunbao.common.manager.imrongcloud.RecommendLiveRoom;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.AppManager;
+import com.yunbao.common.utils.GoogleUtils;
 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;
@@ -56,7 +58,6 @@ import java.io.File;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import io.rong.imkit.config.RongConfigCenter;
@@ -80,6 +81,7 @@ public class AppContext extends CommonAppContext {
     public LiveImDeletUtil liveImDeletUtil;
     private final static List<WeakReference<Activity>> activities = new ArrayList<>();
 
+
     private static final class AdjustLifecycleCallbacks implements ActivityLifecycleCallbacks {
         @Override
         public void onActivityResumed(Activity activity) {
@@ -130,12 +132,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();
@@ -144,7 +140,6 @@ public class AppContext extends CommonAppContext {
         sInstance = this;
         L.setDeBug(BuildConfig.DEBUG);
         AppEventsLogger.activateApp(this);
-        FirebaseAnalytics.getInstance(this);
 
         File httpCacheDir = new File(getCacheDir(), "https");
         try {
@@ -159,13 +154,26 @@ public class AppContext extends CommonAppContext {
         }
         ARouter.init(this);
 
-
         //初始化 邀请码库
         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);
@@ -196,15 +204,18 @@ public class AppContext extends CommonAppContext {
                         if (content.getContent().contains("_method_")) {
                             msg.obj = content.getContent();
                             //观众页面
-                            if (SocketRyClient.mSocketHandler != null
-                                    && (TextUtils.equals("__system__", message.getTargetId())
-                                    || ("g" + PortraitLiveManager.liveID).contains(message.getTargetId()))) {
+                            if (SocketRyClient.mSocketHandler != null && (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);
                         }
@@ -214,6 +225,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);
+            }
         });
 
 
@@ -247,6 +266,7 @@ public class AppContext extends CommonAppContext {
         configSPApp();
         //初始化美颜SDK
         // FaceManager.initFaceUnity(this);
+
     }
 
     /**
@@ -283,63 +303,44 @@ public class AppContext extends CommonAppContext {
      * 注册全局异常捕获，有需要时可以在onCreate调用
      */
     private void registerError() {
-        NeverCrashUtils.getInstance()
-                .setDebugMode(BuildConfig.DEBUG)
-                .setMainCrashHandler((t, e) -> {
-                    Log.e("ApplicationError", "主线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息
-                    e.printStackTrace();
-                    AppManager.runDebugCode(()->{
-                        //闪退后finish所有Activity并且杀死进程
-                        for (WeakReference<Activity> activity : activities) {
-                            if (activity != null && activity.get() != null) {
-                                activity.get().finish();
-                            }
-                        }
-                        Process.killProcess(Process.myPid());
-                        System.exit(0);
-                        setFirebaseCrashData();
-                        new Handler(Looper.getMainLooper()).postDelayed(() -> {
-                            throw new RuntimeException(e);
-                        }, 100);
-                    });
+        NeverCrashUtils.getInstance().setDebugMode(BuildConfig.DEBUG).setMainCrashHandler((t, e) -> {
+            Log.e("ApplicationError", "主线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息
+            e.printStackTrace();
+            AppManager.runDebugCode(() -> {
+                //闪退后finish所有Activity并且杀死进程
+                for (WeakReference<Activity> activity : activities) {
+                    if (activity != null && activity.get() != null) {
+                        activity.get().finish();
+                    }
+                }
+                Process.killProcess(Process.myPid());
+                System.exit(0);
+                setFirebaseCrashData();
+                new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                    throw new RuntimeException(e);
+                }, 100);
+            });
 
-                })
-                .setUncaughtCrashHandler((t, e) -> {
-                    Log.e("ApplicationError", "子线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息
-                    e.printStackTrace();
-                })
-                .register(this);
+        }).setUncaughtCrashHandler((t, e) -> {
+            Log.e("ApplicationError", "子线程异常");//此处log只是展示，当debug为true时，主类内部log会打印异常信息
+            e.printStackTrace();
+        }).register(this);
     }
 
     public void registerFirebaseCrash() {
         if (!CommonAppConfig.IS_UPLOAD_ERROR_LOG) {
             return;
         }
-        FirebaseAnalytics.getInstance(this);
-        FirebaseApp.initializeApp(this);
+        if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
+            GoogleUtils.newInstance(this).initializeApp(this);
+        }
     }
 
 
-    private void setFirebaseCrashData() {
+    public static void setFirebaseCrashData() {
         if (!CommonAppConfig.IS_UPLOAD_ERROR_LOG) {
             return;
         }
         String uid = CommonAppConfig.getInstance().getUid();
-        FirebaseCrashlytics.getInstance().setUserId(CommonAppConfig.getInstance().getUid());
-        if (uid != null && !uid.isEmpty()) {
-            FirebaseCrashlytics.getInstance().setCustomKey("uid", uid);
-        } else {
-            FirebaseCrashlytics.getInstance().setCustomKey("uid", "uid is null");
-        }
-        FirebaseCrashlytics.getInstance().setCustomKey("userData", SpUtil.getInstance().getStringValue(SpUtil.USER_INFO));
-        FirebaseCrashlytics.getInstance().setCustomKey("isGoogle", CommonAppConfig.IS_GOOGLE_PLAY);
-        FirebaseCrashlytics.getInstance().setCustomKey("PhoneName", Build.BRAND);
-        FirebaseCrashlytics.getInstance().setCustomKey("Phone", Build.MODEL);
-        FirebaseCrashlytics.getInstance().setCustomKey("CPU", Arrays.toString(Build.SUPPORTED_ABIS));
-        FirebaseCrashlytics.getInstance().setCustomKey("RunTime", (System.currentTimeMillis() - CrashSaveBean.getInstance().getStartTime()));
-        FirebaseCrashlytics.getInstance().setCustomKey("enterRoom", CrashSaveBean.getInstance().getEnterRoom());
-        FirebaseCrashlytics.getInstance().setCustomKey("slidingRoom", CrashSaveBean.getInstance().getSlidingRoom());
-        FirebaseCrashlytics.getInstance().setCustomKey("playSvga", CrashSaveBean.getInstance().getPlaySvga());
-        FirebaseCrashlytics.getInstance().setCustomKey("ActivitySize", CrashSaveBean.getInstance().getActivitySize());
     }
 }

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

@@ -13,6 +13,7 @@ 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 +106,7 @@ public class NeverCrashUtils {
                         Log.e(TAG, "未捕获的主线程异常行为", e);
                     }
                     e.printStackTrace();
-
+                    AppContext.setFirebaseCrashData();
                     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);

app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java

@@ -1,8 +1,11 @@
 package com.shayu.phonelive.activity;
 
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -19,6 +22,8 @@ import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.app.NotificationManagerCompat;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -45,6 +50,7 @@ import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.DownloadUtil;
+import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.LogUtil;
 import com.yunbao.common.utils.MD5Util;
@@ -98,8 +104,18 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
     private int mVideoLastProgress;
     private boolean mForward;
 
+    @Override
+    public Resources getResources() {
+        Resources res = super.getResources();
+        Configuration config = new Configuration();
+        config.setToDefaults();
+        config.locale = IMLoginManager.get(this).getLocaleLanguage();
+        res.updateConfiguration(config, res.getDisplayMetrics());
+        return res;
+    }
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
         super.onCreate(savedInstanceState);
         EventBus.getDefault().register(this);
         setStatusBar();
@@ -184,6 +200,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                     String adInfo = bean.getAdInfo();
                     if (!TextUtils.isEmpty(adInfo)) {
                         JSONObject obj = JSON.parseObject(adInfo);
+                        Log.i(TAG, "callback: " + adInfo);
                         if (obj.getIntValue("switch") == 1) {
                             List<AdBean> list = JSON.parseArray(obj.getString("list"), AdBean.class);
                             if (list != null && list.size() > 0) {
@@ -212,8 +229,11 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                     } else {
                         checkUidAndToken();
                     }
+                }else{
+                    ToastUtil.show(getString(R.string.net_error));
                 }
             }
+
         });
     }
 
@@ -268,8 +288,19 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
         if (getIntent().getStringExtra("activityUrl") != null) {
             intent.putExtra("activityUrl", getIntent().getStringExtra("activityUrl"));
         }
-
-        LauncherActivity.this.startActivity(intent);
+        if (mImageViewList != null && mImageViewList.size() > 0) {
+            Log.i(TAG, "forwardMainActivity: " + mImageViewList.size());
+            AdBean bean = mAdList.get(0);
+            if (bean != null && bean.getAnimation() == 1) {
+                intent.putExtra("ad_url", mAdList.get(0).getUrl());
+                Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(LauncherActivity.this, mImageViewList.get(0), "ad_img_0").toBundle();
+                LauncherActivity.this.startActivity(intent, bundle);
+            } else {
+                LauncherActivity.this.startActivity(intent);
+            }
+        } else {
+            LauncherActivity.this.startActivity(intent);
+        }
         finish();
     }
 
@@ -361,6 +392,15 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
         mPlayer = null;
     }
 
+    @Override
+    public void onBackPressed() {
+        if (mLauncherAdViewHolder != null) {
+            mLauncherAdViewHolder.release();
+            checkUidAndToken();
+            return;
+        }
+        super.onBackPressed();
+    }
 
     /**
      * 播放广告
@@ -378,6 +418,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                     imageView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
                     imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
                     imageView.setBackgroundColor(0xffffffff);
+                    imageView.setTransitionName("ad_img_" + i);
                     mImageViewList.add(imageView);
                     ImgLoader.display(mContext, mAdList.get(i).getUrl(), imageView);
                 }
@@ -511,7 +552,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                     }
                 } else if (e == TXLiveConstants.PLAY_ERR_NET_DISCONNECT ||
                         e == TXLiveConstants.PLAY_ERR_FILE_NOT_FOUND) {
-                    ToastUtil.show(WordUtil.getString(R.string.live_play_error));
+                    ToastUtil.show(mContext.getString(R.string.live_play_error));
                     checkUidAndToken();
                 } else if (e == TXLiveConstants.PLAY_EVT_PLAY_PROGRESS) {
                     int progress = bundle.getInt("EVT_PLAY_PROGRESS_MS");

app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java

@@ -41,6 +41,7 @@ import com.yunbao.common.bean.NotificationMsgBean;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.SpUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.main.activity.MainActivity;
 
 import org.json.JSONException;
@@ -92,7 +93,7 @@ public class CustomMessageReceiver extends PushMessageReceiver {
             if (AppContext.activityWeakReference != null) {
                 Activity activity = AppContext.activityWeakReference.get();
                 if (activity != null) {
-                    DialogUitl.showSimpleDialog(activity, "应用需要通知权限", new DialogUitl.SimpleCallback() {
+                    DialogUitl.showSimpleDialog(activity, WordUtil.isNewZh()?"应用需要通知权限":"Application requires notification permission", new DialogUitl.SimpleCallback() {
                         @Override
                         public void onConfirmClick(Dialog dialog, String content) {
                             Intent intent = new Intent();

app/src/main/java/com/shayu/phonelive/utils/MyNotificationService.java

@@ -1,3 +1,4 @@
+/*
 package com.shayu.phonelive.utils;
 
 import android.app.Notification;
@@ -108,3 +109,4 @@ public class MyNotificationService extends FirebaseMessagingService {
 //    }
 
 }
+*/

beauty/src/main/java/com/yunbao/beauty/adapter/TieZhiAdapter.java

@@ -86,7 +86,7 @@ public class TieZhiAdapter extends RecyclerView.Adapter<TieZhiAdapter.Vh> {
                                         TiUtils.unzip(file, targetDir);
                                         bean.setDownloadSuccess(mContext);
                                     } catch (Exception e) {
-                                        ToastUtil.show(WordUtil.getString(R.string.tiezhi_download_failed));
+                                        ToastUtil.show(mContext.getString(R.string.tiezhi_download_failed));
                                         bean.setDownloading(false);
                                     } finally {
                                         file.delete();
@@ -103,7 +103,7 @@ public class TieZhiAdapter extends RecyclerView.Adapter<TieZhiAdapter.Vh> {
 
                             @Override
                             public void onError(Throwable e) {
-                                ToastUtil.show(WordUtil.getString(R.string.tiezhi_download_failed));
+                                ToastUtil.show(mContext.getString(R.string.tiezhi_download_failed));
                                 bean.setDownloading(false);
                                 notifyItemChanged(position, Constants.PAYLOAD);
                                 mLoadingTaskMap.remove(position);

build.gradle

@@ -11,6 +11,8 @@ 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/' }//埋点
+        maven {url 'https://developer.huawei.com/repo/'}
         google()
         mavenCentral()
     }
@@ -23,6 +25,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.alibaba:arouter-register:1.0.2"
+        classpath 'com.huawei.agconnect:agcp:1.5.2.300'
     }
 
 
@@ -41,6 +44,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
     }
 }

common/build.gradle

@@ -116,8 +116,8 @@ dependencies {
     api rootProject.ext.dependencies["ucrop"]
 
     //腾讯定位，地图sdk
-    api files('libs/TencentLocationSdk_v6.2.5.3.jar')
-    api files('libs/TencentMapSDK_1.2.8.1.jar')
+//    api files('libs/TencentLocationSdk_v6.2.5.3.jar')
+//    api files('libs/TencentMapSDK_1.2.8.1.jar')
 
     //下拉刷新上拉加载
     api rootProject.ext.dependencies["smartRefreshLayout"]
@@ -146,7 +146,11 @@ dependencies {
 
     //谷歌支付
     //谷歌内购
-    api 'com.android.billingclient:billing:5.0.0'
+    //api 'com.android.billingclient:billing:5.0.0'
+
+    //api 'com.google.firebase:firebase-messaging:23.0.6'
+    //api 'com.google.firebase:firebase-analytics:21.1.0'
+
     api 'com.squareup.picasso:picasso:2.5.2'
     api "com.immomo.cosmos.mediax:beautyutils:2.2.1_01071700"
     api files('libs/liteavsdk.jar')
@@ -174,21 +178,42 @@ dependencies {
     api 'com.squareup.retrofit2:retrofit:2.3.0'
     api 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     //gson解析
-    api 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation "io.reactivex.rxjava2:rxjava:2.2.3"
+    api 'com.squareup.retrofit2:converter-gson:2.3.0'//混淆
+    implementation "io.reactivex.rxjava2:rxjava:2.2.3"//混淆
     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.google.firebase:firebase-messaging:23.0.6'
-    api 'com.google.firebase:firebase-analytics:21.1.0'
+    api 'com.wang.avi:library:2.1.3'
+
 //    api 'com.huawei.hms:push:4.0.2.300'
     implementation 'com.github.tajchert:WaitingDots:0.6.1'
     //悬浮窗
     api 'com.github.princekin-f:EasyFloat:2.0.4'
     api files('libs/Msc.jar')
 
-    api 'com.github.li-xiaojun:XPopup:2.9.1'
+    api 'com.github.li-xiaojun:XPopup:2.10.0'
 
     api 'com.github.shenbengit:PagerGridLayoutManager:1.1.7'
+    //选择器
+    api 'com.github.gzu-liyujiang.AndroidPicker:Common:4.1.11'
+    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'
+
+    //华为支付插件包
+    //api project(':lib_huawei')
+
+    //google插件包
+    api project(':lib_google')
+
 }

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"

common/src/main/java/com/yunbao/common/CommonAppConfig.java

@@ -7,11 +7,11 @@ 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;
 import com.yunbao.common.bean.FansMedalBean;
-import com.yunbao.common.bean.LevelBean;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.bean.UserItemBean;
 import com.yunbao.common.http.CommonHttpUtil;
@@ -19,6 +19,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;
@@ -27,14 +28,15 @@ import java.util.Map;
 /**
  * Created by cxf on 2017/8/4.
  */
-
 public class CommonAppConfig {
     //域名
     public static final String HOST = getMetaDataString("SERVER_HOST");
     //是否使用谷歌支付
-    public static final boolean IS_GOOGLE_PLAY = getMetaDataBoolean("IS_GOOGLE_PLAY");
+    public static final int IS_GOOGLE_PLAY = getMetaDataInt("IS_GOOGLE_PLAY");
     //是否开启上报错误日志功能
     public static final boolean IS_UPLOAD_ERROR_LOG = getMetaDataBoolean("IS_UPLOAD_ERROR_LOG");
+    //是否为插件包模式
+    public static final boolean IS_PLUGIN_MODEL = getMetaDataBoolean("IS_PLUGIN_MODEL");
 
     //外部sd卡
     public static final String DCMI_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath();
@@ -76,8 +78,6 @@ public class CommonAppConfig {
     public static int alert_end_time = 1;
 
 
-
-
     private CommonAppConfig() {
 
     }
@@ -107,8 +107,6 @@ public class CommonAppConfig {
     private boolean mLaunched;//App是否启动了
     private String mJPushAppKey;//极光推送的AppKey
     private List<UserItemBean> mUserItemList;//个人中心功能列表
-    private SparseArray<LevelBean> mLevelMap;
-    private SparseArray<LevelBean> mAnchorLevelMap;
     private SparseArray<FansMedalBean> mAnchorFansMedalMap;
     private String mGiftListJson;
     private String mWrapListJson;
@@ -146,6 +144,7 @@ public class CommonAppConfig {
         }
         return Constants.DIAMONDS;
     }
+
     public String getGoldCoinName() {
         ConfigBean configBean = getConfig();
         if (configBean != null) {
@@ -181,12 +180,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();
     }
 
     /**
@@ -389,7 +395,6 @@ public class CommonAppConfig {
     }
 
 
-
     /**
      * 获取App图标的资源id
      */
@@ -445,9 +450,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 {
@@ -460,6 +466,18 @@ public class CommonAppConfig {
     }
 
 
+    private static int getMetaDataInt(String key) {
+        int res = 0;
+        try {
+            ApplicationInfo appInfo = CommonAppContext.sInstance.getPackageManager().getApplicationInfo(CommonAppContext.sInstance.getPackageName(), PackageManager.GET_META_DATA);
+            res = appInfo.metaData.getInt(key);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return res;
+    }
+
+
     /**
      * 个人中心功能列表
      */
@@ -499,46 +517,6 @@ public class CommonAppConfig {
     }
 
 
-    /**
-     * 保存用户等级信息
-     */
-    public void setLevel(String levelJson) {
-        if (TextUtils.isEmpty(levelJson)) {
-            return;
-        }
-        List<LevelBean> list = JSON.parseArray(levelJson, LevelBean.class);
-        if (list == null || list.size() == 0) {
-            return;
-        }
-        if (mLevelMap == null) {
-            mLevelMap = new SparseArray<>();
-        }
-        mLevelMap.clear();
-        for (LevelBean bean : list) {
-            mLevelMap.put(bean.getLevel(), bean);
-        }
-    }
-
-    /**
-     * 保存主播等级信息
-     */
-    public void setAnchorLevel(String anchorLevelJson) {
-        if (TextUtils.isEmpty(anchorLevelJson)) {
-            return;
-        }
-        List<LevelBean> list = JSON.parseArray(anchorLevelJson, LevelBean.class);
-        if (list == null || list.size() == 0) {
-            return;
-        }
-        if (mAnchorLevelMap == null) {
-            mAnchorLevelMap = new SparseArray<>();
-        }
-        mAnchorLevelMap.clear();
-        for (LevelBean bean : list) {
-            mAnchorLevelMap.put(bean.getLevel(), bean);
-        }
-    }
-
     /**
      * 保存主播粉丝徽章信息
      */
@@ -577,40 +555,6 @@ public class CommonAppConfig {
     }
 
 
-    /**
-     * 获取用户等级
-     */
-    public LevelBean getLevel(int level) {
-        if (mLevelMap == null) {
-            String configString = SpUtil.getInstance().getStringValue(SpUtil.CONFIG);
-            if (!TextUtils.isEmpty(configString)) {
-                JSONObject obj = JSON.parseObject(configString);
-                setLevel(obj.getString("level"));
-            }
-        }
-        if (mLevelMap == null || mLevelMap.size() == 0) {
-            return null;
-        }
-        return mLevelMap.get(level);
-    }
-
-    /**
-     * 获取主播等级
-     */
-    public LevelBean getAnchorLevel(int level) {
-        if (mAnchorLevelMap == null) {
-            String configString = SpUtil.getInstance().getStringValue(SpUtil.CONFIG);
-            if (!TextUtils.isEmpty(configString)) {
-                JSONObject obj = JSON.parseObject(configString);
-                setAnchorLevel(obj.getString("levelanchor"));
-            }
-        }
-        if (mAnchorLevelMap == null || mAnchorLevelMap.size() == 0) {
-            return null;
-        }
-        return mAnchorLevelMap.get(level);
-    }
-
     public String getGiftListJson() {
         return mGiftListJson;
     }
@@ -668,40 +612,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);
     }
 
 }

common/src/main/java/com/yunbao/common/CommonAppContext.java

@@ -55,11 +55,11 @@ public class CommonAppContext extends MultiDexApplication {
 //        RongPushClient.setPushConfig(config); //将推送相关配置设置到 SDK
         //设置新加坡融云服务器 有时候国内收不到推送是因为这个
         RongIMClient.setServerInfo("navsg01.cn.ronghub.com", null);
-        //谷歌推送
-        PushConfig gconfig = new PushConfig.Builder()
-                .enableFCM(true)
-                .build();
-        RongPushClient.setPushConfig(gconfig);
+        if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
+            //谷歌推送
+            PushConfig gconfig = new PushConfig.Builder().enableFCM(true).build();
+            RongPushClient.setPushConfig(gconfig);
+        }
         //初始化友盟统计
 //        UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, null);
         FacebookSdk.sdkInitialize(getApplicationContext());
@@ -86,6 +86,9 @@ public class CommonAppContext extends MultiDexApplication {
     }
 
     public static Activity getTopActivity() {
+        if (activityWeakReference == null) {
+            return null;
+        }
         return activityWeakReference.get();
     }
 

common/src/main/java/com/yunbao/common/Constants.java

@@ -179,6 +179,13 @@ public class Constants {
     public static final String CUSTOM_FULL_SERVICE_NOTIFY = "customFullServiceNotify";//全服通知
     public static final String XYD_COMPLETE = "XydComplete";//心愿单完成通知
     public static final String WISH_LIST_PROGRESS = "wishListProgress";//心愿单进度通知
+    public static final String LIVE_VOTE_CREATE = "createVote";
+    public static final String LIVE_VOTE_UPDATE = "updateVote";
+    public static final String LIVE_VOTE_END = "endVote";
+    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";//炸金花
@@ -256,6 +263,8 @@ public class Constants {
 
     public static final String LIVE_SDK = "liveSdk";
     public static final String LIVE_KSY_CONFIG = "liveKsyConfig";
+
+    public static final String LIVE_PK_RANDOM_START="RankingStartRandomPK";
     public static final int LIVE_SDK_KSY = 0;//金山推流
     public static final int LIVE_SDK_TX = 1;//腾讯推流
 

common/src/main/java/com/yunbao/common/HtmlConfig.java

@@ -8,7 +8,7 @@ public class HtmlConfig {
 
     //登录即代表同意服务和隐私条款
     public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3";
-    public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/portal/page/index/id/59";
+    public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=59";
 
     //注册用户协议
     public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2";

common/src/main/java/com/yunbao/common/activity/AbsActivity.java

@@ -24,9 +24,11 @@ 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;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.ClickUtil;
 
 import java.util.ArrayList;
@@ -48,6 +50,7 @@ public abstract class AbsActivity extends AppCompatActivity {
         Resources res = super.getResources();
         Configuration config = new Configuration();
         config.setToDefaults();
+        config.locale = IMLoginManager.get(this).getLocaleLanguage();
         res.updateConfiguration(config, res.getDisplayMetrics());
         return res;
     }
@@ -55,6 +58,7 @@ public abstract class AbsActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        create();
         Intent intent = getIntent();
         if (intent != null) {
             isFullWindow = getIntent().getBooleanExtra("isFull", false);
@@ -86,6 +90,9 @@ public abstract class AbsActivity extends AppCompatActivity {
 
     protected void main() {
 
+    }
+    protected void create(){
+
     }
 
     protected boolean isStatusBarWhite() {
@@ -172,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();
@@ -370,4 +381,5 @@ public abstract class AbsActivity extends AppCompatActivity {
                 break;
         }
     }
+
 }

common/src/main/java/com/yunbao/common/activity/ErrorActivity.java

@@ -60,6 +60,6 @@ public class ErrorActivity extends AbsActivity {
         ClipboardManager clipboardManager = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
         ClipData clipData = ClipData.newPlainText("text", mErrorInfo);
         clipboardManager.setPrimaryClip(clipData);
-        ToastUtil.show(WordUtil.getString(R.string.copy_success));
+        ToastUtil.show(mContext.getString(R.string.copy_success));
     }
 }

common/src/main/java/com/yunbao/common/activity/SudGameActivity.java

@@ -0,0 +1,214 @@
+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.lxj.xpopup.XPopup;
+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.bean.CustomSidebarChildModel;
+import com.yunbao.common.bean.CustomSidebarInfoModel;
+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.LiveSudGameHistoryPopup;
+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 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();
+        initDate();
+    }
+    private List<CustomSidebarChildModel> customSidebarChildModels = new ArrayList<>();
+    private void initDate() {
+        LiveNetManager.get(mContext)
+                .getCustomSidebarInfo("1", new HttpCallback<List<CustomSidebarInfoModel>>() {
+                    @Override
+                    public void onSuccess(List<CustomSidebarInfoModel> data) {
+                        for (CustomSidebarInfoModel datum : data) {
+                            if (datum.getType().equals("6")) {
+                                customSidebarChildModels = datum.getChild();
+                                return;
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onError(String error) {
+
+                    }
+                });
+    }
+    @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();
+            }
+        });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.sud_history), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+
+                new XPopup.Builder(mContext)
+                        .enableDrag(false)
+                        .asCustom(new LiveSudGameHistoryPopup(mContext, customSidebarChildModels)).show();
+            }
+        });
+        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_game_setting.hide = true; // 配置不隐藏ping值
+
+        gameConfigModel.ui.lobby_players.custom = true;
+        gameConfigModel.ui.join_btn.custom = true;
+        gameConfigModel.ui.game_settle_again_btn.custom = true;
+        gameConfigModel.ui.start_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) {
+        switch (event.getSudMGPMGState()) {
+            case SudMGPMGState.MG_COMMON_SELF_CLICK_JOIN_BTN:
+            case SudMGPMGState.MG_COMMON_SELF_CLICK_GAME_SETTLE_AGAIN_BTN:
+                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("Shortage of money");
+                            }
+
+                        }
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        if (IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+                            ToastUtil.show("貨幣数量不足 ");
+                        } else {
+                            ToastUtil.show("Shortage of money");
+                        }
+                    }
+                });
+                break;
+            case SudMGPMGState.MG_COMMON_GAME_SETTLE:
+                gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfIn(false, event.getSeatIndex(), true, 1);
+                break;
+            case SudMGPMGState.MG_COMMON_SELF_CLICK_START_BTN:
+                LiveNetManager.get(mContext).gameStartCheckRemainingBalance(mCreateSudRoomModel.getSudGameId(),
+                        mCreateSudRoomModel.getSudGameRoomId(), new
+                                HttpCallback<CheckRemainingBalance>() {
+                                    @Override
+                                    public void onSuccess(CheckRemainingBalance data) {
+                                        if (data.getStatus()==1){
+                                            gameViewModel.sudFSTAPPDecorator.notifyAPPCommonSelfPlaying(true);
+                                        }else {
+
+                                        }
+
+                                    }
+
+                                    @Override
+                                    public void onError(String error) {
+                                        ToastUtil.show(error);
+                                    }
+                                });
+                break;
+            case SudMGPMGState.MG_COMMON_GAME_STATE:
+                LiveNetManager.get(mContext).deductMoney( mCreateSudRoomModel.getSudGameRoomId());
+                break;
+        }
+
+    }
+
+}

common/src/main/java/com/yunbao/common/activity/WebViewActivity.java

@@ -1,11 +1,13 @@
 package com.yunbao.common.activity;
 
+import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 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;
@@ -22,22 +24,40 @@ 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;
 import com.yunbao.common.utils.AndroidBug5497Workaround;
+import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.Bus;
 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;
 
+import java.util.Locale;
+import java.util.Stack;
+
 /**
  * Created by cxf on 2018/9/25.
  */
@@ -71,7 +91,6 @@ public class WebViewActivity extends AbsActivity {
         ft_title = (FrameLayout) findViewById(R.id.ft_title);
         v_spacing = (View) findViewById(R.id.v_spacing);
         mWebView = findViewById(R.id.webView);
-        AndroidBug5497Workaround.assistActivity(this);
 
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
         params.topMargin = DpUtil.dp2px(1);
@@ -94,11 +113,18 @@ 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()");
                 }
                 //真实屏幕高度-(ft_title的高度+导航栏高度)
+                //屏蔽掉是因为在线客服页面 AndroidBug5497Workaround会失效
                 int height = DeviceUtils.getScreenRealHeight(mContext) - DpUtil.dp2px(72) - getCurrentNavigationBarHeight(mContext);
                 if (!navigationGestureEnabled(mContext)) {
                     view.loadUrl("javascript:window.androidObject.setHeight(" + height + ",0,false)");
@@ -151,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); // 允许访问文件
@@ -160,6 +186,7 @@ public class WebViewActivity extends AbsActivity {
             mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
         mWebView.loadUrl(url);
+        AndroidBug5497Workaround.assistActivity(this);
 
         if (Constants.myIntoIndex == 2) {
             ft_title.setVisibility(View.GONE);
@@ -186,7 +213,7 @@ public class WebViewActivity extends AbsActivity {
             intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
         }
         intent.setType("image/*");
-        startActivityForResult(Intent.createChooser(intent, WordUtil.getString(R.string.choose_flie)), CHOOSE);
+        startActivityForResult(Intent.createChooser(intent, mContext.getString(R.string.choose_flie)), CHOOSE);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -229,21 +256,25 @@ 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);
-        intent.putExtra(Constants.URL, url);
+        intent.putExtra(Constants.URL, url + "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
         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
     protected void onDestroy() {
         if (mWebView != null) {
@@ -307,6 +338,7 @@ public class WebViewActivity extends AbsActivity {
         if (Constants.isShowPage != -1) {
             finish();
         }
+
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -322,6 +354,100 @@ public class WebViewActivity extends AbsActivity {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
+        } else if (TextUtils.equals(event.getMethod(), "clickLogOffAccount")) {
+            new XPopup.Builder(mContext)
+                    .asCustom(new HintCustomPopup(mContext,
+                            mContext.getString(R.string.delete_account1),
+                            mContext.getString(R.string.delete_account2))
+                            .setLiveOpenOk(mContext.getString(R.string.delete_account3))
+                            .setLiveOpenCancel(mContext.getString(R.string.cancel))
+                            .setCallBack(new HintCustomPopup.HintCustomCallBack() {
+                                @Override
+                                public void onSure() {
+                                    LiveNetManager.get(mContext).
+                                            setLogOff(new HttpCallback<String>() {
+                                                @Override
+                                                public void onSuccess(String data) {
+                                                    Stack<Activity> allActivityStacks = AppManager.getInstance().getAllActivityStacks();
+                                                    for (int i = 0; i < allActivityStacks.size(); i++) {
+                                                        if (!(allActivityStacks.get(i) instanceof WebViewActivity)) {
+                                                            allActivityStacks.get(i).finish();
+                                                        }
+                                                    }
+                                                    IMLoginManager.get(mContext).logout(mContext);
+                                                    CommonAppConfig.getInstance().clearLoginInfo();
+                                                    mContext.finish();
+                                                    RouteUtil.forwardLoginActivity();
+
+                                                }
+
+                                                @Override
+                                                public void onError(String error) {
+
+                                                }
+                                            });
+                                }
+
+                                @Override
+                                public void onCancel() {
+
+                                }
+                            }))
+                    .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();
+    }
+
+
 }

common/src/main/java/com/yunbao/common/adapter/AchievementDetailsAdapter.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.UserMedalModel;
+import com.yunbao.common.views.AchievementDetailsViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AchievementDetailsAdapter extends RecyclerView.Adapter {
+    private List<UserMedalModel> dressInfo = new ArrayList<>();
+
+    public AchievementDetailsAdapter(List<UserMedalModel> dressInfo) {
+        this.dressInfo = dressInfo;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_achievement_details, parent, false);
+        return new AchievementDetailsViewHolder(herdView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        AchievementDetailsViewHolder achievementDetailsViewHolder = (AchievementDetailsViewHolder) holder;
+        achievementDetailsViewHolder.showData(dressInfo.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return dressInfo.size();
+    }
+}

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();
+    }
+}

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

@@ -41,7 +41,7 @@ public class ChatChargeCoinAdapter extends RecyclerView.Adapter<ChatChargeCoinAd
         mList = list;
         mCoinName = CommonAppConfig.getInstance().getCoinName();
         mGoldCoinName = CommonAppConfig.getInstance().getGoldCoinName();
-        mGiveString = WordUtil.getString(R.string.coin_give);
+        mGiveString = context.getString(R.string.coin_give);
         mOnClickListener = new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -19,11 +19,14 @@ 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;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 新侧边栏适配器
@@ -72,9 +75,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 +98,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;
@@ -101,9 +110,13 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter {
             recommendViewHolder.setListener(new RecommendViewHolder.RecommendViewListener() {
                 @Override
                 public void changeOneBatch() {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("num", "9");
+                    map.put("live_recommend", "sidebar");
+                    map.put("refresh", "1");
                     //推荐位
                     MainNetManager.get((Activity) mContext)
-                            .anchorRecommend("9", new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {
+                            .anchorRecommend(map, new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {
                                 @Override
                                 public void onSuccess(AnchorRecommendModel anchorRecommendModel) {
 
@@ -122,7 +135,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));
                                 }
                             });
                 }

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

@@ -1,6 +1,7 @@
 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;
@@ -48,12 +49,22 @@ public class DrawerTaskAdapter extends RecyclerView.Adapter {
 
     @Override
     public int getItemCount() {
-        return 2;
+        if (child.size()>3){
+            return 3;
+        }else {
+            return child.size();
+        }
+
     }
 
     public void updateData(List<CustomSidebarChildModel> mChild) {
         child.clear();
         child.addAll(mChild);
+//        for (CustomSidebarChildModel childModel : mChild) {
+//            if (TextUtils.equals("1", childModel.getIsShow())) {
+//                child.add(childModel);
+//            }
+//        }
         notifyDataSetChanged();
     }
 }

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

@@ -0,0 +1,48 @@
+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.GiftWallModel;
+import com.yunbao.common.views.GiftAlreadyWallViewHolder;
+
+import java.util.ArrayList;
+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
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_gift_already_wall, parent, false);
+        return new GiftAlreadyWallViewHolder(herdView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        GiftAlreadyWallViewHolder withoutWallViewHolder = (GiftAlreadyWallViewHolder) holder;
+        withoutWallViewHolder.showData(giftWall.get(position), sbWy);
+    }
+
+    @Override
+    public int getItemCount() {
+        return giftWall.size();
+    }
+
+    public void addAllData(List<GiftWallModel> mGiftWall) {
+        giftWall.clear();
+        giftWall.addAll(mGiftWall);
+        notifyDataSetChanged();
+    }
+}

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

@@ -0,0 +1,40 @@
+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.GiftQuantityModel;
+import com.yunbao.common.views.GiftNumber;
+
+import java.util.List;
+
+public class GiftNumberAdapter extends RecyclerView.Adapter {
+    private List<GiftQuantityModel> giftQuantityModels;
+
+    public GiftNumberAdapter(List<GiftQuantityModel> giftQuantityModels) {
+        this.giftQuantityModels = giftQuantityModels;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View robotSayHelloView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_gift_number, parent, false);
+        return new GiftNumber(robotSayHelloView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        GiftNumber giftNumber = (GiftNumber) holder;
+        giftNumber.showData(giftQuantityModels.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return giftQuantityModels.size();
+    }
+}

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

@@ -0,0 +1,43 @@
+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.GiftWallModel;
+import com.yunbao.common.views.GiftWithoutWallViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GiftWithoutWallAdapter extends RecyclerView.Adapter {
+    private List<GiftWallModel> giftWall = new ArrayList<>();
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_gift_without_wall, parent, false);
+        return new GiftWithoutWallViewHolder(herdView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        GiftWithoutWallViewHolder withoutWallViewHolder = (GiftWithoutWallViewHolder) holder;
+        withoutWallViewHolder.showData(giftWall.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return giftWall.size();
+    }
+
+    public void addAllData(List<GiftWallModel> mGiftWall) {
+        giftWall.clear();
+        giftWall.addAll(mGiftWall);
+        notifyDataSetChanged();
+    }
+}

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();
+    }
+}

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();
+    }
+}

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();
+    }
+}

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);
+    }
+}

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();
     }
 

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

@@ -0,0 +1,30 @@
+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.GameRecordModel;
+import com.yunbao.common.views.LiveSudGameHistoryViewHolder;
+
+public class LiveSudGameHistoryAdapter extends RefreshAdapter<GameRecordModel> {
+
+    public LiveSudGameHistoryAdapter(Context context) {
+        super(context);
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new LiveSudGameHistoryViewHolder(mInflater.inflate(R.layout.item_live_sud_game_history, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        LiveSudGameHistoryViewHolder sudGameListViewHolder = (LiveSudGameHistoryViewHolder) holder;
+        sudGameListViewHolder.setData(mList.get(position));
+    }
+}

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

@@ -0,0 +1,44 @@
+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.UserMedalListModel;
+import com.yunbao.common.views.MedalAchievementViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MedalAchievementAdapter extends RecyclerView.Adapter {
+    private List<UserMedalListModel> medalData = new ArrayList<>();
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_medal_achievement, parent, false);
+        return new MedalAchievementViewHolder(herdView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        MedalAchievementViewHolder achievementViewHolder = (MedalAchievementViewHolder) holder;
+        achievementViewHolder.showData(medalData.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return medalData.size();
+    }
+
+    public void addAllData(List<UserMedalListModel> mGiftWall) {
+
+        medalData.clear();
+        medalData.addAll(mGiftWall);
+        notifyDataSetChanged();
+    }
+}

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

@@ -0,0 +1,43 @@
+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.GiftWallModel;
+import com.yunbao.common.views.MonthGiftNamingViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MonthGiftNamingAdapter extends RecyclerView.Adapter {
+    private List<GiftWallModel> giftWall = new ArrayList<>();
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_month_gift_naming, parent, false);
+        return new MonthGiftNamingViewHolder(herdView);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        MonthGiftNamingViewHolder monthGiftNamingViewHolder = (MonthGiftNamingViewHolder) holder;
+        monthGiftNamingViewHolder.showData(giftWall.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return giftWall.size();
+    }
+
+    public void addAllData(List<GiftWallModel> mGiftWall) {
+        giftWall.clear();
+        giftWall.addAll(mGiftWall);
+        notifyDataSetChanged();
+    }
+}

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();
+    }
+}

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);
+    }
+}

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);
+                }
+            });
+        }
+    }
+}

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);
+        }
+    }
+}

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();
+    }
+
+}

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);
+    }
+}

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;
     }
 }

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

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 public class AdBean {
     private String mUrl;
     private String mLink;
+    private int animation;//是否使用过度动画
 
     @JSONField(name = "thumb")
     public String getUrl() {
@@ -26,4 +27,12 @@ public class AdBean {
     public void setLink(String link) {
         mLink = link;
     }
+    @JSONField(name = "animation")
+    public int getAnimation() {
+        return animation;
+    }
+    @JSONField(name = "animation")
+    public void setAnimation(int animation) {
+        this.animation = animation;
+    }
 }

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

@@ -17,6 +17,8 @@ public class AnchorRecommendModel extends BaseModel {
     //是否展示0=不展示1=展示
     @SerializedName("list_show")
     private int listShow = 0;
+    @SerializedName("red_packet_show")
+    private int showRedPacket = 0;//是否显示首页红包浮窗
     //是否支持换一批0=不支持 1=支持
     @SerializedName("up_show")
     private int upShow = 0;
@@ -24,6 +26,10 @@ public class AnchorRecommendModel extends BaseModel {
     private List<AnchorRecommendItemModel> list = new ArrayList<>();
     @SerializedName("slide")
     private List<SlideInfoModel> slide = new ArrayList<>();
+    @SerializedName("red_packet_total")
+    private int redPacketTotal = 100;
+    @SerializedName("red_packet_day_create_num")
+    private int redPacketNum = 0;
 
     public List<SlideInfoModel> getSlide() {
         return slide;
@@ -52,6 +58,30 @@ public class AnchorRecommendModel extends BaseModel {
         return this;
     }
 
+    public int getShowRedPacket() {
+        return showRedPacket;
+    }
+
+    public void setShowRedPacket(int showRedPacket) {
+        this.showRedPacket = showRedPacket;
+    }
+
+    public int getRedPacketTotal() {
+        return redPacketTotal;
+    }
+
+    public void setRedPacketTotal(int redPacketTotal) {
+        this.redPacketTotal = redPacketTotal;
+    }
+
+    public int getRedPacketNum() {
+        return redPacketNum;
+    }
+
+    public void setRedPacketNum(int redPacketNum) {
+        this.redPacketNum = redPacketNum;
+    }
+
     public List<AnchorRecommendItemModel> getList() {
         return list;
     }

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;
+    }
+}

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

@@ -0,0 +1,175 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class BattlePassPoints extends BaseModel{
+    private int id;
+    private int type;
+    @SerializedName("rewards_name")
+    private String rewardsName;
+    @SerializedName("rewards_id")
+    private int rewardsId;
+    @SerializedName("image_url")
+    private String imageUrl;
+    @SerializedName("points_threshold")
+    private String pointsThreshold;
+    @SerializedName("points_threshold_text")
+    private String pointsThresholdText;
+    @SerializedName("rewards_value")
+    private String rewardsValue;
+    @SerializedName("battle_pass_level")
+    private int battlePassLevel;
+    @SerializedName("exchange_quantity")
+    private int exchangeQuantity;
+    @SerializedName("live_battle_pass_type_id")
+    private int liveBattlePassTypeId;
+    private String description;
+    @SerializedName("restrict_time")
+    private int restrictTime;
+    private int sort;
+    @SerializedName("exchange_status")
+    private int exchangeStatus;
+    @SerializedName("user_quinty_count")
+    private int userQuintyCount;
+    @SerializedName("exchange_status_remark")
+    private String exchangeMark;
+
+    public BattlePassPoints() {
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getRewardsName() {
+        return rewardsName;
+    }
+
+    public void setRewardsName(String rewardsName) {
+        this.rewardsName = rewardsName;
+    }
+
+    public int getRewardsId() {
+        return rewardsId;
+    }
+
+    public void setRewardsId(int rewardsId) {
+        this.rewardsId = rewardsId;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public String getPointsThreshold() {
+        return pointsThreshold;
+    }
+
+    public void setPointsThreshold(String pointsThreshold) {
+        this.pointsThreshold = pointsThreshold;
+    }
+
+    public String getRewardsValue() {
+        return rewardsValue;
+    }
+
+    public void setRewardsValue(String rewardsValue) {
+        this.rewardsValue = rewardsValue;
+    }
+
+    public int getBattlePassLevel() {
+        return battlePassLevel;
+    }
+
+    public void setBattlePassLevel(int battlePassLevel) {
+        this.battlePassLevel = battlePassLevel;
+    }
+
+    public int getExchangeQuantity() {
+        return exchangeQuantity;
+    }
+
+    public void setExchangeQuantity(int exchangeQuantity) {
+        this.exchangeQuantity = exchangeQuantity;
+    }
+
+    public int getLiveBattlePassTypeId() {
+        return liveBattlePassTypeId;
+    }
+
+    public void setLiveBattlePassTypeId(int liveBattlePassTypeId) {
+        this.liveBattlePassTypeId = liveBattlePassTypeId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public int getRestrictTime() {
+        return restrictTime;
+    }
+
+    public void setRestrictTime(int restrictTime) {
+        this.restrictTime = restrictTime;
+    }
+
+    public int getSort() {
+        return sort;
+    }
+
+    public void setSort(int sort) {
+        this.sort = sort;
+    }
+
+    public int getExchangeStatus() {
+        return exchangeStatus;
+    }
+
+    public void setExchangeStatus(int exchangeStatus) {
+        this.exchangeStatus = exchangeStatus;
+    }
+
+    public int getUserQuintyCount() {
+        return userQuintyCount;
+    }
+
+    public void setUserQuintyCount(int userQuintyCount) {
+        this.userQuintyCount = userQuintyCount;
+    }
+
+    public String getExchangeMark() {
+        return exchangeMark;
+    }
+
+    public void setExchangeMark(String exchangeMark) {
+        this.exchangeMark = exchangeMark;
+    }
+
+    public String getPointsThresholdText() {
+        return pointsThresholdText;
+    }
+
+    public void setPointsThresholdText(String pointsThresholdText) {
+        this.pointsThresholdText = pointsThresholdText;
+    }
+}

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

@@ -0,0 +1,157 @@
+package com.yunbao.common.bean;
+
+import android.content.Context;
+
+import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.utils.WordUtil;
+
+import java.util.List;
+
+public class BattlePassTask extends BaseModel {
+    private List<Task> daily;// 每日任务
+    private List<Task> season;// 每期任务
+
+    public BattlePassTask() {
+    }
+
+    public List<Task> getDaily() {
+        return daily;
+    }
+
+    public void setDaily(List<Task> daily) {
+        this.daily = daily;
+    }
+
+    public List<Task> getSeason() {
+        return season;
+    }
+
+    public void setSeason(List<Task> season) {
+        this.season = season;
+    }
+
+    public static class Task {
+        private int id;// 任务ID
+        private String type;// 任务类型
+        @SerializedName("task_success")
+        private int taskSuccess;// 任务可以重复的次数
+        @SerializedName("name_en")
+        private String nameEn;// 任务名称英文
+        @SerializedName("remark_en")
+        private String remarkEn;// 任务备注英文
+        private String name;// 任务名称中文
+        private String remark; // 任务备注中文
+        @SerializedName("image_path")
+        private String imagePath;// 图标path
+        @SerializedName("user_task_success")
+        private int userTaskSuccess;// 用户完成的任务次数
+        @SerializedName("received_task")
+        private int receivedTask;// 用户已经领取的任务数量
+        @SerializedName("not_received_task")
+        private int notReceivedTask; // 用户未领取的任务数量
+        public boolean isBuy(){
+            return taskSuccess==0;
+        }
+        public String getNameText(){
+            return WordUtil.isNewZh()?name:nameEn;
+        }
+        public String getRemarkText(){
+            return WordUtil.isNewZh()?remark:remarkEn;
+        }
+
+        public Task() {
+        }
+
+        public Task(int id) {
+            this.id = id;
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public int getTaskSuccess() {
+            return taskSuccess;
+        }
+
+        public void setTaskSuccess(int taskSuccess) {
+            this.taskSuccess = taskSuccess;
+        }
+
+        public String getNameEn() {
+            return nameEn;
+        }
+
+        public void setNameEn(String nameEn) {
+            this.nameEn = nameEn;
+        }
+
+        public String getRemarkEn() {
+            return remarkEn;
+        }
+
+        public void setRemarkEn(String remarkEn) {
+            this.remarkEn = remarkEn;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
+
+        public String getImagePath() {
+            return imagePath;
+        }
+
+        public void setImagePath(String imagePath) {
+            this.imagePath = imagePath;
+        }
+
+        public int getUserTaskSuccess() {
+            return userTaskSuccess;
+        }
+
+        public void setUserTaskSuccess(int userTaskSuccess) {
+            this.userTaskSuccess = userTaskSuccess;
+        }
+
+        public int getReceivedTask() {
+            return receivedTask;
+        }
+
+        public void setReceivedTask(int receivedTask) {
+            this.receivedTask = receivedTask;
+        }
+
+        public int getNotReceivedTask() {
+            return notReceivedTask;
+        }
+
+        public void setNotReceivedTask(int notReceivedTask) {
+            this.notReceivedTask = notReceivedTask;
+        }
+    }
+}

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

@@ -0,0 +1,176 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class BattlePassUserInfoBean extends BaseModel{
+    private String uid;
+    private int points;
+    @SerializedName("battle_pass_exp")
+    private int battlePassExp;
+    @SerializedName("battle_pass_user_records_1")
+    private int battlePassUserRecords1;
+    @SerializedName("battle_pass_user_records_2")
+    private int battlePassUserRecords2;
+    @SerializedName("battle_pass_user_records_3")
+    private int battlePassUserRecords3;
+    private int level;
+    @SerializedName("last_level_exp")
+    private int lastLevelExp;
+    @SerializedName("next_level_exp")
+    private int nextLevelExp;
+    private String id;
+    @SerializedName("battle_pass_name")
+    private String battlePassName;
+    @SerializedName("start_time")
+    private String startTime;
+    @SerializedName("end_time")
+    private String endTime;
+    @SerializedName("battle_pass_status")
+    private boolean battlePassStatus;
+    @SerializedName("max_level_exp")
+    private long maxLevelExp;
+    @SerializedName("max_level")
+    private  int maxLevel;
+
+    private List<LiveBattlePassRewardsBean.BattlePassType> live_battle_pass_type;
+
+    public BattlePassUserInfoBean() {
+    }
+    public List<LiveBattlePassRewardsBean.BattlePassType> getLive_battle_pass_type() {
+        return live_battle_pass_type;
+    }
+
+    public void setLive_battle_pass_type(List<LiveBattlePassRewardsBean.BattlePassType> live_battle_pass_type) {
+        this.live_battle_pass_type = live_battle_pass_type;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public int getPoints() {
+        return points;
+    }
+
+    public void setPoints(int points) {
+        this.points = points;
+    }
+
+    public int getBattlePassExp() {
+        return battlePassExp;
+    }
+
+    public void setBattlePassExp(int battlePassExp) {
+        this.battlePassExp = battlePassExp;
+    }
+
+    public int getBattlePassUserRecords1() {
+        return battlePassUserRecords1;
+    }
+
+    public void setBattlePassUserRecords1(int battlePassUserRecords1) {
+        this.battlePassUserRecords1 = battlePassUserRecords1;
+    }
+
+    public int getBattlePassUserRecords2() {
+        return battlePassUserRecords2;
+    }
+
+    public void setBattlePassUserRecords2(int battlePassUserRecords2) {
+        this.battlePassUserRecords2 = battlePassUserRecords2;
+    }
+
+    public int getBattlePassUserRecords3() {
+        return battlePassUserRecords3;
+    }
+
+    public void setBattlePassUserRecords3(int battlePassUserRecords3) {
+        this.battlePassUserRecords3 = battlePassUserRecords3;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public int getLastLevelExp() {
+        return lastLevelExp;
+    }
+
+    public void setLastLevelExp(int lastLevelExp) {
+        this.lastLevelExp = lastLevelExp;
+    }
+
+    public int getNextLevelExp() {
+        return nextLevelExp;
+    }
+
+    public void setNextLevelExp(int nextLevelExp) {
+        this.nextLevelExp = nextLevelExp;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getBattlePassName() {
+        return battlePassName;
+    }
+
+    public void setBattlePassName(String battlePassName) {
+        this.battlePassName = battlePassName;
+    }
+
+    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 boolean isBattlePassStatus() {
+        return battlePassStatus;
+    }
+
+    public void setBattlePassStatus(boolean battlePassStatus) {
+        this.battlePassStatus = battlePassStatus;
+    }
+
+    public long getMaxLevelExp() {
+        return maxLevelExp;
+    }
+
+    public void setMaxLevelExp(long maxLevelExp) {
+        this.maxLevelExp = maxLevelExp;
+    }
+
+    public int getMaxLevel() {
+        return maxLevel;
+    }
+
+    public void setMaxLevel(int maxLevel) {
+        this.maxLevel = maxLevel;
+    }
+}

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

@@ -0,0 +1,99 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class BlindBoxInfoModel extends BaseModel {
+    /**
+     * "info":[{"item_name":["麒麟勛章饰品","麒麟頭像框饰品","麒麟坐騎饰品","水晶项链礼物","夢幻水晶球礼物","心動泡泡礼物","蝴蝶少女礼物","金色唱片礼物","鑽石禮盒礼物","紙花船礼物"],"threshold_value":268,"threshold_dress_name":"麒麟坐騎","dress_threshold_value":0,"blind_box_type":1,"blind_box_id":1636},{"item_name":["金鳳勛章饰品","金鳳頭像框饰品","金鳳坐騎饰品","浪漫氣球礼物","捕夢網礼物","仙女棒礼物","藍寶石鈴鐺礼物","榮耀星礼物","童話屋礼物","夢幻許願池礼物"],"threshold_value":198,"threshold_dress_name":"金鳳坐騎","dress_threshold_value":0,"blind_box_type":2,"blind_box_id":1637},{"item_name":["神龍勛章饰品","神龍頭像框饰品","神龍坐騎饰品","水晶玫瑰礼物","sweet香水礼物","甜蜜熱氣球礼物","風鈴舞動礼物","音樂噴泉礼物","星空列車礼物","漂洋過海來看你礼物"],"threshold_value":128,"threshold_dress_name":"神龍坐騎","dress_threshold_value":0,"blind_box_type":3,"blind_box_id":1638}]
+     */
+    @SerializedName("item_name")
+    private List<String> itemName;
+    @SerializedName("threshold_value")
+    private String thresholdValue = "0";
+    @SerializedName("threshold_dress_name")
+    private String thresholdDressName;
+    @SerializedName("dress_threshold_value")
+    private String dressThresholdValue;
+    @SerializedName("blind_box_type")
+    private String blindBoxType;
+    @SerializedName("blind_box_id")
+    private String blindBoxId;
+    @SerializedName("blind_box_swf")
+    private String blindBoxSwf;
+    @SerializedName("threshold_effect_src")
+    private String thresholdEffectSrc;
+
+    public String getThresholdEffectSrc() {
+        return thresholdEffectSrc;
+    }
+
+    public BlindBoxInfoModel setThresholdEffectSrc(String thresholdEffectSrc) {
+        this.thresholdEffectSrc = thresholdEffectSrc;
+        return this;
+    }
+
+    public String getBlindBoxSwf() {
+        return blindBoxSwf;
+    }
+
+    public BlindBoxInfoModel setBlindBoxSwf(String blindBoxSwf) {
+        this.blindBoxSwf = blindBoxSwf;
+        return this;
+    }
+
+    public List<String> getItemName() {
+        return itemName;
+    }
+
+    public BlindBoxInfoModel setItemName(List<String> itemName) {
+        this.itemName = itemName;
+        return this;
+    }
+
+    public String getThresholdValue() {
+        return thresholdValue;
+    }
+
+    public BlindBoxInfoModel setThresholdValue(String thresholdValue) {
+        this.thresholdValue = thresholdValue;
+        return this;
+    }
+
+    public String getThresholdDressName() {
+        return thresholdDressName;
+    }
+
+    public BlindBoxInfoModel setThresholdDressName(String thresholdDressName) {
+        this.thresholdDressName = thresholdDressName;
+        return this;
+    }
+
+    public String getDressThresholdValue() {
+        return dressThresholdValue;
+    }
+
+    public BlindBoxInfoModel setDressThresholdValue(String dressThresholdValue) {
+        this.dressThresholdValue = dressThresholdValue;
+        return this;
+    }
+
+    public String getBlindBoxType() {
+        return blindBoxType;
+    }
+
+    public BlindBoxInfoModel setBlindBoxType(String blindBoxType) {
+        this.blindBoxType = blindBoxType;
+        return this;
+    }
+
+    public String getBlindBoxId() {
+        return blindBoxId;
+    }
+
+    public BlindBoxInfoModel setBlindBoxId(String blindBoxId) {
+        this.blindBoxId = blindBoxId;
+        return this;
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class CheckRemainingBalance extends BaseModel {
+
+    @SerializedName("golden_bean_remaining_balance")
+    private int goldenBeanRemainingBalance;
+    @SerializedName("status")
+    private int status;
+    @SerializedName("deduct_money_key")
+    private String deductMoneyKey;
+
+    public String getDeductMoneyKey() {
+        return deductMoneyKey;
+    }
+
+    public CheckRemainingBalance setDeductMoneyKey(String deductMoneyKey) {
+        this.deductMoneyKey = deductMoneyKey;
+        return this;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public CheckRemainingBalance setStatus(int status) {
+        this.status = status;
+        return this;
+    }
+
+    public int getGoldenBeanRemainingBalance() {
+        return goldenBeanRemainingBalance;
+    }
+
+    public void setGoldenBeanRemainingBalance(int goldenBeanRemainingBalance) {
+        this.goldenBeanRemainingBalance = goldenBeanRemainingBalance;
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.yunbao.common.bean;
+
+public class CoolConfig extends BaseModel {
+    private int rate=1;
+    private String ticketCount="0" ;
+
+    public String getTicketCount() {
+        return ticketCount;
+    }
+
+    public CoolConfig setTicketCount(String ticketCount) {
+        this.ticketCount = ticketCount;
+        return this;
+    }
+
+    public int getRate() {
+        return rate;
+    }
+
+    public CoolConfig setRate(int rate) {
+        this.rate = rate;
+        return this;
+    }
+}

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

@@ -0,0 +1,164 @@
+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() {
+        try {
+            if (TextUtils.isEmpty(sudGameId)) {
+                return 0;
+            } else {
+                return Long.parseLong(sudGameId);
+            }
+        } catch (NumberFormatException e) {
+            return 0;
+        }
+    }
+
+    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;
+    }
+}

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

@@ -31,7 +31,29 @@ public class CustomSidebarChildModel extends BaseModel {
     @SerializedName("activity_id")
     private String activityId;
     @SerializedName("flag")
-    private String flag;
+    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;
+    }
+
+    public CustomSidebarChildModel setIsShow(String isShow) {
+        this.isShow = isShow;
+        return this;
+    }
 
     public String getFlag() {
         return flag;

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;
     }

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

@@ -103,13 +103,57 @@ public class EnterRoomInfoModel extends BaseModel {
     @SerializedName("anchor_goodnum")
     private String anchorGoodnum;
     @SerializedName("jackpot_level")
-    private String jackpotLevel="-1";
+    private String jackpotLevel = "-1";
+    @SerializedName("live_vote")
+    private LiveRoomVoteModel voteModel;
+    @SerializedName("red_packet")
+    private RedPacketModel redPacketModel;
+
+    @SerializedName("gift_wall_lighten_number")
+    private String giftWallLightenNumber;
+    @SerializedName("gift_wall_lighten_total")
+    private String giftWallLightenTotal;
+
+    public String getGiftWallLightenNumber() {
+        return giftWallLightenNumber;
+    }
+
+    public EnterRoomInfoModel setGiftWallLightenNumber(String giftWallLightenNumber) {
+        this.giftWallLightenNumber = giftWallLightenNumber;
+        return this;
+    }
+
+    public String getGiftWallLightenTotal() {
+        return giftWallLightenTotal;
+    }
+
+    public EnterRoomInfoModel setGiftWallLightenTotal(String giftWallLightenTotal) {
+        this.giftWallLightenTotal = giftWallLightenTotal;
+        return this;
+    }
+
+    public RedPacketModel getRedPacketModel() {
+        return redPacketModel;
+    }
+
+    public EnterRoomInfoModel setRedPacketModel(RedPacketModel redPacketModel) {
+        this.redPacketModel = redPacketModel;
+        return this;
+    }
 
     public String getJackpotLevel() {
 
         return jackpotLevel;
     }
 
+    public LiveRoomVoteModel getVoteModel() {
+        return voteModel;
+    }
+
+    public void setVoteModel(LiveRoomVoteModel voteModel) {
+        this.voteModel = voteModel;
+    }
+
     public EnterRoomInfoModel setJackpotLevel(String jackpotLevel) {
         this.jackpotLevel = jackpotLevel;
         return this;
@@ -476,8 +520,8 @@ public class EnterRoomInfoModel extends BaseModel {
     }
 
     public String getIsconnection() {
-        if(StringUtil.isEmpty(isconnection)){
-            isconnection="0";
+        if (StringUtil.isEmpty(isconnection)) {
+            isconnection = "0";
         }
         return isconnection;
     }
@@ -488,6 +532,9 @@ public class EnterRoomInfoModel extends BaseModel {
     }
 
     public String getIsleave() {
+        if (StringUtil.isEmpty(isleave)) {
+            isleave = "0";
+        }
         return isleave;
     }
 

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

@@ -33,6 +33,62 @@ 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;
+    @SerializedName("sud_gameDate")
+    private SudGameDateModel sudGameDateModel;
+    @SerializedName("quick_gift_remaining_quantity")
+    private int quickGiftRemainingQuantity;//剩余的小PD礼物数量
+    @SerializedName("if_viewing_duration_complete")
+    private int ifViewingDurationComplete;//通过观看时间获取小PD礼物的次数
+
+    public int getQuickGiftRemainingQuantity() {
+        return quickGiftRemainingQuantity;
+    }
+
+    public EnterRoomNewModel setQuickGiftRemainingQuantity(int quickGiftRemainingQuantity) {
+        this.quickGiftRemainingQuantity = quickGiftRemainingQuantity;
+        return this;
+    }
+
+    public int getIfViewingDurationComplete() {
+        return ifViewingDurationComplete;
+    }
+
+    public EnterRoomNewModel setIfViewingDurationComplete(int ifViewingDurationComplete) {
+        this.ifViewingDurationComplete = ifViewingDurationComplete;
+        return this;
+    }
+
+    public SudGameDateModel getSudGameDateModel() {
+        return sudGameDateModel;
+    }
+
+    public EnterRoomNewModel setSudGameDateModel(SudGameDateModel sudGameDateModel) {
+        this.sudGameDateModel = sudGameDateModel;
+        return this;
+    }
+
+    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;
     }

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;
+    }
+}

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 + '\'' +
+                '}';
+    }
+}

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 +
+                    '}';
+        }
+    }
+}

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;
+   }
+}

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

@@ -0,0 +1,69 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class GameRecordModel extends BaseModel{
+
+   @SerializedName("id")
+   private int id;
+   @SerializedName("title")
+   private String title;
+   @SerializedName("currency_type")
+   private int currencyType;
+   @SerializedName("settlement")
+   private int settlement;
+   @SerializedName("game_end_time")
+   private String gameEndTime;
+   @SerializedName("user_name")
+   private List<String> userName;
+
+   public int getId() {
+      return id;
+   }
+
+   public void setId(int id) {
+      this.id = id;
+   }
+
+   public String getTitle() {
+      return title;
+   }
+
+   public void setTitle(String title) {
+      this.title = title;
+   }
+
+   public int getCurrencyType() {
+      return currencyType;
+   }
+
+   public void setCurrencyType(int currencyType) {
+      this.currencyType = currencyType;
+   }
+
+   public int getSettlement() {
+      return settlement;
+   }
+
+   public void setSettlement(int settlement) {
+      this.settlement = settlement;
+   }
+
+   public String getGameEndTime() {
+      return gameEndTime;
+   }
+
+   public void setGameEndTime(String gameEndTime) {
+      this.gameEndTime = gameEndTime;
+   }
+
+   public List<String> getUserName() {
+      return userName;
+   }
+
+   public void setUserName(List<String> userName) {
+      this.userName = userName;
+   }
+}

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

@@ -0,0 +1,44 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+/**
+ * 礼物墙已点亮
+ */
+public class GiftAlreadyWallModel extends BaseModel {
+    @SerializedName("gift_wall")
+    private List<GiftWallModel> giftWall;
+    @SerializedName("gift_wall_lighten_number")
+    private String giftWallLightenNumber;
+    @SerializedName("gift_wall_lighten_total")
+    private String giftWallLightenTotal;
+
+    public List<GiftWallModel> getGiftWall() {
+        return giftWall;
+    }
+
+    public GiftAlreadyWallModel setGiftWall(List<GiftWallModel> giftWall) {
+        this.giftWall = giftWall;
+        return this;
+    }
+
+    public String getGiftWallLightenNumber() {
+        return giftWallLightenNumber;
+    }
+
+    public GiftAlreadyWallModel setGiftWallLightenNumber(String giftWallLightenNumber) {
+        this.giftWallLightenNumber = giftWallLightenNumber;
+        return this;
+    }
+
+    public String getGiftWallLightenTotal() {
+        return giftWallLightenTotal;
+    }
+
+    public GiftAlreadyWallModel setGiftWallLightenTotal(String giftWallLightenTotal) {
+        this.giftWallLightenTotal = giftWallLightenTotal;
+        return this;
+    }
+}

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

@@ -0,0 +1,119 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class GiftGuideModel extends BaseModel {
+
+    @SerializedName("guide_name")
+    private String guideName;
+    @SerializedName("illuminate_count")
+    private int illuminateCount;
+    @SerializedName("already_font")
+    private String alreadyFont;
+    @SerializedName("without_font")
+    private String withoutFont;
+    @SerializedName("number")
+    private String number;
+    @SerializedName("illuminate_total")
+    private int illuminateTotal;
+    @SerializedName("week_number")
+    private String weekNumber;
+    @SerializedName("guide_name_img_path")
+    private String guideNameImgPath;
+    @SerializedName("guide_background_picture_path")
+    private String guideBackgroundPicturePath;
+    @SerializedName("gift_data")
+    private List<GiftWallModel> giftData;
+
+    public String getAlreadyFont() {
+        return alreadyFont;
+    }
+
+    public GiftGuideModel setAlreadyFont(String alreadyFont) {
+        this.alreadyFont = alreadyFont;
+        return this;
+    }
+
+    public String getWithoutFont() {
+        return withoutFont;
+    }
+
+    public GiftGuideModel setWithoutFont(String withoutFont) {
+        this.withoutFont = withoutFont;
+        return this;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public GiftGuideModel setNumber(String number) {
+        this.number = number;
+        return this;
+    }
+
+    public int getIlluminateTotal() {
+        return illuminateTotal;
+    }
+
+    public GiftGuideModel setIlluminateTotal(int illuminateTotal) {
+        this.illuminateTotal = illuminateTotal;
+        return this;
+    }
+
+    public String getWeekNumber() {
+        return weekNumber;
+    }
+
+    public GiftGuideModel setWeekNumber(String weekNumber) {
+        this.weekNumber = weekNumber;
+        return this;
+    }
+
+    public String getGuideNameImgPath() {
+        return guideNameImgPath;
+    }
+
+    public GiftGuideModel setGuideNameImgPath(String guideNameImgPath) {
+        this.guideNameImgPath = guideNameImgPath;
+        return this;
+    }
+
+    public String getGuideBackgroundPicturePath() {
+        return guideBackgroundPicturePath;
+    }
+
+    public GiftGuideModel setGuideBackgroundPicturePath(String guideBackgroundPicturePath) {
+        this.guideBackgroundPicturePath = guideBackgroundPicturePath;
+        return this;
+    }
+
+    public String getGuideName() {
+        return guideName;
+    }
+
+    public GiftGuideModel setGuideName(String guideName) {
+        this.guideName = guideName;
+        return this;
+    }
+
+    public int getIlluminateCount() {
+        return illuminateCount;
+    }
+
+    public GiftGuideModel setIlluminateCount(int illuminateCount) {
+        this.illuminateCount = illuminateCount;
+        return this;
+    }
+
+    public List<GiftWallModel> getGiftData() {
+        return giftData;
+    }
+
+    public GiftGuideModel setGiftData(List<GiftWallModel> giftData) {
+        this.giftData = giftData;
+        return this;
+    }
+}

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;
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 礼物选择数量
+ */
+public class GiftQuantityModel extends BaseModel {
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("gift_quantity")
+    private String giftQuantity;
+    @SerializedName("font_colour")
+    private String fontColour;
+
+    public String getId() {
+        return id;
+    }
+
+    public GiftQuantityModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getGiftQuantity() {
+        return giftQuantity;
+    }
+
+    public GiftQuantityModel setGiftQuantity(String giftQuantity) {
+        this.giftQuantity = giftQuantity;
+        return this;
+    }
+
+    public String getFontColour() {
+        return fontColour;
+    }
+
+    public GiftQuantityModel setFontColour(String fontColour) {
+        this.fontColour = fontColour;
+        return this;
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class GiftWallGiftDetail extends BaseModel {
+
+    @SerializedName("uid")
+    private int uid;
+    @SerializedName("user_nicename")
+    private String userNicename;
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("naming_coin")
+    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;
+    }
+
+    public GiftWallGiftDetail setUid(int uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    public String getUserNicename() {
+        if (userNicename.length() > 5) {
+            userNicename = userNicename.substring(0, 5) + "...";
+        }
+        return userNicename;
+    }
+
+    public GiftWallGiftDetail setUserNicename(String userNicename) {
+        this.userNicename = userNicename;
+        return this;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public GiftWallGiftDetail setAvatar(String avatar) {
+        this.avatar = avatar;
+        return this;
+    }
+
+    public String getNamingCoin() {
+        return namingCoin;
+    }
+
+    public GiftWallGiftDetail setNamingCoin(String namingCoin) {
+        this.namingCoin = namingCoin;
+        return this;
+    }
+}

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

@@ -0,0 +1,392 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class GiftWallModel 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("gifticon_total")
+    private String gifticonTotal;
+    @SerializedName("gift_count_number")
+    private String giftCountNumber;
+    @SerializedName("user_nicename")
+    private String userNicename;
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("naming_coin_max")
+    private String namingCoinMax;
+
+    @SerializedName("illuminate_status")
+    private int illuminateStatus;
+    @SerializedName("font_color")
+    private String fontColor;
+
+    public String getFontColor() {
+        return fontColor;
+    }
+
+    public GiftWallModel setFontColor(String fontColor) {
+        this.fontColor = fontColor;
+        return this;
+    }
+
+    public int getIlluminateStatus() {
+        return illuminateStatus;
+    }
+
+    public GiftWallModel setIlluminateStatus(int illuminateStatus) {
+        this.illuminateStatus = illuminateStatus;
+        return this;
+    }
+
+    public String getNamingCoinMax() {
+        return namingCoinMax;
+    }
+
+    public GiftWallModel setNamingCoinMax(String namingCoinMax) {
+        this.namingCoinMax = namingCoinMax;
+        return this;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public GiftWallModel setAvatar(String avatar) {
+        this.avatar = avatar;
+        return this;
+    }
+
+    public String getUserNicename() {
+        return userNicename;
+    }
+
+    public GiftWallModel setUserNicename(String userNicename) {
+        this.userNicename = userNicename;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public GiftWallModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getSendtype() {
+        return sendtype;
+    }
+
+    public GiftWallModel setSendtype(String sendtype) {
+        this.sendtype = sendtype;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public GiftWallModel setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public GiftWallModel setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getReleaseStatus() {
+        return releaseStatus;
+    }
+
+    public GiftWallModel setReleaseStatus(String releaseStatus) {
+        this.releaseStatus = releaseStatus;
+        return this;
+    }
+
+    public String getTypeSort() {
+        return typeSort;
+    }
+
+    public GiftWallModel setTypeSort(String typeSort) {
+        this.typeSort = typeSort;
+        return this;
+    }
+
+    public String getOperateImage() {
+        return operateImage;
+    }
+
+    public GiftWallModel setOperateImage(String operateImage) {
+        this.operateImage = operateImage;
+        return this;
+    }
+
+    public String getOperateUrl() {
+        return operateUrl;
+    }
+
+    public GiftWallModel setOperateUrl(String operateUrl) {
+        this.operateUrl = operateUrl;
+        return this;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public GiftWallModel setMark(String mark) {
+        this.mark = mark;
+        return this;
+    }
+
+    public String getGiftname() {
+        return giftname;
+    }
+
+    public GiftWallModel setGiftname(String giftname) {
+        this.giftname = giftname;
+        return this;
+    }
+
+    public String getNeedcoin() {
+        return needcoin;
+    }
+
+    public GiftWallModel setNeedcoin(String needcoin) {
+        this.needcoin = needcoin;
+        return this;
+    }
+
+    public String getGifticon() {
+        return gifticon;
+    }
+
+    public GiftWallModel setGifticon(String gifticon) {
+        this.gifticon = gifticon;
+        return this;
+    }
+
+    public String getGiftDescription() {
+        return giftDescription;
+    }
+
+    public GiftWallModel setGiftDescription(String giftDescription) {
+        this.giftDescription = giftDescription;
+        return this;
+    }
+
+    public String getCornerMark() {
+        return cornerMark;
+    }
+
+    public GiftWallModel setCornerMark(String cornerMark) {
+        this.cornerMark = cornerMark;
+        return this;
+    }
+
+    public String getSwf() {
+        return swf;
+    }
+
+    public GiftWallModel setSwf(String swf) {
+        this.swf = swf;
+        return this;
+    }
+
+    public String getGiftUid() {
+        return giftUid;
+    }
+
+    public GiftWallModel setGiftUid(String giftUid) {
+        this.giftUid = giftUid;
+        return this;
+    }
+
+    public String getTypeStartTime() {
+        return typeStartTime;
+    }
+
+    public GiftWallModel setTypeStartTime(String typeStartTime) {
+        this.typeStartTime = typeStartTime;
+        return this;
+    }
+
+    public String getTypeEndTime() {
+        return typeEndTime;
+    }
+
+    public GiftWallModel setTypeEndTime(String typeEndTime) {
+        this.typeEndTime = typeEndTime;
+        return this;
+    }
+
+    public String getGiftStartTime() {
+        return giftStartTime;
+    }
+
+    public GiftWallModel setGiftStartTime(String giftStartTime) {
+        this.giftStartTime = giftStartTime;
+        return this;
+    }
+
+    public String getGiftEndTime() {
+        return giftEndTime;
+    }
+
+    public GiftWallModel setGiftEndTime(String giftEndTime) {
+        this.giftEndTime = giftEndTime;
+        return this;
+    }
+
+    public String getNamingLiveuid() {
+        return namingLiveuid;
+    }
+
+    public GiftWallModel setNamingLiveuid(String namingLiveuid) {
+        this.namingLiveuid = namingLiveuid;
+        return this;
+    }
+
+    public String getNamingUid() {
+        return namingUid;
+    }
+
+    public GiftWallModel setNamingUid(String namingUid) {
+        this.namingUid = namingUid;
+        return this;
+    }
+
+    public String getNamingLiveName() {
+        return namingLiveName;
+    }
+
+    public GiftWallModel setNamingLiveName(String namingLiveName) {
+        this.namingLiveName = namingLiveName;
+        return this;
+    }
+
+    public String getNamingUserName() {
+        return namingUserName;
+    }
+
+    public GiftWallModel setNamingUserName(String namingUserName) {
+        this.namingUserName = namingUserName;
+        return this;
+    }
+
+    public String getNamingLiveAvatar() {
+        return namingLiveAvatar;
+    }
+
+    public GiftWallModel setNamingLiveAvatar(String namingLiveAvatar) {
+        this.namingLiveAvatar = namingLiveAvatar;
+        return this;
+    }
+
+    public String getNamingUserAvatar() {
+        return namingUserAvatar;
+    }
+
+    public GiftWallModel setNamingUserAvatar(String namingUserAvatar) {
+        this.namingUserAvatar = namingUserAvatar;
+        return this;
+    }
+
+    public String getNamingStatus() {
+        return namingStatus;
+    }
+
+    public GiftWallModel setNamingStatus(String namingStatus) {
+        this.namingStatus = namingStatus;
+        return this;
+    }
+
+    public String getNamingCoin() {
+        return namingCoin;
+    }
+
+    public GiftWallModel setNamingCoin(String namingCoin) {
+        this.namingCoin = namingCoin;
+        return this;
+    }
+
+    public String getGifticonTotal() {
+        return gifticonTotal;
+    }
+
+    public GiftWallModel setGifticonTotal(String gifticonTotal) {
+        this.gifticonTotal = gifticonTotal;
+        return this;
+    }
+
+    public String getGiftCountNumber() {
+        return giftCountNumber;
+    }
+
+    public GiftWallModel setGiftCountNumber(String giftCountNumber) {
+        this.giftCountNumber = giftCountNumber;
+        return this;
+    }
+}

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

@@ -204,7 +204,7 @@ public class IMLoginModel extends BaseModel {
     @SerializedName("votes")
     private String votes;
     @SerializedName("yuanbao")
-    private long yuanbao;
+    private String yuanbao;
     @SerializedName("list")
     private List<List<ListModel>> list;
     @SerializedName("slide")
@@ -825,11 +825,11 @@ public class IMLoginModel extends BaseModel {
         return this;
     }
 
-    public long getYuanbao() {
+    public String getYuanbao() {
         return yuanbao;
     }
 
-    public IMLoginModel setYuanbao(long yuanbao) {
+    public IMLoginModel setYuanbao(String yuanbao) {
         this.yuanbao = yuanbao;
         return this;
     }

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

@@ -1,29 +1,45 @@
 package com.yunbao.common.bean;
 
+import android.text.TextUtils;
+
 import com.google.gson.annotations.SerializedName;
 
 public class LinkMicUserBean extends BaseModel {
-    @SerializedName("user_nicename")
-    private String uname;
+
+    @SerializedName("id")
+    private String id;
     @SerializedName("avatar")
     private String avatar;
-    @SerializedName("dress_avatar")
-    private String dress_avatar;
-    private String uid = "";
-    private String action;
-    @SerializedName("id")
-    private String id;//连麦显示右侧头像时要用
+    @SerializedName("user_nicename")
+    private String userNicename;
+    @SerializedName("uname")
+    private String uname;
     @SerializedName("level")
     private int level;
     @SerializedName("sex")
     private int sex;
+    @SerializedName("dress_avatar")
+    private String dressAvatar;
 
     public String getUname() {
-        return uname;
+        if (TextUtils.isEmpty(uname)){
+            return userNicename;
+        }else {
+            return uname;
+        }
     }
 
-    public void setUname(String uname) {
+    public LinkMicUserBean setUname(String uname) {
         this.uname = uname;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
     }
 
     public String getAvatar() {
@@ -34,28 +50,17 @@ public class LinkMicUserBean extends BaseModel {
         this.avatar = avatar;
     }
 
-    public String getUid() {
-        return uid;
+    public String getUserNicename() {
+        if (TextUtils.isEmpty(uname)){
+            return userNicename;
+        }else {
+            return uname;
+        }
+
     }
 
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    public String getDress_avatar() {
-        return dress_avatar;
-    }
-
-    public void setDress_avatar(String dress_avatar) {
-        this.dress_avatar = dress_avatar;
+    public void setUserNicename(String userNicename) {
+        this.userNicename = userNicename;
     }
 
     public int getLevel() {
@@ -74,25 +79,11 @@ public class LinkMicUserBean extends BaseModel {
         this.sex = sex;
     }
 
-    public String getId() {
-        return id;
+    public String getDressAvatar() {
+        return dressAvatar;
     }
 
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public String toString() {
-        return "LinkMicUserBean{" +
-                "uname='" + uname + '\'' +
-                ", avatar='" + avatar + '\'' +
-                ", dress_avatar='" + dress_avatar + '\'' +
-                ", uid='" + uid + '\'' +
-                ", action='" + action + '\'' +
-                ", id='" + id + '\'' +
-                ", level=" + level +
-                ", sex=" + sex +
-                '}';
+    public void setDressAvatar(String dressAvatar) {
+        this.dressAvatar = dressAvatar;
     }
 }

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

@@ -0,0 +1,162 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+import java.util.Map;
+
+public class LiveBattlePassRewardsBean extends BaseModel{
+    private int level;
+    private List<BattlePassType> live_battle_pass_type;
+    private Map<Integer,Map<Integer,LiveBattlePassReward>> live_battle_pass_rewards;
+
+    public LiveBattlePassRewardsBean() {
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public List<BattlePassType> getLive_battle_pass_type() {
+        return live_battle_pass_type;
+    }
+
+    public void setLive_battle_pass_type(List<BattlePassType> live_battle_pass_type) {
+        this.live_battle_pass_type = live_battle_pass_type;
+    }
+
+    public Map<Integer,Map<Integer,LiveBattlePassReward>> getLive_battle_pass_rewards() {
+        return live_battle_pass_rewards;
+    }
+
+    public void setLive_battle_pass_rewards(Map<Integer,Map<Integer,LiveBattlePassReward>> live_battle_pass_rewards) {
+        this.live_battle_pass_rewards = live_battle_pass_rewards;
+    }
+
+    public static class BattlePassType extends BaseModel{
+        private int id;
+        private String battle_pass_name;
+        private int sort;
+        private int diamond_value;
+        private int lock;
+
+        public BattlePassType() {
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getBattle_pass_name() {
+            return battle_pass_name;
+        }
+
+        public void setBattle_pass_name(String battle_pass_name) {
+            this.battle_pass_name = battle_pass_name;
+        }
+
+        public int getSort() {
+            return sort;
+        }
+
+        public void setSort(int sort) {
+            this.sort = sort;
+        }
+
+        public int getDiamond_value() {
+            return diamond_value;
+        }
+
+        public void setDiamond_value(int diamond_value) {
+            this.diamond_value = diamond_value;
+        }
+
+        public int getLock() {
+            return lock;
+        }
+
+        public void setLock(int lock) {
+            this.lock = lock;
+        }
+    }
+    public static class LiveBattlePassReward extends BaseModel{
+        private int id;
+        @SerializedName("live_battle_pass_level")
+        private int liveBattlePassLevel;
+        @SerializedName("live_battle_pass_type_id")
+        private int liveBattlePassTypeId;
+        @SerializedName("reward_name")
+        private String rewardName;
+        @SerializedName("image_url")
+        private String imageUrl;
+        private int lock;
+        private int received;
+
+        public LiveBattlePassReward() {
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public int getLiveBattlePassLevel() {
+            return liveBattlePassLevel;
+        }
+
+        public void setLiveBattlePassLevel(int liveBattlePassLevel) {
+            this.liveBattlePassLevel = liveBattlePassLevel;
+        }
+
+        public int getLiveBattlePassTypeId() {
+            return liveBattlePassTypeId;
+        }
+
+        public void setLiveBattlePassTypeId(int liveBattlePassTypeId) {
+            this.liveBattlePassTypeId = liveBattlePassTypeId;
+        }
+
+        public String getRewardName() {
+            return rewardName;
+        }
+
+        public void setRewardName(String rewardName) {
+            this.rewardName = rewardName;
+        }
+
+        public String getImageUrl() {
+            return imageUrl;
+        }
+
+        public void setImageUrl(String imageUrl) {
+            this.imageUrl = imageUrl;
+        }
+
+        public int getLock() {
+            return lock;
+        }
+
+        public void setLock(int lock) {
+            this.lock = lock;
+        }
+
+        public int getReceived() {
+            return received;
+        }
+
+        public void setReceived(int received) {
+            this.received = received;
+        }
+    }
+}

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

@@ -5,6 +5,7 @@ import android.os.Parcelable;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.google.gson.annotations.SerializedName;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,7 +52,10 @@ public class LiveBean implements Parcelable {
     private String recommendCardtype = "";
     private String recommendCardIconSizeTwo = "";
     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() {
@@ -63,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)) {
@@ -382,6 +394,14 @@ public class LiveBean implements Parcelable {
         this.islive = islive;
     }
 
+    public int getRedPacketStatus() {
+        return redPacketStatus;
+    }
+
+    public void setRedPacketStatus(int redPacketStatus) {
+        this.redPacketStatus = redPacketStatus;
+    }
+
     /**
      * 显示靓号
      */
@@ -433,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
@@ -477,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>() {
@@ -529,6 +551,7 @@ public class LiveBean implements Parcelable {
                 ", recommendCardtype='" + recommendCardtype + '\'' +
                 ", recommendCardIconSizeTwo='" + recommendCardIconSizeTwo + '\'' +
                 ", recommendCardIconSizeThree='" + recommendCardIconSizeThree + '\'' +
+                ", redPacketStatus=" + redPacketStatus +
                 ", params=" + params +
                 ", mWeekList=" + mWeekList +
                 '}';

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.
@@ -14,6 +15,28 @@ public class LiveClassBean {
     private boolean isAll;
     private String des;
     private boolean checked;
+    private String chinese;
+    private String english;
+    @SerializedName("channel_show")
+    private int channel_show;
+
+    public String getChinese() {
+        return chinese;
+    }
+
+    public LiveClassBean setChinese(String chinese) {
+        this.chinese = chinese;
+        return this;
+    }
+
+    public String getEnglish() {
+        return english;
+    }
+
+    public LiveClassBean setEnglish(String english) {
+        this.english = english;
+        return this;
+    }
 
     public int getId() {
         return id;
@@ -72,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;
+    }
 }

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

@@ -18,12 +18,12 @@ public class LiveGiftBean {
 //    public static final int MARK_LUCK = 3;
 
     private int id;
-    private int type;//0 普通礼物 1是豪华礼物
+    private int type;//0 普通礼物 1是贵族 2守护 3粉丝团 5盲盒礼物
     private int mark;// 0 普通  1热门  2守护 3幸运
     private String name;
     private String price;
     private String icon;
-    private boolean checked;
+    private boolean checked = false;
     private int page;
     private View mView;
     private String sendType;//支付是金币还是钻石
@@ -34,6 +34,214 @@ public class LiveGiftBean {
     private String isweek;
     private String end_time;
     private String tag;
+    @JSONField(name = "blind_box_type")
+    private int blind_box_type = 0;
+    //礼物角标
+
+    @JSONField(name = "corner_mark")
+    private String cornerMark;
+    @JSONField(name = "gift_description")
+    private String giftDescription;
+
+    @JSONField(name = "operate_image")
+    private String operateImage;
+
+    @JSONField(name = "operate_url")
+    private String operateUrl;
+    @JSONField(name = "naming_liveuid")
+    private String namingLiveuid;
+    @JSONField(name = "naming_uid")
+    private String namingUid;
+    @JSONField(name = "naming_live_name")
+    private String namingLiveName;
+    @JSONField(name = "naming_user_name")
+    private String namingUserName;
+    @JSONField(name = "naming_live_avatar")
+    private String namingLiveAvatar;
+    @JSONField(name = "naming_user_avatar")
+    private String namingUserAvatar;
+    @JSONField(name = "naming_status")
+    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;
+    }
+
+    public LiveGiftBean setmView(View mView) {
+        this.mView = mView;
+        return this;
+    }
+
+    public String getmGiftNum() {
+        return mGiftNum;
+    }
+
+    public LiveGiftBean setmGiftNum(String mGiftNum) {
+        this.mGiftNum = mGiftNum;
+        return this;
+    }
+
+    public String getNamingLiveuid() {
+        return namingLiveuid;
+    }
+
+    public LiveGiftBean setNamingLiveuid(String namingLiveuid) {
+        this.namingLiveuid = namingLiveuid;
+        return this;
+    }
+
+    public String getNamingUid() {
+        return namingUid;
+    }
+
+    public LiveGiftBean setNamingUid(String namingUid) {
+        this.namingUid = namingUid;
+        return this;
+    }
+
+    public String getNamingLiveName() {
+        return namingLiveName;
+    }
+
+    public LiveGiftBean setNamingLiveName(String namingLiveName) {
+        this.namingLiveName = namingLiveName;
+        return this;
+    }
+
+    public String getNamingUserName() {
+        return namingUserName;
+    }
+
+    public LiveGiftBean setNamingUserName(String namingUserName) {
+        this.namingUserName = namingUserName;
+        return this;
+    }
+
+    public String getNamingLiveAvatar() {
+        return namingLiveAvatar;
+    }
+
+    public LiveGiftBean setNamingLiveAvatar(String namingLiveAvatar) {
+        this.namingLiveAvatar = namingLiveAvatar;
+        return this;
+    }
+
+    public String getNamingUserAvatar() {
+        return namingUserAvatar;
+    }
+
+    public LiveGiftBean setNamingUserAvatar(String namingUserAvatar) {
+        this.namingUserAvatar = namingUserAvatar;
+        return this;
+    }
+
+    public String getNamingStatus() {
+        return namingStatus;
+    }
+
+    public LiveGiftBean setNamingStatus(String namingStatus) {
+        this.namingStatus = namingStatus;
+        return this;
+    }
+
+    public String getNamingCoin() {
+        return namingCoin;
+    }
+
+    public LiveGiftBean setNamingCoin(String namingCoin) {
+        this.namingCoin = namingCoin;
+        return this;
+    }
+
+    public String getOperateImage() {
+        return operateImage;
+    }
+
+    public LiveGiftBean setOperateImage(String operateImage) {
+        this.operateImage = operateImage;
+        return this;
+    }
+
+    public String getOperateUrl() {
+        return operateUrl;
+    }
+
+    public LiveGiftBean setOperateUrl(String operateUrl) {
+        this.operateUrl = operateUrl;
+        return this;
+    }
+
+    public String getGiftDescription() {
+        return giftDescription;
+    }
+
+    public LiveGiftBean setGiftDescription(String giftDescription) {
+        this.giftDescription = giftDescription;
+        return this;
+    }
+
+    public String getCornerMark() {
+        return cornerMark;
+    }
+
+    public LiveGiftBean setCornerMark(String cornerMark) {
+        this.cornerMark = cornerMark;
+        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;
+    }
+
+    public LiveGiftBean setBlind_box_type(int blind_box_type) {
+        this.blind_box_type = blind_box_type;
+        return this;
+    }
 
     public String getTag() {
         return tag;

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

@@ -0,0 +1,193 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.utils.StringUtil;
+import com.yunbao.common.utils.WordUtil;
+
+import java.util.List;
+
+/**
+ * 主播创建投票
+ * {
+ * "live_vote_id": "20",
+ * "question_content": "123",
+ * "vote_end_time": 180,
+ * "option_content_first_num": 0,
+ * "option_content_second_num": 0,
+ * "users_id": []
+ * }
+ */
+public class LiveRoomVoteModel extends BaseModel {
+    @SerializedName("vote_status")
+    private int status;
+    @SerializedName("live_vote_id")
+    private String voteId;
+    @SerializedName("question_content")
+    private String content;
+    @SerializedName("vote_end_time")
+    private int time;
+    @SerializedName("option_content_first_num")
+    private int answer1Num;
+    @SerializedName("option_content_second_num")
+    private int answer2Num;
+    @SerializedName("users_id")
+    private List<String> userIds;
+    @SerializedName("option_content_first")
+    private String answer1;
+    @SerializedName("option_content_second")
+    private String answer2;
+    @SerializedName("result_zh")
+    private String resultZh;
+    @SerializedName("result_en")
+    private String resultEn;
+    @SerializedName("option_text")
+    private String optionText;
+    @SerializedName("option_content_key")
+    private String vote;
+
+    private String liveUid;
+
+    public String getLiveUid() {
+        return liveUid;
+    }
+
+    public void setLiveUid(String liveUid) {
+        this.liveUid = liveUid;
+    }
+
+    public String getAnswer1() {
+        return answer1;
+    }
+
+    public void setAnswer1(String answer1) {
+        this.answer1 = answer1;
+    }
+
+    public String getAnswer2() {
+        return answer2;
+    }
+
+    public void setAnswer2(String answer2) {
+        this.answer2 = answer2;
+    }
+
+    public String getVoteId() {
+        return voteId;
+    }
+
+    public void setVoteId(String voteId) {
+        this.voteId = voteId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getTime() {
+        return time;
+    }
+
+    public void setTime(int time) {
+        this.time = time;
+    }
+
+    public int getAnswer1Num() {
+        return answer1Num;
+    }
+
+    public void setAnswer1Num(int answer1Num) {
+        this.answer1Num = answer1Num;
+    }
+
+    public int getAnswer2Num() {
+        return answer2Num;
+    }
+
+    public void setAnswer2Num(int answer2Num) {
+        this.answer2Num = answer2Num;
+    }
+
+    public List<String> getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(List<String> userIds) {
+        this.userIds = userIds;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getResult() {
+        return  WordUtil.isNewZh() ? resultZh : resultEn;
+    }
+
+    public String getResultZh() {
+        return resultZh;
+    }
+
+    public void setResultZh(String resultZh) {
+        this.resultZh = resultZh;
+    }
+
+    public String getResultEn() {
+        return resultEn;
+    }
+
+    public void setResultEn(String resultEn) {
+        this.resultEn = resultEn;
+    }
+
+    public String getOptionText() {
+        return optionText;
+    }
+
+    public void setOptionText(String optionText) {
+        this.optionText = optionText;
+    }
+
+    @Override
+    public String toString() {
+        return "LiveRoomVoteModel{" +
+                "status=" + status +
+                ", voteId='" + voteId + '\'' +
+                ", content='" + content + '\'' +
+                ", time=" + time +
+                ", answer1Num=" + answer1Num +
+                ", answer2Num=" + answer2Num +
+                ", userIds=" + userIds +
+                ", answer1='" + answer1 + '\'' +
+                ", answer2='" + answer2 + '\'' +
+                ", resultZh='" + resultZh + '\'' +
+                ", resultEn='" + resultEn + '\'' +
+                ", optionText='" + optionText + '\'' +
+                ", vote='" + vote + '\'' +
+                ", liveUid='" + liveUid + '\'' +
+                '}';
+    }
+
+    public String getVote() {
+        return vote;
+    }
+
+    public void setVote(String vote) {
+        this.vote = vote;
+    }
+
+    public boolean isVoteLeft() {
+        return vote.equals("option_content_first_num");
+    }
+
+    public boolean isVote() {
+        return !StringUtil.isEmpty(vote);
+    }
+}

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

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

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;
     }

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

@@ -0,0 +1,42 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class MedalAchievementModel extends BaseModel {
+
+    @SerializedName("medal_total_number")
+    private String medalTotalNumber;
+    @SerializedName("medal_light_number")
+    private String medalLightNumber;
+    @SerializedName("medal_data")
+    private List<UserMedalListModel> medalData;
+
+    public String getMedalTotalNumber() {
+        return medalTotalNumber;
+    }
+
+    public MedalAchievementModel setMedalTotalNumber(String medalTotalNumber) {
+        this.medalTotalNumber = medalTotalNumber;
+        return this;
+    }
+
+    public String getMedalLightNumber() {
+        return medalLightNumber;
+    }
+
+    public MedalAchievementModel setMedalLightNumber(String medalLightNumber) {
+        this.medalLightNumber = medalLightNumber;
+        return this;
+    }
+
+    public List<UserMedalListModel> getMedalData() {
+        return medalData;
+    }
+
+    public MedalAchievementModel setMedalData(List<UserMedalListModel> medalData) {
+        this.medalData = medalData;
+        return this;
+    }
+}

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

@@ -357,4 +357,8 @@ public class MsgModel extends BaseModel {
     public void setSystem_bubble(String system_bubble) {
         this.system_bubble = system_bubble;
     }
+
+    /**
+     * 红包
+     */
 }

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

@@ -0,0 +1,14 @@
+package com.yunbao.common.bean;
+
+public class NativeCallbackModel extends BaseModel{
+   private String uid ;
+
+   public String getUid() {
+      return uid;
+   }
+
+   public NativeCallbackModel setUid(String uid) {
+      this.uid = uid;
+      return this;
+   }
+}

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

@@ -0,0 +1,209 @@
+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;//底部
+    public static final int SHOW_DEF = 1;//1. 杀死程序后弹出；
+    public static final int SHOW_DIY = 2;//2. 自定义时间：自上次弹出弹窗后，00:00小时（范围：00:01小时-48:00小时）后再弹出（到时间后也需满足触发条件再弹出）；
+    public static final int SHOW_ONE = 3;//3. 仅弹出一次；
+    @SerializedName("id")
+    private int id;
+    @SerializedName("popup_location")
+    private int type = TYPE_HOME;
+    @SerializedName("activity_url")
+    private String url;//点击跳转url
+    @SerializedName("image_url")
+    private String imageUrl;//图片url
+    @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;
+    @SerializedName("popup_frequency")
+    private int showModel = SHOW_DEF;//显示模式，1：杀死程序后弹出 2：指定时间内（本机时间） 3：1. 仅弹出一次
+    @SerializedName("popup_frequency_time")
+    private String section = "0";// SHOW_DEF = 2
+
+
+    public OpenAdModel() {
+    }
+
+    public static OpenAdModel createTestData() {
+        OpenAdModel model = new OpenAdModel();
+        model.id=3;
+        model.type=1;
+        model.url = "/h5/GuildTournament/20230821/rank.html";
+        model.imageUrl = "https://ceshi.yaoulive.com/data/upload/20230913/1694589490.png";
+        model.showTime = 10;
+        model.delayShowTime = 0;
+        model.model = MODEL_SQUARE;
+        model.startTime = "2019-01-01 00:00:00";
+        model.endTime = "2029-01-01 00:00:00";
+        model.permission = 4;
+        model.showModel = SHOW_DIY;
+        model.section = "5";
+        return model;
+    }
+
+    public int getShowModel() {
+        return showModel;
+    }
+
+    public void setShowModel(int showModel) {
+        this.showModel = showModel;
+    }
+
+    public String getSection() {
+        return section;
+    }
+
+    public void setSection(String section) {
+        this.section = section;
+    }
+
+    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 + '\'' +
+                '}';
+    }
+}

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 + '\'' +
                 '}';
     }
 }

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

@@ -0,0 +1,39 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class QuickGiftSendGiftModel extends BaseModel {
+    @SerializedName("quick_gift_remaining_quantity")
+    private int quickGiftRemainingQuantity;//剩余的小PD礼物数量
+    @SerializedName("if_viewing_duration_complete")
+    private int ifViewingDurationComplete;//通过观看时间获取小PD礼物的次数
+    @SerializedName("if_hidden_egg")
+    private int ifHiddenEgg = 1;//1.未解锁 2.已解锁过奖励 3.当前请求解锁了奖励
+
+    public int getIfHiddenEgg() {
+        return ifHiddenEgg;
+    }
+
+    public QuickGiftSendGiftModel setIfHiddenEgg(int ifHiddenEgg) {
+        this.ifHiddenEgg = ifHiddenEgg;
+        return this;
+    }
+
+    public int getQuickGiftRemainingQuantity() {
+        return quickGiftRemainingQuantity;
+    }
+
+    public QuickGiftSendGiftModel setQuickGiftRemainingQuantity(int quickGiftRemainingQuantity) {
+        this.quickGiftRemainingQuantity = quickGiftRemainingQuantity;
+        return this;
+    }
+
+    public int getIfViewingDurationComplete() {
+        return ifViewingDurationComplete;
+    }
+
+    public QuickGiftSendGiftModel setIfViewingDurationComplete(int ifViewingDurationComplete) {
+        this.ifViewingDurationComplete = ifViewingDurationComplete;
+        return this;
+    }
+}

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

@@ -0,0 +1,187 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.CommonAppConfig;
+
+import java.util.List;
+
+public class RedPacketDetailsBean extends BaseModel {
+    @SerializedName("u_nicename")
+    private String niceName;
+    @SerializedName("avatar_thumb")
+    private String avatarThumb;
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("red_packet_money")
+    private long money;// 红包金豆总数量
+    @SerializedName("amount_diamond")
+    private long diamond;// 红包价值钻石
+    @SerializedName("red_packet_quantity")
+    private int quantity; // 领取的红包总数量
+    @SerializedName("red_packet_quantity_already")
+    private int already; // 领取的红包总数量
+    @SerializedName("red_packet_record_details")
+    private List<Detail> details;
+
+    public String getNiceName() {
+        return niceName;
+    }
+
+    public void setNiceName(String niceName) {
+        this.niceName=niceName;
+    }
+
+    public String getAvatarThumb() {
+        avatarThumb=avatarThumb.replace("\\","");
+        if(!avatarThumb.startsWith("http")){
+            avatarThumb= CommonAppConfig.HOST+"/"+avatarThumb;
+        }
+        return avatarThumb;
+    }
+
+    public void setAvatarThumb(String avatarThumb) {
+        this.avatarThumb = avatarThumb;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public long getMoney() {
+        return money;
+    }
+
+    public void setMoney(long money) {
+        this.money = money;
+    }
+
+    public int getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(int quantity) {
+        this.quantity = quantity;
+    }
+
+    public int getAlready() {
+        return already;
+    }
+
+    public void setAlready(int already) {
+        this.already = already;
+    }
+
+    public List<Detail> getDetails() {
+        return details;
+    }
+
+    public void setDetails(List<Detail> details) {
+        this.details = details;
+    }
+
+    public long getDiamond() {
+        return diamond;
+    }
+
+    public void setDiamond(long diamond) {
+        this.diamond = diamond;
+    }
+
+    @Override
+    public String toString() {
+        return "RedPacketDetailsBean{" +
+                "niceName='" + niceName + '\'' +
+                ", avatarThumb='" + avatarThumb + '\'' +
+                ", avatar='" + avatar + '\'' +
+                ", money=" + money +
+                ", diamond=" + diamond +
+                ", quantity=" + quantity +
+                ", already=" + already +
+                ", details=" + details +
+                '}';
+    }
+
+    public static class Detail extends BaseModel {
+        @SerializedName("receive_money")
+        private long money;
+        @SerializedName("user_nicename")
+        private String niceName;
+        @SerializedName("receive_time")
+        private String time;
+        @SerializedName("avatar_thumb")
+        private String avatarThumb;
+        @SerializedName("avatar")
+        private String avatar;
+        @SerializedName("gifticon")
+        private String gifticon;
+
+
+        public long getMoney() {
+            return money;
+        }
+
+        public void setMoney(long money) {
+            this.money = money;
+        }
+
+        public String getNiceName() {
+            return niceName;
+        }
+
+        public void setNiceName(String niceName) {
+            this.niceName=niceName;
+        }
+
+        public String getTime() {
+            return time;
+        }
+
+        public void setTime(String time) {
+            this.time = time;
+        }
+
+        public String getAvatarThumb() {
+            avatarThumb=avatarThumb.replace("\\","");
+            if(!avatarThumb.startsWith("http")){
+                avatarThumb= CommonAppConfig.HOST+"/"+avatarThumb;
+            }
+            return avatarThumb;
+        }
+
+        public void setAvatarThumb(String avatarThumb) {
+            this.avatarThumb = avatarThumb;
+        }
+
+        public String getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(String avatar) {
+            this.avatar = avatar;
+        }
+
+        public String getGifticon() {
+            return gifticon;
+        }
+
+        public void setGifticon(String gifticon) {
+            this.gifticon = gifticon;
+        }
+
+        @Override
+        public String toString() {
+            return "Detail{" +
+                    "money=" + money +
+                    ", niceName='" + niceName + '\'' +
+                    ", time='" + time + '\'' +
+                    ", avatarThumb='" + avatarThumb + '\'' +
+                    ", avatar='" + avatar + '\'' +
+                    ", gifticon='" + gifticon + '\'' +
+                    '}';
+        }
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 红包随机礼物
+ */
+public class RedPacketGiftModel extends BaseModel {
+    /**
+     * {
+     * "id": 210,
+     * "giftname": "玫瑰",
+     * "needcoin": 20,
+     * "gifticon": "https://downs.yaoulive.com/603f25d9aa969.png"
+     * }
+     */
+    @SerializedName("id")
+    private String id;
+    @SerializedName("giftname")
+    private String giftname;
+    @SerializedName("needcoin")
+    private String needcoin;
+    @SerializedName("gifticon")
+    private String gifticon;
+    @SerializedName("gift_num")
+    private String giftNum;
+    @SerializedName("user_nicename")
+    private String userNicename;
+    @SerializedName("avatar")
+    private String avatar;
+
+    public String getId() {
+        return id;
+    }
+
+    public RedPacketGiftModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getGiftname() {
+        return giftname;
+    }
+
+    public RedPacketGiftModel setGiftname(String giftname) {
+        this.giftname = giftname;
+        return this;
+    }
+
+    public String getNeedcoin() {
+        return needcoin;
+    }
+
+    public RedPacketGiftModel setNeedcoin(String needcoin) {
+        this.needcoin = needcoin;
+        return this;
+    }
+
+    public String getGifticon() {
+        return gifticon;
+    }
+
+    public RedPacketGiftModel setGifticon(String gifticon) {
+        this.gifticon = gifticon;
+        return this;
+    }
+
+    public String getGiftNum() {
+        return giftNum;
+    }
+
+    public RedPacketGiftModel setGiftNum(String giftNum) {
+        this.giftNum = giftNum;
+        return this;
+    }
+
+    public String getUserNicename() {
+        return userNicename;
+    }
+
+    public RedPacketGiftModel setUserNicename(String userNicename) {
+        this.userNicename = userNicename;
+        return this;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public RedPacketGiftModel setAvatar(String avatar) {
+        this.avatar = avatar;
+        return this;
+    }
+}

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

@@ -0,0 +1,283 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+/**
+ * 红包信息
+ */
+public class RedPacketInfoModel extends BaseModel {
+
+    @SerializedName("liveuid")
+    private String liveuid;
+    @SerializedName("uid")
+    private String uid;
+    @SerializedName("amount_diamond")
+    private String amountDiamond;
+    @SerializedName("red_packet_money")
+    private String redPacketMoney;
+    @SerializedName("red_packet_quantity")
+    private String redPacketQuantity;
+    @SerializedName("is_fans")
+    private String isFans;
+    @SerializedName("conditions")
+    private String conditions;
+    @SerializedName("create_time")
+    private String createTime;
+    @SerializedName("start_time")
+    private String startTime;
+    @SerializedName("end_time")
+    private String endTime;
+    @SerializedName("user_id")
+    private String userId;
+    @SerializedName("user_nicename")
+    private String userNicename;
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("avatar_thumb")
+    private String avatarThumb;
+    @SerializedName("id")
+    private String id;
+    @SerializedName("user_exists")
+    private String userExists;
+    @SerializedName("is_attention")
+    private String isAttention;
+    //0.未领取到 1.领取但是没抢过东西 2.已经领抢到东西
+    @SerializedName("receive_status")
+    private String receiveStatus;
+    //超级红包ID
+    @SerializedName("super_jackpot_id")
+    private String superJackpotId;
+
+    public String getSuperJackpotId() {
+        return superJackpotId;
+    }
+
+    public RedPacketInfoModel setSuperJackpotId(String superJackpotId) {
+        this.superJackpotId = superJackpotId;
+        return this;
+    }
+
+    //是否超级红包
+    private boolean isSuperJackpot = false;
+
+    public boolean isSuperJackpot() {
+        return isSuperJackpot;
+    }
+
+    //红包id
+    @SerializedName("red_packet_id")
+    private String redPacketId;
+
+    public String getRedPacketId() {
+        return redPacketId;
+    }
+
+    public RedPacketInfoModel setRedPacketId(String redPacketId) {
+        this.redPacketId = redPacketId;
+        return this;
+    }
+
+    public RedPacketInfoModel setSuperJackpot(boolean superJackpot) {
+        isSuperJackpot = superJackpot;
+        return this;
+    }
+
+    public String getIsAttention() {
+        return isAttention;
+    }
+
+
+    public RedPacketInfoModel setIsAttention(String isAttention) {
+        this.isAttention = isAttention;
+        return this;
+    }
+
+    @SerializedName("user_golden_bean")
+    private String userGoldenBean;
+
+    @SerializedName("red_packet_gift")
+    private List<RedPacketGiftModel> packetGiftModels;
+    @SerializedName("gift")
+    private List<RedPacketGiftModel> giftModels;
+
+    public String getReceiveStatus() {
+        return receiveStatus;
+    }
+
+    public RedPacketInfoModel setReceiveStatus(String receiveStatus) {
+        this.receiveStatus = receiveStatus;
+        return this;
+    }
+
+    public List<RedPacketGiftModel> getGiftModels() {
+        return giftModels;
+    }
+
+    public RedPacketInfoModel setGiftModels(List<RedPacketGiftModel> giftModels) {
+        this.giftModels = giftModels;
+        return this;
+    }
+
+    public List<RedPacketGiftModel> getPacketGiftModels() {
+        return packetGiftModels;
+    }
+
+    public RedPacketInfoModel setPacketGiftModels(List<RedPacketGiftModel> packetGiftModels) {
+        this.packetGiftModels = packetGiftModels;
+        return this;
+    }
+
+    public String getLiveuid() {
+        return liveuid;
+    }
+
+    public RedPacketInfoModel setLiveuid(String liveuid) {
+        this.liveuid = liveuid;
+        return this;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public RedPacketInfoModel setUid(String uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    public String getAmountDiamond() {
+        return amountDiamond;
+    }
+
+    public RedPacketInfoModel setAmountDiamond(String amountDiamond) {
+        this.amountDiamond = amountDiamond;
+        return this;
+    }
+
+    public String getRedPacketMoney() {
+        return redPacketMoney;
+    }
+
+    public RedPacketInfoModel setRedPacketMoney(String redPacketMoney) {
+        this.redPacketMoney = redPacketMoney;
+        return this;
+    }
+
+    public String getRedPacketQuantity() {
+        return redPacketQuantity;
+    }
+
+    public RedPacketInfoModel setRedPacketQuantity(String redPacketQuantity) {
+        this.redPacketQuantity = redPacketQuantity;
+        return this;
+    }
+
+    public String getConditions() {
+        return conditions;
+    }
+
+    public RedPacketInfoModel setConditions(String conditions) {
+        this.conditions = conditions;
+        return this;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public RedPacketInfoModel setCreateTime(String createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public RedPacketInfoModel setStartTime(String startTime) {
+        this.startTime = startTime;
+        return this;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public RedPacketInfoModel setEndTime(String endTime) {
+        this.endTime = endTime;
+        return this;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public RedPacketInfoModel setUserId(String userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public String getUserNicename() {
+        return userNicename;
+    }
+
+    public RedPacketInfoModel setUserNicename(String userNicename) {
+        this.userNicename = userNicename;
+        return this;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public RedPacketInfoModel setAvatar(String avatar) {
+        this.avatar = avatar;
+        return this;
+    }
+
+    public String getAvatarThumb() {
+        return avatarThumb;
+    }
+
+    public RedPacketInfoModel setAvatarThumb(String avatarThumb) {
+        this.avatarThumb = avatarThumb;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public RedPacketInfoModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getUserExists() {
+        return userExists;
+    }
+
+    public RedPacketInfoModel setUserExists(String userExists) {
+        this.userExists = userExists;
+        return this;
+    }
+
+    public String getUserGoldenBean() {
+        return userGoldenBean;
+    }
+
+    public RedPacketInfoModel setUserGoldenBean(String userGoldenBean) {
+        this.userGoldenBean = userGoldenBean;
+        return this;
+    }
+
+    public boolean getIsFans() {
+        return isFans.equals("1");
+    }
+
+    public void setIsFans(String isFans) {
+        this.isFans = isFans;
+    }
+}

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

@@ -0,0 +1,117 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class RedPacketListBean extends BaseModel {
+    public static final int RED_PACKET_STATUS_SUCCESS=1;//红包消费
+    public static final int RED_PACKET_STATUS_BACK=2;//红包退回
+    public static final int RED_PACKET_CURRENT_STATUS_SUCCESS=1;//红包已生效
+    public static final int RED_PACKET_CURRENT_STATUS_TIMEOUT=2;//红包已过期
+    @SerializedName("id")
+    private int id;
+    @SerializedName("live_nicename")
+    private String liveNicename;
+    @SerializedName("create_time")
+    private String createTime;
+    @SerializedName("red_packet_money")
+    private long redPacketMoney;
+    @SerializedName("red_packet_status")
+    private int redPacketStatus;
+    @SerializedName("current_status")
+    private int currentStatus;
+    @SerializedName("uid")
+    private long uid;
+
+    @SerializedName("amount_diamond")
+    private long amountDiamond;
+    @SerializedName("amount_refund")
+    private long amountRefund;
+
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getLiveNicename() {
+        return liveNicename;
+    }
+
+    public void setLiveNicename(String liveNicename) {
+        this.liveNicename = liveNicename;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public long getRedPacketMoney() {
+        return redPacketMoney;
+    }
+
+    public void setRedPacketMoney(long redPacketMoney) {
+        this.redPacketMoney = redPacketMoney;
+    }
+
+    public int getRedPacketStatus() {
+        return redPacketStatus;
+    }
+
+    public void setRedPacketStatus(int redPacketStatus) {
+        this.redPacketStatus = redPacketStatus;
+    }
+
+    public long getUid() {
+        return uid;
+    }
+
+    public void setUid(long uid) {
+        this.uid = uid;
+    }
+
+    public int getCurrentStatus() {
+        return currentStatus;
+    }
+
+    public void setCurrentStatus(int currentStatus) {
+        this.currentStatus = currentStatus;
+    }
+
+    public long getAmountDiamond() {
+        return amountDiamond;
+    }
+
+    public void setAmountDiamond(long amountDiamond) {
+        this.amountDiamond = amountDiamond;
+    }
+
+    public long getAmountRefund() {
+        return amountRefund;
+    }
+
+    public void setAmountRefund(long amountRefund) {
+        this.amountRefund = amountRefund;
+    }
+
+    @Override
+    public String toString() {
+        return "RedPacketListBean{" +
+                "id=" + id +
+                ", liveNicename='" + liveNicename + '\'' +
+                ", createTime='" + createTime + '\'' +
+                ", redPacketMoney=" + redPacketMoney +
+                ", redPacketStatus=" + redPacketStatus +
+                ", currentStatus=" + currentStatus +
+                ", uid=" + uid +
+                ", amountDiamond=" + amountDiamond +
+                ", amountRefund=" + amountRefund +
+                '}';
+    }
+}