yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev_6.5.5

Browse Source
This commit is contained in:
zlzw 2023-08-24 15:02:05 +08:00
commit 2b59b1b4fe
8 changed files with 685 additions and 617 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

360
FaceUnity/src/main/res/values-zh-rCN/strings.xml
View File

@ -1,96 +1,96 @@
<resources> <resources>
<string name="camera_dialog_title">警告</string> <string name="camera_dialog_title">警告</string>
<string name="sorry_no_permission">抱歉，你所使用的证书权限或SDK不包括该功能。</string> <string name="sorry_no_permission">抱歉，你所使用的證書權限或SDK不包括該功能。</string>
<string name="camera_dialog_message">相机权限被禁用或者相机被别的应用占用！</string> <string name="camera_dialog_message">相機權限被禁用或者相機被別的應用佔用！</string>
<string name="camera_dialog_open">重试</string> <string name="camera_dialog_open">重試</string>
<string name="camera_dialog_back">退出</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="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_photo_success">保存照片成功！</string>
<string name="save_video_success">保存视频成功！</string> <string name="save_video_success">保存視頻成功！</string>
<string name="save_video_failed">保存视频失败！</string> <string name="save_video_failed">保存視頻失敗！</string>
<string name="save_video_too_short">视频太短啦！</string> <string name="save_video_too_short">視頻太短啦！</string>
<string name="save_video_wait">视频处理中请稍等</string> <string name="save_video_wait">視頻處理中請稍等</string>
<string name="fu_base_is_tracking_text">未检测到人脸</string> <string name="fu_base_is_tracking_text">未檢測到人臉</string>
<string name="fu_base_incomplete_face_text">人脸不全</string> <string name="fu_base_incomplete_face_text">人臉不全</string>
<string name="fu_base_input_type_single">单输入</string> <string name="fu_base_input_type_single">單輸入</string>
<string name="fu_base_input_type_double">双输入</string> <string name="fu_base_input_type_double">雙輸入</string>
<string name="beauty_box_heavy_blur_fine">磨皮</string> <string name="beauty_box_heavy_blur_fine">磨皮</string>
<string name="beauty_box_color_level">美白</string> <string name="beauty_box_color_level">美白</string>
<string name="beauty_box_red_level">红润</string> <string name="beauty_box_red_level">紅潤</string>
<string name="beauty_box_sharpen">锐化</string> <string name="beauty_box_sharpen">銳化</string>
<string name="beauty_box_eye_bright">亮眼</string> <string name="beauty_box_eye_bright">亮眼</string>
<string name="beauty_box_tooth_whiten">美牙</string> <string name="beauty_box_tooth_whiten">美牙</string>
<string name="beauty_box_eye_enlarge">大眼</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_natural">自然</string>
<string name="beauty_box_cheek_goddess">女神</string> <string name="beauty_box_cheek_goddess">女神</string>
<string name="beauty_box_cheek_long_face">长脸</string> <string name="beauty_box_cheek_long_face">長臉</string>
<string name="beauty_box_cheek_round_face">圆脸</string> <string name="beauty_box_cheek_round_face">圓臉</string>
<string name="beauty_box_cheek_thinning">瘦脸</string> <string name="beauty_box_cheek_thinning">瘦臉</string>
<string name="beauty_box_cheek_v">V脸</string> <string name="beauty_box_cheek_v">V臉</string>
<string name="beauty_box_cheek_narrow">窄脸</string> <string name="beauty_box_cheek_narrow">窄臉</string>
<string name="beauty_box_cheek_short">短脸</string> <string name="beauty_box_cheek_short">短臉</string>
<string name="beauty_box_cheek_small">小脸</string> <string name="beauty_box_cheek_small">小臉</string>
<string name="beauty_box_intensity_chin">下巴</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_nose">瘦鼻</string>
<string name="beauty_box_intensity_mouth">嘴型</string> <string name="beauty_box_intensity_mouth">嘴型</string>
<string name="beauty_box_cheekbones">瘦颧骨</string> <string name="beauty_box_cheekbones">瘦顴骨</string>
<string name="beauty_box_lower_jaw">瘦下颌骨</string> <string name="beauty_box_lower_jaw">瘦下頜骨</string>
<string name="beauty_radio_skin_beauty">美肤</string> <string name="beauty_radio_skin_beauty">美膚</string>
<string name="beauty_radio_face_shape">美型</string> <string name="beauty_radio_face_shape">美型</string>
<string name="beauty_radio_filter">滤镜</string> <string name="beauty_radio_filter">濾鏡</string>
<string name="beauty_radio_style">风格推荐</string> <string name="beauty_radio_style">風格推薦</string>
<string name="beauty_micro_pouch">去黑眼圈</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_micro_smile">微笑嘴角</string>
<string name="beauty_brow_height">眉毛上下</string> <string name="beauty_brow_height">眉毛上下</string>
<string name="beauty_brow_space">眉间距</string> <string name="beauty_brow_space">眉間距</string>
<string name="beauty_micro_canthus">开眼角</string> <string name="beauty_micro_canthus">開眼角</string>
<string name="beauty_micro_philtrum">缩人中</string> <string name="beauty_micro_philtrum">縮人中</string>
<string name="beauty_micro_long_nose">长鼻</string> <string name="beauty_micro_long_nose">長鼻</string>
<string name="beauty_micro_eye_space">眼距</string> <string name="beauty_micro_eye_space">眼距</string>
<string name="beauty_micro_eye_rotate">眼睛角度</string> <string name="beauty_micro_eye_rotate">眼睛角度</string>
<string name="makeup_radio_lipstick">口红</string> <string name="makeup_radio_lipstick">口紅</string>
<string name="makeup_radio_blusher">腮红</string> <string name="makeup_radio_blusher">腮紅</string>
<string name="makeup_radio_eyebrow">眉毛</string> <string name="makeup_radio_eyebrow">眉毛</string>
<string name="makeup_radio_eye_shadow">眼影</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_eyelash">睫毛</string>
<string name="makeup_radio_contact_lens">美瞳</string> <string name="makeup_radio_contact_lens">美瞳</string>
<string name="makeup_radio_foundation">粉底</string> <string name="makeup_radio_foundation">粉底</string>
<string name="makeup_radio_highlight">高光</string> <string name="makeup_radio_highlight">高光</string>
<string name="makeup_radio_shadow">阴影</string> <string name="makeup_radio_shadow">陰影</string>
<string name="makeup_radio_remove">卸妆</string> <string name="makeup_radio_remove">卸妝</string>
<string name="makeup_customize">自定义</string> <string name="makeup_customize">自定義</string>
<string name="makeup_peach_blossom">桃花</string> <string name="makeup_peach_blossom">桃花</string>
<string name="makeup_boyfriend">男友</string> <string name="makeup_boyfriend">男友</string>
<string name="makeup_clear">清透</string> <string name="makeup_clear">清透</string>
<string name="makeup_grapefruit">西柚</string> <string name="makeup_grapefruit">西柚</string>
<string name="select_data_photo">选择图片</string> <string name="select_data_photo">選擇圖片</string>
<string name="select_data_video">选择视频</string> <string name="select_data_video">選擇視頻</string>
<string name="select_data_title">请从相册中选择图片或视频</string> <string name="select_data_title">請從相冊中選擇圖片或視頻</string>
<string name="image_file_does_not_exist">所选图片文件不存在。</string> <string name="image_file_does_not_exist">所選圖片文件不存在。</string>
<string name="video_file_does_not_exist">所选视频文件不存在。</string> <string name="video_file_does_not_exist">所選視頻文件不存在。</string>
<string name="future_warrior">张嘴试试</string> <string name="future_warrior">張嘴試試</string>
<string name="jet_mask">鼓腮帮子</string> <string name="jet_mask">鼓腮幫子</string>
<string name="sdx2">皱眉试试</string> <string name="sdx2">皺眉試試</string>
<string name="luhantongkuan_ztt_fu">眨一眨眼</string> <string name="luhantongkuan_ztt_fu">眨一眨眼</string>
<string name="qingqing_ztt_fu">嘟嘴试试</string> <string name="qingqing_ztt_fu">嘟嘴試試</string>
<string name="xiaobianzi_zh_fu">微笑触发</string> <string name="xiaobianzi_zh_fu">微笑觸發</string>
<string name="xiaoxueshen_ztt_fu">吹气触发</string> <string name="xiaoxueshen_ztt_fu">吹氣觸發</string>
<string name="hez_ztt_fu">张嘴试试</string> <string name="hez_ztt_fu">張嘴試試</string>
<string name="push_hand">推出手掌</string> <string name="push_hand">推出手掌</string>
<string name="fu_lm_koreaheart">单手手指比心</string> <string name="fu_lm_koreaheart">單手手指比心</string>
<string name="ssd_thread_six">比个六</string> <string name="ssd_thread_six">比個六</string>
<string name="ssd_thread_cute">双拳靠近脸颊卖萌</string> <string name="ssd_thread_cute">雙拳靠近臉頰賣萌</string>
<string name="origin">原图</string> <string name="origin">原圖</string>
<string name="bailiang_1">白亮 1</string> <string name="bailiang_1">白亮 1</string>
<string name="bailiang_2">白亮 2</string> <string name="bailiang_2">白亮 2</string>
<string name="bailiang_3">白亮 3</string> <string name="bailiang_3">白亮 3</string>
@ -109,23 +109,23 @@
<string name="xiaoqingxin_3">小清新 3</string> <string name="xiaoqingxin_3">小清新 3</string>
<string name="xiaoqingxin_4">小清新 4</string> <string name="xiaoqingxin_4">小清新 4</string>
<string name="xiaoqingxin_6">小清新 6</string> <string name="xiaoqingxin_6">小清新 6</string>
<string name="lengsediao_1">冷色调 1</string> <string name="lengsediao_1">冷色調 1</string>
<string name="lengsediao_2">冷色调 2</string> <string name="lengsediao_2">冷色調 2</string>
<string name="lengsediao_3">冷色调 3</string> <string name="lengsediao_3">冷色調 3</string>
<string name="lengsediao_4">冷色调 4</string> <string name="lengsediao_4">冷色調 4</string>
<string name="lengsediao_7">冷色调 7</string> <string name="lengsediao_7">冷色調 7</string>
<string name="lengsediao_8">冷色调 8</string> <string name="lengsediao_8">冷色調 8</string>
<string name="lengsediao_11">冷色调 11</string> <string name="lengsediao_11">冷色調 11</string>
<string name="nuansediao_1">暖色调 1</string> <string name="nuansediao_1">暖色調 1</string>
<string name="nuansediao_2">暖色调 2</string> <string name="nuansediao_2">暖色調 2</string>
<string name="gexing_1">个性 1</string> <string name="gexing_1">個性 1</string>
<string name="gexing_2">个性 2</string> <string name="gexing_2">個性 2</string>
<string name="gexing_3">个性 3</string> <string name="gexing_3">個性 3</string>
<string name="gexing_4">个性 4</string> <string name="gexing_4">個性 4</string>
<string name="gexing_5">个性 5</string> <string name="gexing_5">個性 5</string>
<string name="gexing_7">个性 7</string> <string name="gexing_7">個性 7</string>
<string name="gexing_10">个性 10</string> <string name="gexing_10">個性 10</string>
<string name="gexing_11">个性 11</string> <string name="gexing_11">個性 11</string>
<string name="heibai_1">黑白 1</string> <string name="heibai_1">黑白 1</string>
<string name="heibai_2">黑白 2</string> <string name="heibai_2">黑白 2</string>
<string name="heibai_3">黑白 3</string> <string name="heibai_3">黑白 3</string>
@ -138,14 +138,14 @@
<string name="ziran_6">自然 6</string> <string name="ziran_6">自然 6</string>
<string name="ziran_7">自然 7</string> <string name="ziran_7">自然 7</string>
<string name="ziran_8">自然 8</string> <string name="ziran_8">自然 8</string>
<string name="zhiganhui_1">质感灰 1</string> <string name="zhiganhui_1">質感灰 1</string>
<string name="zhiganhui_2">质感灰 2</string> <string name="zhiganhui_2">質感灰 2</string>
<string name="zhiganhui_3">质感灰 3</string> <string name="zhiganhui_3">質感灰 3</string>
<string name="zhiganhui_4">质感灰 4</string> <string name="zhiganhui_4">質感灰 4</string>
<string name="zhiganhui_5">质感灰 5</string> <string name="zhiganhui_5">質感灰 5</string>
<string name="zhiganhui_6">质感灰 6</string> <string name="zhiganhui_6">質感灰 6</string>
<string name="zhiganhui_7">质感灰 7</string> <string name="zhiganhui_7">質感灰 7</string>
<string name="zhiganhui_8">质感灰 8</string> <string name="zhiganhui_8">質感灰 8</string>
<string name="mitao_1">蜜桃 1</string> <string name="mitao_1">蜜桃 1</string>
<string name="mitao_2">蜜桃 2</string> <string name="mitao_2">蜜桃 2</string>
<string name="mitao_3">蜜桃 3</string> <string name="mitao_3">蜜桃 3</string>
@ -155,85 +155,85 @@
<string name="mitao_7">蜜桃 7</string> <string name="mitao_7">蜜桃 7</string>
<string name="mitao_8">蜜桃 8</string> <string name="mitao_8">蜜桃 8</string>
<string name="beauty_face_style_none">无</string> <string name="beauty_face_style_none">無</string>
<string name="beauty_face_style_1">风格 1</string> <string name="beauty_face_style_1">風格 1</string>
<string name="beauty_face_style_2">风格 2</string> <string name="beauty_face_style_2">風格 2</string>
<string name="beauty_face_style_3">风格 3</string> <string name="beauty_face_style_3">風格 3</string>
<string name="beauty_face_style_4">风格 4</string> <string name="beauty_face_style_4">風格 4</string>
<string name="beauty_face_style_5">风格 5</string> <string name="beauty_face_style_5">風格 5</string>
<string name="beauty_face_style_6">风格 6</string> <string name="beauty_face_style_6">風格 6</string>
<string name="beauty_face_style_7">风格 7</string> <string name="beauty_face_style_7">風格 7</string>
<string name="beauty_face_style_toast">使用%s先取消“风格推荐”</string> <string name="beauty_face_style_toast">使用%s先取消“風格推薦”</string>
<string name="poster_take_photo">对准线框 正脸拍摄</string> <string name="poster_take_photo">對準線框 正臉拍攝</string>
<string name="poster_change_face_error">替换失败</string> <string name="poster_change_face_error">替換失敗</string>
<string name="poster_template_face_none">未识别模板的人脸，请重新选择模板</string> <string name="poster_template_face_none">未識別模板的人臉，請重新選擇模板</string>
<string name="dialog_no_track_face">未检测到人脸，请重新拍摄</string> <string name="dialog_no_track_face">未檢測到人臉，請重新拍攝</string>
<string name="dialog_no_incomplete_face">人脸不全，请重新拍摄</string> <string name="dialog_no_incomplete_face">人臉不全，請重新拍攝</string>
<string name="dialog_face_rotation_not_valid">人脸偏转角度过大，请正脸拍摄。</string> <string name="dialog_face_rotation_not_valid">人臉偏轉角度過大，請正臉拍攝。</string>
<string name="dialog_got">知道啦</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="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="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_hair">髮型</string>
<string name="avatar_face_face">脸型</string> <string name="avatar_face_face">臉型</string>
<string name="avatar_face_eye">眼睛</string> <string name="avatar_face_eye">眼睛</string>
<string name="avatar_face_lip">嘴唇</string> <string name="avatar_face_lip">嘴唇</string>
<string name="avatar_face_nose">鼻子</string> <string name="avatar_face_nose">鼻子</string>
<string name="avatar_face_length">脸型长度</string> <string name="avatar_face_length">臉型長度</string>
<string name="avatar_face_width">脸颊宽度</string> <string name="avatar_face_width">臉頰寬度</string>
<string name="avatar_chin_width">下颚宽度</string> <string name="avatar_chin_width">下顎寬度</string>
<string name="avatar_chin_height">下巴高低</string> <string name="avatar_chin_height">下巴高低</string>
<string name="avatar_eye_position">眼睛位置</string> <string name="avatar_eye_position">眼睛位置</string>
<string name="avatar_eye_corner_height">眼角高度</string> <string name="avatar_eye_corner_height">眼角高度</string>
<string name="avatar_eye_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_position">鼻子位置</string>
<string name="avatar_nose_width">鼻翼宽窄</string> <string name="avatar_nose_width">鼻翼寬窄</string>
<string name="avatar_nose_height">鼻头高低</string> <string name="avatar_nose_height">鼻頭高低</string>
<string name="avatar_mouth_position">嘴部位置</string> <string name="avatar_mouth_position">嘴部位置</string>
<string name="avatar_up_lip_thickness">上唇厚度</string> <string name="avatar_up_lip_thickness">上唇厚度</string>
<string name="avatar_down_lip_thickness">下唇厚度</string> <string name="avatar_down_lip_thickness">下唇厚度</string>
<string name="avatar_lip_width">嘴唇宽度</string> <string name="avatar_lip_width">嘴唇寬度</string>
<string name="model_empty_tip">你还没有创建过模型哦</string> <string name="model_empty_tip">你還沒有創建過模型哦</string>
<string name="dialog_reset_avatar_model">是否将所有参数恢复到默认值?</string> <string name="dialog_reset_avatar_model">是否將所有參數恢復到默認值?</string>
<string name="avatar_face_customize">自定义</string> <string name="avatar_face_customize">自定義</string>
<string name="avatar_save_succeed">保存成功</string> <string name="avatar_save_succeed">保存成功</string>
<string name="live_photo_back_not_save">返回后当前操作将不会被保存哦</string> <string name="live_photo_back_not_save">返回后當前操作將不會被保存哦</string>
<string name="live_photo_btn_delete">删除</string> <string name="live_photo_btn_delete">刪除</string>
<string name="live_photo_btn_cancel">取消</string> <string name="live_photo_btn_cancel">取消</string>
<string name="live_photo_btn_delete_">删除(%d)</string> <string name="live_photo_btn_delete_">刪除(%d)</string>
<string name="live_photo_delete_effect">删除道具</string> <string name="live_photo_delete_effect">刪除道具</string>
<string name="live_photo__delete_all">全选</string> <string name="live_photo__delete_all">全選</string>
<string name="live_photo_empty_list_tip">你还没有创建过道具哦</string> <string name="live_photo_empty_list_tip">你還沒有創建過道具哦</string>
<string name="confirm">确定</string> <string name="confirm">確定</string>
<string name="cancel">取消</string> <string name="cancel">取消</string>
<string name="dialog_confirm_delete">确定删除所选中的道具？</string> <string name="dialog_confirm_delete">確定刪除所選中的道具？</string>
<string name="toast_delete_succeed">删除成功</string> <string name="toast_delete_succeed">刪除成功</string>
<string name="toast_delete_failed">删除失败</string> <string name="toast_delete_failed">刪除失敗</string>
<string name="live_photo_save_succeed">道具保存成功</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_fog">霧面</string>
<string name="makeup_lip_moist1">润泽Ⅰ</string> <string name="makeup_lip_moist1">潤澤Ⅰ</string>
<string name="makeup_lip_moist2">润泽Ⅱ</string> <string name="makeup_lip_moist2">潤澤Ⅱ</string>
<string name="makeup_lip_pearl">珠光</string> <string name="makeup_lip_pearl">珠光</string>
<string name="makeup_lip_bitelip">咬唇</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_fan">扇形</string>
<string name="makeup_blusher_eye_corner">眼角</string> <string name="makeup_blusher_eye_corner">眼角</string>
<string name="makeup_blusher_slight_drunk">微醺</string> <string name="makeup_blusher_slight_drunk">微醺</string>
<string name="makeup_highlight_one">高光 I</string> <string name="makeup_highlight_one">高光 I</string>
<string name="makeup_highlight_two">高光 II</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_1">蜜糖</string>
<string name="makeup_pupil_2">奶茶</string> <string name="makeup_pupil_2">奶茶</string>
<string name="makeup_pupil_3">水波</string> <string name="makeup_pupil_3">水波</string>
@ -241,106 +241,106 @@
<string name="makeup_pupil_5">孔雀</string> <string name="makeup_pupil_5">孔雀</string>
<string name="makeup_pupil_6">星河</string> <string name="makeup_pupil_6">星河</string>
<string name="makeup_pupil_7">落目</string> <string name="makeup_pupil_7">落目</string>
<string name="makeup_pupil_8">极光</string> <string name="makeup_pupil_8">極光</string>
<string name="makeup_eyebrow_willow">柳叶眉</string> <string name="makeup_eyebrow_willow">柳恭弘=叶 恭弘眉</string>
<string name="makeup_eyebrow_wild">野生眉</string> <string name="makeup_eyebrow_wild">野生眉</string>
<string name="makeup_eyebrow_classical">古典眉</string> <string name="makeup_eyebrow_classical">古典眉</string>
<string name="makeup_eyebrow_standard">标准眉</string> <string name="makeup_eyebrow_standard">標準眉</string>
<string name="makeup_eye_shadow_single">单色眼影</string> <string name="makeup_eye_shadow_single">單色眼影</string>
<string name="makeup_eye_shadow_double1">双色眼影 I</string> <string name="makeup_eye_shadow_double1">雙色眼影 I</string>
<string name="makeup_eye_shadow_double2">双色眼影 II</string> <string name="makeup_eye_shadow_double2">雙色眼影 II</string>
<string name="makeup_eye_shadow_double3">双色眼影 III</string> <string name="makeup_eye_shadow_double3">雙色眼影 III</string>
<string name="makeup_eye_shadow_triple1">三色眼影 I</string> <string name="makeup_eye_shadow_triple1">三色眼影 I</string>
<string name="makeup_eye_shadow_triple2">三色眼影 II</string> <string name="makeup_eye_shadow_triple2">三色眼影 II</string>
<string name="makeup_eyelash_natural1">自然型 I</string> <string name="makeup_eyelash_natural1">自然型 I</string>
<string name="makeup_eyelash_natural2">自然型 II</string> <string name="makeup_eyelash_natural2">自然型 II</string>
<string name="makeup_eyelash_thick1">浓密型 I</string> <string name="makeup_eyelash_thick1">濃密型 I</string>
<string name="makeup_eyelash_thick2">浓密型 II</string> <string name="makeup_eyelash_thick2">濃密型 II</string>
<string name="makeup_eyelash_exaggerate1">夸张型 I</string> <string name="makeup_eyelash_exaggerate1">誇張型 I</string>
<string name="makeup_eyelash_exaggerate2">夸张型 II</string> <string name="makeup_eyelash_exaggerate2">誇張型 II</string>
<string name="makeup_eye_linear_cat">猫眼</string> <string name="makeup_eye_linear_cat">貓眼</string>
<string name="makeup_eye_linear_drooping">下垂眼</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_pull_close">拉近眼距</string>
<string name="makeup_eye_linear_long">长眼</string> <string name="makeup_eye_linear_long">長眼</string>
<string name="makeup_eye_linear_circular">圆眼</string> <string name="makeup_eye_linear_circular">圓眼</string>
<string name="makeup_combination_diadiatu">嗲嗲兔</string> <string name="makeup_combination_diadiatu">嗲嗲兔</string>
<string name="makeup_combination_dongling">冻龄</string> <string name="makeup_combination_dongling">凍齡</string>
<string name="makeup_combination_guofeng">国风</string> <string name="makeup_combination_guofeng">國風</string>
<string name="makeup_combination_hunxie">混血</string> <string name="makeup_combination_hunxie">混血</string>
<string name="makeup_combination_sexy">性感</string> <string name="makeup_combination_sexy">性感</string>
<string name="makeup_combination_sweet">甜美</string> <string name="makeup_combination_sweet">甜美</string>
<string name="makeup_combination_neighbor">邻家</string> <string name="makeup_combination_neighbor">鄰家</string>
<string name="makeup_combination_occident">欧美</string> <string name="makeup_combination_occident">歐美</string>
<string name="makeup_combination_charming">妩媚</string> <string name="makeup_combination_charming">嫵媚</string>
<string name="makeup_combination_jianling">减龄</string> <string name="makeup_combination_jianling">減齡</string>
<string name="makeup_combination_nuandong">暖冬</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_shaonv">少女</string>
<string name="makeup_combination_ziyun">紫韵</string> <string name="makeup_combination_ziyun">紫韻</string>
<string name="makeup_combination_yanshimao">厌世猫</string> <string name="makeup_combination_yanshimao">厭世貓</string>
<string name="makeup_combination_renyu">人鱼</string> <string name="makeup_combination_renyu">人魚</string>
<string name="makeup_combination_chuqiu">初秋</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_chaomo">超模</string>
<string name="makeup_combination_chuju">雏菊</string> <string name="makeup_combination_chuju">雛菊</string>
<string name="makeup_combination_gangfeng">港风</string> <string name="makeup_combination_gangfeng">港風</string>
<string name="makeup_combination_rose">Rose</string> <string name="makeup_combination_rose">Rose</string>
<string name="slimming">瘦身</string> <string name="slimming">瘦身</string>
<string name="long_legs">长腿</string> <string name="long_legs">長腿</string>
<string name="thin_waist">细腰</string> <string name="thin_waist">細腰</string>
<string name="beautify_shoulder">美肩</string> <string name="beautify_shoulder">美肩</string>
<string name="beautify_hip_slim">美臀</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="beautify_leg_thin_slim">瘦腿</string>
<string name="toast_not_detect_body">未检测到人体</string> <string name="toast_not_detect_body">未檢測到人體</string>
<string name="pta_human_full_body">全身驱动</string> <string name="pta_human_full_body">全身驅動</string>
<string name="pta_human_half_body">半身驱动</string> <string name="pta_human_half_body">半身驅動</string>
<string name="select_data_photo_or_video">载入图片或视频</string> <string name="select_data_photo_or_video">載入圖片或視頻</string>
<string name="toast_not_detect_gesture">未检测到手势</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_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_similarity">相似度</string>
<string name="bg_seg_green_smooth">平滑</string> <string name="bg_seg_green_smooth">平滑</string>
<string name="bg_seg_green_alpha">祛色度</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_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_classroom">教室</string>
<string name="bg_seg_green_forest">森林</string> <string name="bg_seg_green_forest">森林</string>
<string name="bg_seg_green_ink">水墨画</string> <string name="bg_seg_green_ink">水墨畫</string>
<string name="dialog_guide_bg_seg_green">请使用纯色背景拍摄，推荐绿色幕布效果最佳</string> <string name="dialog_guide_bg_seg_green">請使用純色背景拍攝，推薦綠色幕布效果最佳</string>
<string name="dialog_i_know">我知道了</string> <string name="dialog_i_know">我知道了</string>
<string name="download_error">下载失败</string> <string name="download_error">下載失敗</string>
<string name="back">返回</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_height_tips">眉毛上下功能僅支持在高端機上使用</string>
<string name="brow_space_tips">眉间距功能仅支持在高端机上使用</string> <string name="brow_space_tips">眉間距功能僅支持在高端機上使用</string>
<string name="home_function_name_beauty">美颜</string> <string name="home_function_name_beauty">美顏</string>
<string name="home_function_name_makeup">美妆</string> <string name="home_function_name_makeup">美妝</string>
<string name="home_function_name_sticker">贴纸</string> <string name="home_function_name_sticker">貼紙</string>
<string name="home_function_name_beauty_body">美体</string> <string name="home_function_name_beauty_body">美體</string>
<string name="toast_not_detect_face">未检测到人脸</string> <string name="toast_not_detect_face">未檢測到人臉</string>
<string name="toast_not_detect_face_or_body">未检测到人脸或人体</string> <string name="toast_not_detect_face_or_body">未檢測到人臉或人體</string>
<string name="makeup_combination_naicha">奶茶</string> <string name="makeup_combination_naicha">奶茶</string>
<string name="makeup_combination_dousha">豆沙</string> <string name="makeup_combination_dousha">豆沙</string>
<string name="makeup_combination_chaoa">超A</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_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="dialog_reset">重置</string>
<string name="menu_diy">自定義</string> <string name="menu_diy">自定義</string>

