增加隐私政策

148cda53 · 徐健 · 6ed85ac4 · 148cda53 · 148cda53 · 148cda53
Commit 148cda53 authored Jan 10, 2020 by 徐健
22 changed files
--- a/app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
+++ b/app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
@@ -20,8 +20,8 @@ import java.util.List;
 public final class DemoGlobalConfig implements IConfigModule {
    String APP_DOMAIN = "https://api.github.com/";
    //        public static String appEnv = YDLConstants.ENV_AUTO_TEST;
-//    public static String appEnv = YDLConstants.ENV_TEST;
+    public static String appEnv = YDLConstants.ENV_TEST;
-    public static String appEnv = YDLConstants.ENV_PROD;
+//    public static String appEnv = YDLConstants.ENV_PROD;
    @Override
    public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {

--- a/config.gradle
+++ b/config.gradle
 ext {
    kotlin_version = "1.3.21"
-    dev_mode = false
+    dev_mode = true
    ydl_app = [
            appName      : "心理咨询壹点灵",
@@ -42,17 +42,17 @@ ext {
    ydlPublishVersion = [
            // -------------- 业务模块 --------------
            //第三步 若干
-            "m-confide"       : "0.0.42.1",
+            "m-confide"       : "0.0.43",
-            "m-consultant"    : "0.0.52.1",
+            "m-consultant"    : "0.0.53",
-            "m-fm"            : "0.0.24.1",
+            "m-fm"            : "0.0.25",
-            "m-user"          : "0.0.42.1",
+            "m-user"          : "0.0.43",
-            "m-home"          : "0.0.15",
+            "m-home"          : "0.0.16",
-            "m-im"            : "0.0.6",
+            "m-im"            : "0.0.8",
-            "m-dynamic"       : "0.0.2.2",
+            "m-dynamic"       : "0.0.3",
-            "m-muse"          : "0.0.23.2",
+            "m-muse"          : "0.0.24",
-            "m-tests"         : "0.0.18.2",
+            "m-tests"         : "0.0.19",
-            "m-course"        : "0.0.37.2",
+            "m-course"        : "0.0.38",
            //-------------- 业务模块 API 层 --------------
            "m-audioim-api"   : "0.0.5",
@@ -64,24 +64,24 @@ ext {
            "m-tests-api"     : "0.0.1",
            "m-user-api"      : "0.0.9",
            "m-home-api"      : "0.0.3",
-            "m-im-api"        : "0.0.7",
+            "m-im-api"        : "0.0.8",
            "m-dynamic-api"   : "0.0.1",
            //-------------- 功能组件 --------------
            //第一步
-            "ydl-platform"    : "0.0.31.1",
+            "ydl-platform"    : "0.0.33.3",
            //第二步 若干
-            "ydl-webview"     : "0.0.30.1",
+            "ydl-webview"     : "0.0.32.2",
-            "ydl-media"       : "0.0.15.1",
+            "ydl-media"       : "0.0.16",
-            "ydl-pay"         : "0.0.12.1",
+            "ydl-pay"         : "0.0.13",
-            "m-audioim"       : "0.0.41.1",
+            "m-audioim"       : "0.0.42",
            //以下 几乎不会动
            "router"          : "0.0.1",
            "ydl-net"         : "0.0.3.1",
            "ydl-utils"       : "0.0.3.1",
-            "ydl-flutter-base": "0.0.5.41",
+            "ydl-flutter-base": "0.0.6",
    ]
@@ -110,15 +110,15 @@ ext {
            "m-tests-api"     : "0.0.1",
            "m-user-api"      : "0.0.9",
            "m-home-api"      : "0.0.3",
-            "m-im-api"        : "0.0.7",
+            "m-im-api"        : "0.0.8",
            "m-dynamic-api"   : "0.0.1",
            //-------------- 功能组件 --------------
            //第一步
-            "ydl-platform"    : "0.0.31.1",
+            "ydl-platform"    : "0.0.33.3",
            //第二步 若干
-            "ydl-webview"     : "0.0.30.1",
+            "ydl-webview"     : "0.0.32.2",
            "ydl-media"       : "0.0.15.1",
            "ydl-pay"         : "0.0.12.1",
            "m-audioim"       : "0.0.41.1",
@@ -126,7 +126,7 @@ ext {
            //以下 几乎不会动
            "router"          : "0.0.1",
            "ydl-net"         : "0.0.3.1",
-            "ydl-utils"       : "0.0.3",
+            "ydl-utils"       : "0.0.3.1",
            "ydl-flutter-base": "0.0.5.41",
    ]

--- a/m-im/src/main/java/com/yidianling/im/bridge/P2PCustomActionHandlerImpl.java
+++ b/m-im/src/main/java/com/yidianling/im/bridge/P2PCustomActionHandlerImpl.java
@@ -126,6 +126,7 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
        docInfo.tag1 = expert.shareData.tag1;
        docInfo.doctorBriefInfoFeedbackRate = expert.doctorBriefInfo.feedbackRate;
+        docInfo.doctorBriefInfoFeedbackRateForShow = expert.doctorBriefInfo.feedbackRateForShow;
        docInfo.doctorBriefInfoHelpLong = expert.doctorBriefInfo.helpLong;
        docInfo.doctorBriefInfoOrderNum = expert.doctorBriefInfo.orderNum;
        docInfo.doctorBriefInfoSmallImage = expert.doctorBriefInfo.smallImage;

--- a/m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
+++ b/m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
@@ -478,7 +478,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
        if (TextUtils.isEmpty(server_num)) server_num = "0";
        server_num_tv.setText(server_num);
        // 好评率
-        good_num = String.format("%.1f", ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoFeedbackRate);
+        good_num = ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoFeedbackRateForShow;
        if (TextUtils.isEmpty(good_num)) good_num = "0.0";
        good_num_tv.setText(good_num);

--- a/m-im/src/main/java/com/yidianling/uikit/custom/bridge/IP2PCustomActionHandler.java
+++ b/m-im/src/main/java/com/yidianling/uikit/custom/bridge/IP2PCustomActionHandler.java
@@ -146,6 +146,7 @@ public interface IP2PCustomActionHandler {
        public String tag1 = ""; //用与获取推荐专家列表接口的参数catName
        public double doctorBriefInfoFeedbackRate = 0.000;  //好评分
+        public String doctorBriefInfoFeedbackRateForShow = "";
        public int doctorBriefInfoOrderNum = 0; //帮助人数
        public int doctorBriefInfoHelpLong = 0; //服务时长
        public String doctorBriefInfoSmallImage = ""; //小头像

--- a/m-im/src/main/modular_api/com/yidianling/im/api/bean/IMDoctorBriefInfo.java
+++ b/m-im/src/main/modular_api/com/yidianling/im/api/bean/IMDoctorBriefInfo.java
@@ -7,6 +7,7 @@ package com.yidianling.im.api.bean;
 public class IMDoctorBriefInfo {
    public String smallImage = "";
    public double feedbackRate = 0.000;
+    public String feedbackRateForShow = "";
    public int orderNum = 0;
    public int helpLong = 0;
 }
--- a/m-im/src/main/res/values/strings.xml
+++ b/m-im/src/main/res/values/strings.xml
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
    <string name="im_app_name">云信 Demo</string>
    <string name="im_network_is_not_available">网络连接失败，请检查你的网络设置</string>
    <!-- session -->
    <string name="im_input_panel_audio_call">语音通话</string>
    <string name="im_input_panel_video_call">视频通话</string>
    <string name="im_input_panel_help">帮 助</string>
    <string name="im_input_panel_send_card">发送客服名片</string>
    <string name="im_input_panel_make_collections">发起收款</string>
    <!-- 云信SDK所需文案 -->
    <string name="im_nim_status_bar_multi_messages_incoming">%1$d位联系人有新消息</string>
    <string name="im_nim_status_bar_ticker_text">%1$s有新消息</string>
    <string name="im_nim_status_bar_image_message">%1$s发来一条图片消息</string>
    <string name="im_nim_status_bar_audio_message">%1$s发来一条语音消息</string>
    <string name="im_nim_status_bar_video_message">%1$s发来一条视频消息</string>
    <string name="im_nim_status_bar_file_message">%1$s发来一条文件消息</string>
    <string name="im_nim_status_bar_location_message">%1$s分享了一个地理位置</string>
    <string name="im_nim_status_bar_notification_message">%1$s: 通知消息</string>
    <string name="im_nim_status_bar_custom_message">%1$s: 自定义消息</string>
    <string name="im_nim_status_bar_unsupported_message">%1$s: 无法显示该内容</string>
    <string name="im_nim_status_bar_hidden_msg_content">你收到一条新消息</string>
    <string name="im_details">了解详情</string>
    <string name="im_input_panel_order">查看订单</string>
    <string name="im_input_redpacket_action_text">红包</string>
    <string name="im_input_panel_video_h5">电话/视频</string>
    <string name="im_push_confide_msg_unopened">咨询师未开通倾诉服务</string>
    <string name="im_push_confide_msg_offline">咨询师离线中，请私聊喊他上线</string>
    <string name="im_push_confide_msg_busy">咨询师无可约时段，请私聊他增加新时段</string>
    <string name="im_push_confide_msg_calling">咨询师正在通话中，请稍后再试</string>
    <string name="im_approval">知道了</string>
    <!--====================RES_AVCHAT====================-->
    <!--====================RES_AVCHAT====================-->
    <!--====================RES_AVCHAT====================-->
    <string name="im_cancel">取消</string>
    <string name="im_ok">确定</string>
    <string name="im_empty">""</string>
    <string name="im_save">保存</string>
    <string name="im_online">正在直播</string>
    <string name="im_loading">正在加载中...</string>
    <string name="im_load_failed">加载失败，请点我重试</string>
    <string name="im_load_end">没有更多数据</string>w
    <string name="im_avchat_hangup">结束通话</string>
    <string name="im_avchat_switch_to_video">切换视频</string>
    <string name="im_avchat_switch_to_audio">切换语音</string>
    <string name="im_avchat_video_call_request">请求视频聊天…</string>
    <string name="im_avchat_audio_call_wifi_unavailable_tip">当前非WiFi环境，每分钟将产生约0.5M的流量</string>
    <string name="im_avchat_network_grade_0">网络通畅：</string>
    <string name="im_avchat_network_grade_1">网络正常：</string>
    <string name="im_avchat_network_grade_2">网络一般：</string>
    <string name="im_avchat_network_grade_3">网络较差：</string>
    <string name="im_avchat_refuse">拒绝</string>
    <string name="im_avchat_receive">开启</string>
    <string name="im_avchat_pickup">接听</string>
    <string name="im_avchat_net_error_then_quit">网络异常，通话结束</string>
    <string name="im_avchat_call_finish">通话结束</string>
    <string name="im_avchat_call_reject">被对方拒绝</string>
    <string name="im_avchat_peer_protocol_low_version">对方版本过低，请提示对方升级</string>
    <string name="im_avchat_local_protocol_low_version">版本过低，请升级后使用</string>
    <string name="im_avchat_invalid_channel_id">对方已挂断</string>
    <string name="im_avchat_local_call_busy">本地通话中，无法使用易信进行通话。</string>
    <string name="im_avchat_peer_busy">对方正在通话中，请稍后再拨。</string>
    <string name="im_avchat_wait_recieve">等待对方接听…</string>
    <string name="im_avchat_audio_call_request">请求通话</string>
    <string name="im_avchat_connecting">连接中…</string>
    <string name="im_avchat_network_unstable_notificaton">当前网络不稳定</string>
    <string name="im_avchat_peer_close_camera">对方关闭了摄像头</string>
    <string name="im_avchat_local_close_camera">你关闭了摄像头</string>
    <string name="im_avchat_audio_to_video_wait">正在等待对方开启摄像头…</string>
    <string name="im_avchat_no_pick_up">未接听</string>
    <string name="im_avchat_has_hangup">已挂断</string>
    <string name="im_avchat_switch_video_reject">对方不同意音频切换为视频！</string>
    <string name="im_avchat_notification">正在与%1$s通话中，点击继续</string>
    <string name="im_avchat_call">网络通话</string>
    <string name="im_avchat_no_pickup_call">未接听</string>
    <string name="im_avchat_call_failed">发起通话失败</string>
    <string name="im_avchat_no_permission">暂无权限，请开通音视频服务</string>
    <string name="im_avchat_in_switch">请耐心等待！</string>
    <string name="im_t_avchat_not_start_with_less_member">无法发起，人数少于2人</string>
    <string name="im_t_avchat_start">发起了视频聊天</string>
    <string name="im_t_avchat_create_room_fail">创建房间失败</string>
    <string name="im_t_avchat_push_content">"[网络通话]"</string>
    <string name="im_t_avchat_join_fail_not_exist">"加入房间失败，房间不存在"</string>
    <string name="im_nrtc_setting_vie_crop_ratio_key">nrtc_setting_vie_crop_ratio_key</string>
    <string name="im_nrtc_setting_vie_quality_key">nrtc_setting_vie_quality_key</string>
    <string name="im_nrtc_setting_other_device_default_rotation_key">nrtc_setting_other_device_default_rotation_key</string>
    <string name="im_nrtc_setting_other_device_rotation_fixed_offset_key">nrtc_setting_other_device_rotation_fixed_offset_key</string>
    <string name="im_nrtc_setting_vie_rotation_key">nrtc_setting_vie_rotation_key</string>
    <string name="im_nrtc_setting_vie_hw_encoder_key">nrtc_setting_vie_hw_encoder_key</string>
    <string name="im_nrtc_setting_vie_hw_decoder_key">nrtc_setting_vie_hw_decoder_key</string>
    <string name="im_nrtc_setting_other_server_record_audio_key">nrtc_setting_other_server_record_audio_key</string>
    <string name="im_nrtc_setting_other_server_record_video_key">nrtc_setting_other_server_record_video_key</string>
    <string name="im_nrtc_setting_voe_call_proximity_key">nrtc_setting_voe_call_proximity_key</string>
    <string name="im_nrtc_setting_vie_fps_reported_key">nrtc_setting_vie_fps_reported_key</string>
    <string name="im_nrtc_setting_vie_max_bitrate_key">nrtc_setting_vie_max_bitrate_key</string>
    <string name="im_nrtc_setting_voe_audio_aec_key">nrtc_setting_voe_audio_aec_key</string>
    <string name="im_nrtc_setting_voe_audio_ns_key">nrtc_setting_voe_audio_ns_key</string>
    <string name="im_nrtc_setting_voe_high_quality_key">nrtc_setting_voe_high_quality_key</string>
    <!--====================RES_UIKIT====================-->
    <!--====================RES_UIKIT====================-->
    <!--====================RES_UIKIT====================-->
    <string name="im_clear_empty">清空</string>
    <string name="im_iknow">知道了</string>
    <string name="im_search">搜索</string>
    <string name="im_remove">移除</string>
    <string name="im_add">添加</string>
    <string name="im_create">新建</string>
    <string name="im_without_content">暂无</string>
    <string name="im_close">关闭</string>
    <string name="im_menu">菜单</string>
    <string name="im_now_allow_space">不能含有空格</string>
    <string name="im_readed">已读</string>
    <string name="im_input_panel_photo">图 片</string>
    <string name="im_input_panel_video">视 频</string>
    <string name="im_input_panel_take">拍 摄</string>
    <string name="im_repeat_download_message">重新下载?</string>
    <string name="im_repeat_send_has_blank">重 发</string>
    <string name="im_repeat_send_message">重发消息?</string>
    <string name="im_copy_has_blank">复 制</string>
    <string name="im_delete_has_blank">删 除</string>
    <string name="im_voice_to_text">转文字</string>
    <string name="im_forward_to_person">转发到个人</string>
    <string name="im_forward_to_team">转发到群组</string>
    <string name="im_withdrawn_msg">撤 回</string>
    <string name="im_save_to_device">保存到手机</string>
    <string name="im_picture_save_fail">图片保存失败</string>
    <string name="im_picture_save_to">图片已保存到手机</string>
    <string name="im_trans_voice_failed">语音转化失败</string>
    <string name="im_team_invalid_tip">您已退出该群</string>
    <string name="im_normal_team_invalid_tip">您已退出该讨论组</string>
    <string name="im_team_send_message_not_allow">您已不在该群，不能发送消息</string>
    <string name="im_send">发送</string>
    <string name="im_unsupport_title">无法显示该内容</string>
    <string name="im_unsupport_desc">客户端版本不支持该内容</string>
    <string name="im_revoke_failed">发送时间超过2分钟的消息，不能被撤回</string>
    <string name="im_pic_and_video">图片和视频</string>
    <string name="im_black_list_send_tip">消息已发送，但对方拒收</string>
    <!-- 语音 -->
    <string name="im_record_audio">按住 说话</string>
    <string name="im_record_audio_end">松开  结束</string>
    <string name="im_sdcard_not_exist_error">请插入SD卡</string>
    <string name="im_recording_error">录音失败，请重试</string>
    <string name="im_recording_cancel">手指上滑，取消发送</string>
    <string name="im_timer_default">00:00</string>
    <string name="im_recording_cancel_tip">松开手指，取消发送</string>
    <string name="im_recording_max_time">录音达到最大时间，是否发送？</string>
    <!-- 拍照视频 -->
    <string name="im_gallery_invalid">你的手机没有图库程序</string>
    <string name="im_sdcard_not_enough_head_error">SD卡被拔出或存储空间不足，无法保存头像</string>
    <string name="im_sdcard_not_enough_error">存储空间不足，无法保存此次多媒体消息</string>
    <string name="im_download_video">正在下载视频</string>
    <string name="im_download_video_fail">视频下载失败,请重试</string>
    <string name="im_look_video_fail">无法播放该视频</string>
    <string name="im_look_video_fail_try_again">暂时无法播放视频，请重试</string>
    <string name="im_video_record">视频录制</string>
    <string name="im_connect_vedio_device_fail">无法连接视频设备 ，请稍候再试</string>
    <string name="im_capture_video_size_in_kb">视频文件大小为: %1$dKB,</string>
    <string name="im_capture_video_size_in_mb">视频文件大小为: %1$.2fMB,</string>
    <string name="im_is_send_video">是否发送该视频？</string>
    <string name="im_start_camera_to_record_failed">启动摄像头录制视频失败</string>
    <string name="im_stop_fail_maybe_stopped">停止失败，可能已经停止</string>
    <string name="im_video_exception">视频文件异常</string>
    <string name="im_im_choose_video_file_size_too_large">视频文件过大，系统限制为20MB</string>
    <string name="im_im_choose_video">请选择3GP MP4格式的视频文件</string>
    <string name="im_video_record_short">录制视频太短</string>
    <string name="im_download_progress_description">%1$s（%2$s/%3$s）</string>
    <!-- 联系人选择器 -->
    <string name="im_contact_selector">联系人选择器</string>
    <!-- team -->
    <string name="im_team_need_authentication">需要身份验证</string>
    <string name="im_team_allow_anyone_join">允许任何人加入</string>
    <string name="im_team_not_allow_anyone_join">不允许任何人申请加入</string>
    <string name="im_team_admin_invite">管理员邀请</string>
    <string name="im_team_everyone_invite">所有人邀请</string>
    <string name="im_team_admin_update">管理员修改</string>
    <string name="im_team_everyone_update">所有人修改</string>
    <string name="im_team_invitee_need_authen">需要验证</string>
    <string name="im_team_invitee_not_need_authen">不需要验证</string>
    <string name="im_team_notify_mute">不提醒任何消息</string>
    <string name="im_team_notify_all">提醒所有消息</string>
    <string name="im_team_notify_manager">只提醒管理员消息</string>
    <string name="im_team_nickname">群昵称</string>
    <string name="im_team_nickname_none">未填写</string>
    <string name="im_team_identity">身份</string>
    <string name="im_remove_member">移出本群</string>
    <string name="im_team_member_info">成员信息</string>
    <string name="im_team_admin">管理员</string>
    <string name="im_team_creator">群主</string>
    <string name="im_team_member">群成员</string>
    <string name="im_update_success">保存成功</string>
    <string name="im_update_failed">保存失败, code:%d</string>
    <string name="im_no_permission">没有权限</string>
    <string name="im_set_team_admin">设为管理员</string>
    <string name="im_cancel_team_admin">取消管理员</string>
    <string name="im_team_member_remove_confirm">确定要将其移出群组么?</string>
    <string name="im_team_annourcement">群公告</string>
    <string name="im_invite_member">邀请成员</string>
    <string name="im_team_name">群名称</string>
    <string name="im_team_introduce">群介绍</string>
    <string name="im_team_extension">扩展示例</string>
    <string name="im_click_set">点击设置</string>
    <string name="im_reach_team_member_capacity">成员数量不能超过%1$d</string>
    <string name="im_team_authentication">身份验证</string>
    <string name="im_team_invite">邀请他人权限</string>
    <string name="im_team_info_update">群资料修改权限</string>
    <string name="im_team_invitee_authentication">被邀请人身份验证</string>
    <string name="im_team_announce_title">标题</string>
    <string name="im_team_announce_content">公告内容</string>
    <string name="im_team_announce_notice">请输入群公告标题</string>
    <string name="im_my_team_card">我的群名片</string>
    <string name="im_team_introduce_hint">点击填写群介绍</string>
    <string name="im_team_extension_hint">点击修改扩展内容</string>
    <string name="im_team_announce_hint">点击填写群公告</string>
    <string name="im_team_notification_config">消息提醒</string>
    <string name="im_team_transfer_without_member">没有可转移的群成员</string>
    <string name="im_team_invite_members_success">群成员邀请已发出</string>
    <string name="im_team_transfer_success">群转移成功</string>
    <string name="im_team_transfer_failed">群转移失败</string>
    <string name="im_quit_team_success">您已退群</string>
    <string name="im_quit_team_failed">退群失败</string>
    <string name="im_quit_normal_team_success">您已经退出讨论组</string>
    <string name="im_quit_normal_team_failed">退出讨论组失败</string>
    <string name="im_dismiss_team_success">群已解散</string>
    <string name="im_dismiss_team_failed">解散群失败</string>
    <string name="im_dismiss_team">解散本群</string>
    <string name="im_transfer_team">转让群</string>
    <string name="im_quit_team">退出群</string>
    <string name="im_quit_normal_team">退出讨论组</string>
    <string name="im_team_name_toast">群名称不能为空</string>
    <string name="im_not_allow_empty">不能为空</string>
    <string name="im_team_settings_name">设置名称</string>
    <string name="im_normal_team_name">讨论组名称</string>
    <string name="im_remove_member_success">移除成员成功</string>
    <string name="im_remove_member_failed">移除成员失败</string>
    <string name="im_invite_member_success">邀请成员成功</string>
    <string name="im_invite_member_failed">邀请成员失败</string>
    <string name="im_team_settings_set_name">取个名字吧</string>
    <string name="im_team_not_exist">该群不存在</string>
    <string name="im_normal_team_not_exist">该讨论组不存在</string>
    <string name="im_mute_msg">设置禁言</string>
    <string name="im_set_head_image">设置头像</string>
    <string name="im_team_update_cancel">取消更新</string>
    <string name="im_team_update_failed">群头像设置失败</string>
    <string name="im_reach_capacity">人数已达上限</string>
    <!-- image picker -->
    <string name="im_picker_image_preview">预览</string>
    <string name="im_picker_image_send">发送</string>
    <string name="im_picker_image_folder">相册</string>
    <string name="im_picker_image_album_loading">相册加载中…</string>
    <string name="im_picker_image_album_empty">相册中没有图片！</string>
    <string name="im_picker_image_folder_info">共%d张</string>
    <string name="im_picker_image_exceed_max_image_select">最多选择%d张图片！</string>
    <string name="im_picker_image_send_select">完成（%d）</string>
    <string name="im_picker_image_preview_original">发送原图</string>
    <string name="im_picker_image_preview_original_select">发送原图（%s）</string>
    <string name="im_picker_image_error">获取图片出错</string>
    <string name="im_image_compressed_size">该原始图片大小为: %1$s,</string>
    <string name="im_unknow_size">未知大小</string>
    <string name="im_is_send_image">是否发送该原始图片？</string>
    <string name="im_multi_image_compressed_size">原始图片总大小为: %1$s,</string>
    <string name="im_is_send_multi_image">是否发送这些原始图片？</string>
    <string name="im_waitfor_image_local">正在打开相册，请稍候\u2026</string>
    <string name="im_recapture">重拍</string>
    <string name="im_image_show_error">图片显示异常</string>
    <string name="im_memory_out">内存不足</string>
    <string name="im_choose_from_photo_album">从手机相册选择</string>
    <string name="im_choose">选取</string>
    <string name="im_crop">裁剪</string>
    <string name="im_download_picture_fail">图片下载失败</string>
    <string name="im_chat_private_title">私聊须知</string>
    <string name="im_chat_pivate_content">如系统检测到涉黄、涉爆、涉政等信息，可能会封号处理并追究法律责任！</string>
    <string name="im_video_play">视频播放</string>
-</resources>
+</resources>
--- a/m-user/src/main/AndroidManifest.xml
+++ b/m-user/src/main/AndroidManifest.xml
@@ -84,6 +84,12 @@
                android:exported="true"
                android:launchMode="singleTop" />
+        <activity
+            android:name=".ui.login.SecretActivity"
+            android:theme="@style/platform_NoTitleTheme"
+            android:exported="true"
+            android:launchMode="singleTop" />
    </application>
 </manifest>
\ No newline at end of file
--- a/m-user/src/main/java/com/yidianling/user/http/UserApi.kt
+++ b/m-user/src/main/java/com/yidianling/user/http/UserApi.kt
@@ -173,4 +173,8 @@ interface UserApi {
    @POST("user/unbind_third")
    @Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
    fun unBindThirdLogin(@Body body: RequestBody): Observable<BaseResponse<Any>>
+    //获取隐私政策数据
+    @GET("site/get-privacy-content")
+    fun getSecretData(): Observable<BaseResponse<String>>
 }
\ No newline at end of file
--- a/m-user/src/main/java/com/yidianling/user/http/UserHttp.kt
+++ b/m-user/src/main/java/com/yidianling/user/http/UserHttp.kt
@@ -61,4 +61,6 @@ interface UserHttp {
    fun umLogin(activity: Activity, media: SHARE_MEDIA): Observable<ThirdLoginParam>
    fun unBindThirdLogin(param: UnBindThirdLoginParam): Observable<BaseResponse<Any>>
+    fun getSecretData(): Observable<BaseResponse<String>>
 }
\ No newline at end of file
--- a/m-user/src/main/java/com/yidianling/user/http/UserHttpImpl.kt
+++ b/m-user/src/main/java/com/yidianling/user/http/UserHttpImpl.kt
@@ -190,6 +190,10 @@ class UserHttpImpl private constructor() : UserHttp {
        return getUserApi().unBindThirdLogin(body)
    }
+    override fun getSecretData(): Observable<BaseResponse<String>> {
+        return getUserApi().getSecretData()
+    }
    private object Holder {
        val INSTANCE = UserHttpImpl()

--- a/m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
+++ b/m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
@@ -28,6 +28,7 @@ import com.umeng.socialize.bean.SHARE_MEDIA
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.utils.ActivityManager
+import com.ydl.ydlcommon.utils.SharedPreferencesEditor
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
@@ -125,6 +126,18 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
        initAuthHelper()
        initView()
        setClickEvent()
+        judgeSecretPage()
+    }
+    /**
+     * 判定是否展示隐私弹窗页面
+     */
+    private fun judgeSecretPage() {
+        var hasAgreeSecret: String = SharedPreferencesEditor.getString("hasAgreeSecret")
+        if (isFromGuide && hasAgreeSecret == "") {
+            startActivity(Intent(this, SecretActivity::class.java))
+        }
    }

--- a/m-user/src/main/java/com/yidianling/user/ui/login/SecretActivity.kt
+++ b/m-user/src/main/java/com/yidianling/user/ui/login/SecretActivity.kt
+package com.yidianling.user.ui.login
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.os.Build
+import android.os.Handler
+import android.support.design.widget.CollapsingToolbarLayout
+import android.view.KeyEvent
+import android.view.View
+import android.view.WindowManager
+import android.widget.RelativeLayout
+import com.ydl.ydlcommon.base.BaseActivity
+import com.ydl.ydlcommon.bean.StatusBarOptions
+import com.ydl.ydlcommon.utils.ActivityManager
+import com.ydl.ydlcommon.utils.SharedPreferencesEditor
+import com.ydl.ydlcommon.utils.StatusBarUtils
+import com.yidianling.common.tools.LogUtil
+import com.yidianling.common.tools.ToastUtil
+import com.yidianling.user.R
+import com.yidianling.user.UserHelper
+import com.yidianling.user.http.UserHttpImpl
+import com.yidianling.user.widget.SecretDialog
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import kotlinx.android.synthetic.main.user_activity_secret.*
+import kotlin.system.exitProcess
+/**
+ * 隐私界面
+ * author : Zhangwenchao
+ * e-mail : zhangwch@yidianling.com
+ * time   : 2018/01/10
+ */
+class SecretActivity: BaseActivity() {
+    private var secretDialog: SecretDialog? = null
+    override fun layoutResId(): Int {
+        return R.layout.user_activity_secret
+    }
+    override fun initDataAndEvent() {
+        initView()
+    }
+    private fun initView() {
+        initStatus()
+        initData()
+        user_secret_no_agree.setOnClickListener {
+            if (null == secretDialog) {
+                secretDialog = SecretDialog(this, object: SecretDialog.OnSecretDialogListener {
+                    override fun onCancel() {
+                        Handler().postDelayed({
+                            ActivityManager.finishAll()
+                            android.os.Process.killProcess(android.os.Process.myPid())
+                            exitProcess(0)
+                        }, 1000)
+                    }
+                    override fun onSure() {
+                        agreeAction()
+                    }
+                })
+                secretDialog?.show()
+            }else {
+                secretDialog?.show()
+            }
+        }
+        user_secret_agree.setOnClickListener {
+            agreeAction()
+        }
+    }
+    @SuppressLint("CheckResult")
+    private fun initData() {
+        UserHttpImpl.getInstance().getSecretData()
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .doOnSubscribe { (this as BaseActivity).showProgressDialog() }
+            .doAfterTerminate {
+                (this as BaseActivity).dismissProgressDialog()
+            }
+            .subscribe({
+                if (it.code == 0) {
+                    if (null != user_secret_desc) {
+                        user_secret_desc.text = it.data
+                    }
+                }
+            }, {
+                ToastUtil.toastShort(R.string.platform_network_error)
+            })
+    }
+    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            return false
+        }
+        return super.onKeyDown(keyCode, event)
+    }
+    private fun initStatus() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {//4.4以下不支持状态栏变色
+            StatusBarUtils.setTransparentForImageView(this, null)
+            StatusBarUtils.statusBarLightMode(this)
+        }
+    }
+    private fun agreeAction() {
+        SharedPreferencesEditor.putString("hasAgreeSecret", "true")
+        finish()
+    }
+}
\ No newline at end of file
--- a/m-user/src/main/java/com/yidianling/user/widget/SecretDialog.kt
+++ b/m-user/src/main/java/com/yidianling/user/widget/SecretDialog.kt
+package com.yidianling.user.widget
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.Gravity
+import android.view.WindowManager
+import com.yidianling.user.R
+import kotlinx.android.synthetic.main.user_secret_dialog_layout.*
+class SecretDialog(context: Context, private val listener: OnSecretDialogListener?): Dialog(context, R.style.platform_dialog_default_style) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.user_secret_dialog_layout)
+        val params = window.attributes
+        params.width = WindowManager.LayoutParams.MATCH_PARENT
+        params.height = WindowManager.LayoutParams.WRAP_CONTENT
+        window.setGravity(Gravity.CENTER)
+        window.attributes = params
+        user_secret_dialog_agree.setOnClickListener {
+            listener?.onSure()
+        }
+        user_secret_dialog_no_agree.setOnClickListener {
+            listener?.onCancel()
+        }
+    }
+    interface OnSecretDialogListener {
+        fun onCancel()
+        fun onSure()
+    }
+}
\ No newline at end of file
--- a/m-user/src/main/res/drawable-xhdpi/user_secret_top_bg.png
+++ b/m-user/src/main/res/drawable-xhdpi/user_secret_top_bg.png
--- a/m-user/src/main/res/drawable/user_secret_dialog_bg.xml
+++ b/m-user/src/main/res/drawable/user_secret_dialog_bg.xml
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="12dp"/>
+    <solid
+        android:color="#ffffff"/>
+</shape>
\ No newline at end of file
--- a/m-user/src/main/res/drawable/user_secret_left_btn_bg.xml
+++ b/m-user/src/main/res/drawable/user_secret_left_btn_bg.xml
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke android:width="0.5dp"/>
+    <corners android:radius="22dp" />
+</shape>
\ No newline at end of file
--- a/m-user/src/main/res/drawable/user_secret_right_btn_bg.xml
+++ b/m-user/src/main/res/drawable/user_secret_right_btn_bg.xml
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="22dp" />
+    <gradient
+        android:startColor="#22BFFF"
+        android:endColor="#159CEF"/>
+</shape>
\ No newline at end of file
--- a/m-user/src/main/res/layout/user_activity_secret.xml
+++ b/m-user/src/main/res/layout/user_activity_secret.xml
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="#ffffff">
+    <RelativeLayout
+        android:id="@+id/user_top_rl"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="103dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/user_secret_top_bg" />
+        <TextView
+            android:id="@+id/secrey_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="25dp"
+            android:layout_marginTop="40dp"
+            android:text="壹点灵"
+            android:textColor="#242424"
+            android:textSize="28dp"
+            android:textStyle="bold" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/secrey_title"
+            android:layout_marginLeft="25dp"
+            android:text="隐私政策概要"
+            android:textColor="#242424"
+            android:textSize="28dp"
+            android:textStyle="bold" />
+    </RelativeLayout>
+    <ScrollView
+        android:layout_below="@+id/user_top_rl"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="100dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="25dp"
+            android:layout_marginRight="25dp"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/user_secret_desc"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="30dp"
+                android:lineHeight="20dp"
+                tools:text="感谢您信任并使用壹点灵APP，\n
+我们深知个人隐私的重要性，为了您更好的使用本APP，希望您着重关注：\n\n1. 为向您提供交易相关基本功能，我们会收集、使用必要的信息;\n
+2. 基于您的明示授权，我们可能会获取您的位置(为您提供附近的咨询师等)、设备号信息(以保障您账号与交易安全)等信息，您有权拒绝或取消授权;\n
+3. 我们会采业界先进的安全措施保护您的信息安全;\n
+4. 未经您同意，我们不会从第三方处获取、共享或向其提供您的信息;\n5. 您可以查询、更正、删除您的个人信息。"
+                android:textColor="#444444"
+                android:textSize="14dp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:orientation="horizontal">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="阅读完整版"
+                    android:textColor="#444444"
+                    android:textSize="14dp" />
+                <TextView
+                    android:id="@+id/user_use_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="《用户使用协议》"
+                    android:textColor="#159CEF"
+                    android:textSize="14dp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="、"
+                    android:textColor="#444444"
+                    android:textSize="14dp" />
+                <TextView
+                    android:id="@+id/user_secret_protect_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="《隐私保护政策》"
+                    android:textColor="#159CEF"
+                    android:textSize="14dp" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="25dp"
+        android:layout_marginRight="25dp"
+        android:layout_marginBottom="40dp"
+        android:orientation="horizontal"
+        android:background="#ffffff">
+        <TextView
+            android:id="@+id/user_secret_no_agree"
+            android:layout_width="0dp"
+            android:layout_height="44dp"
+            android:layout_marginRight="5.5dp"
+            android:layout_weight="1"
+            android:background="@drawable/user_secret_left_btn_bg"
+            android:gravity="center"
+            android:text="不同意并退出"
+            android:textColor="#999999"
+            android:textSize="16dp" />
+        <TextView
+            android:id="@+id/user_secret_agree"
+            android:layout_width="0dp"
+            android:layout_height="44dp"
+            android:layout_marginLeft="5.5dp"
+            android:layout_weight="1"
+            android:background="@drawable/user_secret_right_btn_bg"
+            android:gravity="center"
+            android:text="同意并继续"
+            android:textColor="#FFFFFF"
+            android:textSize="16dp" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
--- a/m-user/src/main/res/layout/user_secret_dialog_layout.xml
+++ b/m-user/src/main/res/layout/user_secret_dialog_layout.xml
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="40dp"
+        android:layout_marginRight="40dp"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        android:background="@drawable/user_secret_dialog_bg">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="您需要同意本隐私保护协议
+才能继续使用壹点灵"
+            android:textSize="18dp"
+            android:textStyle="bold"
+            android:textColor="#242424"
+            android:gravity="center"
+            android:layout_marginLeft="46dp"
+            android:layout_marginRight="46dp"
+            android:layout_marginTop="36dp"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="若您不同意隐私保护政策，您将无法正常使用相关附加功能或无法达到我们拟达到的功能效果。"
+            android:layout_marginLeft="25dp"
+            android:lineHeight="22dp"
+            android:layout_marginRight="25dp"
+            android:textSize="14dp"
+            android:textColor="#999999"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="30dp"/>
+            <TextView
+                android:id="@+id/user_secret_dialog_agree"
+                android:layout_width="match_parent"
+                android:layout_marginLeft="25dp"
+                android:layout_marginRight="25dp"
+                android:layout_height="44dp"
+                android:gravity="center"
+                android:text="同意并继续"
+                android:textSize="16dp"
+                android:textColor="#ffffff"
+                android:background="@drawable/user_secret_right_btn_bg"/>
+            <TextView
+                android:id="@+id/user_secret_dialog_no_agree"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="仍不同意并退出"
+                android:textSize="13dp"
+                android:layout_marginTop="10dp"
+                android:textColor="#999999"
+                android:layout_marginBottom="24dp"/>
+    </LinearLayout>
+</LinearLayout>
--- a/ydl-platform/src/main/java/com/ydl/ydlcommon/view/dialog/YDLCommonDialog.kt
+++ b/ydl-platform/src/main/java/com/ydl/ydlcommon/view/dialog/YDLCommonDialog.kt
@@ -6,9 +6,23 @@ import android.os.Bundle
 import android.view.Gravity
 import android.view.WindowManager
 import com.ydl.ydlcommon.R
+import com.ydl.ydlcommon.router.YdlCommonOut
 import kotlinx.android.synthetic.main.platform_ydl_common_dialog_layout.*
-class YDLCommonDialog(context: Context, private var listener: OnYDLCommonDialogListener?): Dialog(context, R.style.platform_dialog_default_style) {
+class YDLCommonDialog: Dialog {
+    private var mContext: Context? = null
+    private var mListener: OnYDLCommonDialogListener? = null
+    private var mTitle: String = ""
+    private var mDesc: String = ""
+    private var mLeftText: String = ""
+    private var mRightText: String = ""
+    constructor(context: Context, listener: OnYDLCommonDialogListener?): super(context, R.style.platform_dialog_default_style) {
+        mContext = context
+        mListener = listener
+    }
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -21,11 +35,23 @@ class YDLCommonDialog(context: Context, private var listener: OnYDLCommonDialogL
        window.setGravity(Gravity.CENTER)
        window.attributes = params
+        ydl_common_dialog_title.text = mTitle
+        ydl_common_dialog_desc.text = mDesc
+        ydl_common_dialog_cancel.text = mLeftText
+        ydl_common_dialog_sure.text = mRightText
+        val packageName = YdlCommonOut.getApp().packageName
+        if (packageName == "com.cxzapp.yidianling") {
+            ydl_common_dialog_sure.setBackgroundResource(R.drawable.platform_ydl_common_dialog_sure_btn_ydl_bg)
+        }else if (packageName == "com.cxzapp.xinlizixun"){
+            ydl_common_dialog_sure.setBackgroundResource(R.drawable.platform_ydl_common_dialog_sure_btn_xlzx_bg)
+        }
        ydl_common_dialog_cancel.setOnClickListener {
-            listener?.onCancel()
+            mListener?.onCancel()
        }
        ydl_common_dialog_sure.setOnClickListener {
-            listener?.onSure()
+            mListener?.onSure()
        }
    }
@@ -34,7 +60,7 @@ class YDLCommonDialog(context: Context, private var listener: OnYDLCommonDialogL
     * 标题
     */
    fun setTitle(title: String): YDLCommonDialog {
-        ydl_common_dialog_title.text = title
+        mTitle = title
        return this
    }
@@ -42,7 +68,7 @@ class YDLCommonDialog(context: Context, private var listener: OnYDLCommonDialogL
     * 内容
     */
    fun setDesc(desc: String): YDLCommonDialog {
-        ydl_common_dialog_desc.text = desc
+        mDesc = desc
        return this
    }
@@ -50,7 +76,7 @@ class YDLCommonDialog(context: Context, private var listener: OnYDLCommonDialogL
     * 左侧按钮
     */
    fun setCancelText(cancelText: String): YDLCommonDialog {
-        ydl_common_dialog_cancel.text = cancelText
+        mLeftText = cancelText
        return this
    }
@@ -58,19 +84,7 @@ class YDLCommonDialog(context: Context, private var listener: OnYDLCommonDialogL
     * 右侧按钮
     */
    fun setSureText(sureText: String): YDLCommonDialog {
-        ydl_common_dialog_sure.text = sureText
+        mRightText = sureText
-        return this
-    }
-    /**
-     * 根据app包设置右侧按钮主题色，*****************必须调用*****************
-     */
-    fun setTheme(flavor: String): YDLCommonDialog {
-        if (flavor == "ydl") {
-            ydl_common_dialog_sure.setBackgroundResource(R.drawable.platform_ydl_common_dialog_sure_btn_ydl_bg)
-        }else {
-            ydl_common_dialog_sure.setBackgroundResource(R.drawable.platform_ydl_common_dialog_sure_btn_xlzx_bg)
-        }
        return this
    }

--- a/ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
+++ b/ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
@@ -40,6 +40,7 @@ import com.ydl.ydlcommon.base.BaseActivity;
 import com.ydl.ydlcommon.base.BaseApp;
 import com.ydl.ydlcommon.base.config.YDLConstants;
 import com.ydl.ydlcommon.bean.StatusBarOptions;
+import com.ydl.ydlcommon.data.PlatformRamImpl;
 import com.ydl.ydlcommon.ui.LogoLoadingView;
 import com.ydl.ydlcommon.utils.BuryPointUtils;
 import com.ydl.ydlcommon.utils.LogUtil;
@@ -172,7 +173,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
        // 如果是测试题页面
        if (selfPageType == TEST_QUESTIONS_PAGE_TYPE) {
            if (null != tb_title) {
-                tb_title.setLeftImageListener(v -> {
+                tb_title.setImageListener(v -> {
                    showTestQuestionPageReturnDialog();
                });
                tb_title.setOnLeftTextClick((view, isActive) -> {
@@ -528,7 +529,11 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
        runOnUiThread(() -> {
            tb_title.setVisibility(View.GONE);
            if (null != getStatusView()) {
-                getStatusView().setVisibility(View.GONE);
+                if (selfPageType == TEST_QUESTIONS_PAGE_TYPE) {
+                    //测评题隐藏标题的时候，不隐藏状态栏
+                } else {
+                    getStatusView().setVisibility(View.GONE);
+                }
            }
        });
    }
@@ -1252,8 +1257,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
            }).setTitle("你确定要退出测试吗？")
                    .setDesc("98%的人都说结果很有用哦")
                    .setCancelText("退出")
-                    .setSureText("继续测试")
+                    .setSureText("继续测试");
-                    .setTheme(BuildConfig.FLAVOR);
        }
        testQuestionsPageReturnDialog.show();
    }