64
FaceUnity/src/main/res/values/strings.xml
View File

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

2
app/src/main/AndroidManifest.xml
View File

@ -62,6 +62,8 @@
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.FLASHLIGHT" /> <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_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission <uses-permission

9
common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java
View File

@ -49,6 +49,15 @@ public class ProcessImageUtil extends ProcessResultUtil {
Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE,
}; };
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
mCameraPermissions = new String[]{
Manifest.permission.READ_MEDIA_IMAGES,
Manifest.permission.CAMERA
};
mAlumbPermissions = new String[]{
Manifest.permission.READ_MEDIA_IMAGES,
};
}
mCameraPermissionCallback = new Runnable() { mCameraPermissionCallback = new Runnable() {
@Override @Override
public void run() { public void run() {

1
common/src/main/res/layout/dialog_live_gift_popup.xml
View File

@ -7,6 +7,7 @@
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:id="@+id/overlay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"> android:layout_weight="1">

6
config.gradle
View File

@ -4,14 +4,14 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 33, targetSdkVersion : 33,
versionCode : 445, versionCode : 447,
versionName : "6.5.4" versionName : "6.5.4"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、
// serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
serverHost : " https://ceshi.yaoulive.com", // serverHost : " https://ceshi.yaoulive.com",

43
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
View File

@ -3,6 +3,7 @@ package com.yunbao.live.dialog;
import static com.yunbao.common.CommonAppConfig.isGetNewWrap; import static com.yunbao.common.CommonAppConfig.isGetNewWrap;
import static com.yunbao.common.utils.RouteUtil.PATH_COIN; import static com.yunbao.common.utils.RouteUtil.PATH_COIN;
import android.annotation.SuppressLint;
import android.app.Dialog; import android.app.Dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.graphics.Color; import android.graphics.Color;
@ -15,6 +16,7 @@ import android.text.TextUtils;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.util.Log; import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
@ -103,7 +105,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
private TextView diamondText, goldText, liveWrap, vipGoldDesc, vipGoldTitle, giftNumber; private TextView diamondText, goldText, liveWrap, vipGoldDesc, vipGoldTitle, giftNumber;
private RecyclerView giftTitle; private RecyclerView giftTitle;
private GiftTitleAdapter giftTitleAdapter; private GiftTitleAdapter giftTitleAdapter;
private FrameLayout contextLayoutGift; private FrameLayout contextLayoutGift, overlay;
private String mStream, mLiveUid; private String mStream, mLiveUid;
private FrameLayout blindBox, frameBlindTop, noNobility, giftNumberLayout, giftSendLayout, namingLayout; private FrameLayout blindBox, frameBlindTop, noNobility, giftNumberLayout, giftSendLayout, namingLayout;
private ProgressBar progressBlind, progressBlind1, progressBlind2; private ProgressBar progressBlind, progressBlind1, progressBlind2;
@ -140,7 +142,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
Bus.getOff(this); Bus.getOff(this);
} }
@SuppressLint("ClickableViewAccessibility")
private void initView() { private void initView() {
gitBackground = mRootView.findViewById(R.id.git_background2); gitBackground = mRootView.findViewById(R.id.git_background2);
contextLayoutGift = mRootView.findViewById(R.id.context_layout_gift); contextLayoutGift = mRootView.findViewById(R.id.context_layout_gift);
@ -182,6 +184,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
leaveHint = mRootView.findViewById(R.id.leave_hint); leaveHint = mRootView.findViewById(R.id.leave_hint);
progressBar = mRootView.findViewById(R.id.progressBar); progressBar = mRootView.findViewById(R.id.progressBar);
levelingLayout = mRootView.findViewById(R.id.leveling_layout); levelingLayout = mRootView.findViewById(R.id.leveling_layout);
overlay = mRootView.findViewById(R.id.overlay);
namingLayout.setVisibility(View.GONE); namingLayout.setVisibility(View.GONE);
//设置礼物弹窗背景 //设置礼物弹窗背景
ImgLoader.displayBlurLive(getContext(), R.drawable.backgroud_custom_gift2, gitBackground); ImgLoader.displayBlurLive(getContext(), R.drawable.backgroud_custom_gift2, gitBackground);
@ -199,6 +202,27 @@ public class LiveGiftPopup extends AbsDialogFragment {
giftDescription.setVisibility(View.GONE); giftDescription.setVisibility(View.GONE);
operateImage.setVisibility(View.GONE); operateImage.setVisibility(View.GONE);
levelingLayout.setVisibility(View.VISIBLE); levelingLayout.setVisibility(View.VISIBLE);
updateOverlayVisibility();
blindBox.setOnTouchListener((v, event) -> {
if(event.getAction()==MotionEvent.ACTION_UP) {
v.performClick();
}
return true;
});
namingLayout.setOnTouchListener((v, event) -> {
if(event.getAction()==MotionEvent.ACTION_UP) {
v.performClick();
}
return true;
});
operateImage.setOnTouchListener((v, event) -> {
if(event.getAction()==MotionEvent.ACTION_UP) {
v.performClick();
}
return true;
});
overlay.setOnClickListener(v -> dismiss());
//点击包裹 //点击包裹
ViewClicksAntiShake.clicksAntiShake(liveWrap, new ViewClicksAntiShake.ViewClicksCallBack() { ViewClicksAntiShake.clicksAntiShake(liveWrap, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override @Override
@ -460,7 +484,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
int nextLeve = Integer.parseInt(coinModel.getUserNextLevelRewards()); int nextLeve = Integer.parseInt(coinModel.getUserNextLevelRewards());
BigDecimal maxLeve = new BigDecimal(coinModel.getUserLevelUpgrades()).add( new BigDecimal(coinModel.getUserLevelCurrentConsumption())); BigDecimal maxLeve = new BigDecimal(coinModel.getUserLevelUpgrades()).add(new BigDecimal(coinModel.getUserLevelCurrentConsumption()));
try { try {
String leveNext = String.valueOf(nextLeve); String leveNext = String.valueOf(nextLeve);
String userNextLevel = coinModel.getUserLevelUpgrades(); String userNextLevel = coinModel.getUserLevelUpgrades();
@ -731,7 +755,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onLiveGiftItemEvent(LiveGiftItemEvent event) { public void onLiveGiftItemEvent(LiveGiftItemEvent event) {
liveGiftModel = event.getLiveGiftModel(); liveGiftModel = event.getLiveGiftModel();
updateOverlayVisibility();
if (!TextUtils.isEmpty(liveGiftModel.getNamingLiveuid()) && if (!TextUtils.isEmpty(liveGiftModel.getNamingLiveuid()) &&
!TextUtils.isEmpty(liveGiftModel.getNamingUid()) && !TextUtils.isEmpty(liveGiftModel.getNamingUid()) &&
!TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") && !TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") &&
@ -1240,4 +1264,15 @@ public class LiveGiftPopup extends AbsDialogFragment {
} }
} }
private void updateOverlayVisibility() {
/* if (
blindBox.getVisibility() == View.VISIBLE ||
operateImage.getVisibility() == View.VISIBLE ||
namingLayout.getVisibility() == View.VISIBLE
) {
overlay.setVisibility(View.VISIBLE);
} else {
overlay.setVisibility(View.GONE);
}*/
}
} }

29
main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
View File

@ -6,6 +6,7 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.app.Dialog; import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.view.Gravity; import android.view.Gravity;
@ -160,12 +161,22 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
public void onLiveClick() { public void onLiveClick() {
boolean isAnchor = IMLoginManager.get(mContext).getUserInfo().anchorUserType(); boolean isAnchor = IMLoginManager.get(mContext).getUserInfo().anchorUserType();
if (isAnchor) { if (isAnchor) {
mProcessResultUtil.requestPermissions(new String[]{ String[] permissions;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
permissions=new String[]{
Manifest.permission.READ_MEDIA_IMAGES,
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO
};
}else{
permissions=new String[]{
Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA, Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO Manifest.permission.RECORD_AUDIO
}, mStartLiveRunnable); };
}
mProcessResultUtil.requestPermissions(permissions, mStartLiveRunnable);
} else { } else {
ToastUtil.show(getString(R.string.only_open_anchor)); ToastUtil.show(getString(R.string.only_open_anchor));
} }
@ -176,12 +187,22 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
public void onVideoClick() { public void onVideoClick() {
boolean isAnchor = IMLoginManager.get(mContext).getUserInfo().anchorUserType(); boolean isAnchor = IMLoginManager.get(mContext).getUserInfo().anchorUserType();
if (isAnchor) { if (isAnchor) {
mProcessResultUtil.requestPermissions(new String[]{ String[] permissions;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
permissions=new String[]{
Manifest.permission.READ_MEDIA_IMAGES,
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO
};
}else{
permissions=new String[]{
Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.CAMERA, Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO Manifest.permission.RECORD_AUDIO
}, mStartVideoRunnable); };
}
mProcessResultUtil.requestPermissions(permissions, mStartVideoRunnable);
} else { } else {
ToastUtil.show(getString(R.string.only_open_anchor)); ToastUtil.show(getString(R.string.only_open_anchor));
} }