Skip to content

Y
YDL-Component-Medical
Commit 148cda53 by 徐健
Options

增加隐私政策

parent 6ed85ac4
Showing with 508 additions and 48 deletions
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_PROD;
public static String appEnv = YDLConstants.ENV_TEST;
// public static String appEnv = YDLConstants.ENV_PROD;
@Override
public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {
......
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-consultant" : "0.0.52.1",
"m-fm" : "0.0.24.1",
"m-user" : "0.0.42.1",
"m-home" : "0.0.15",
"m-im" : "0.0.6",
"m-dynamic" : "0.0.2.2",
"m-confide" : "0.0.43",
"m-consultant" : "0.0.53",
"m-fm" : "0.0.25",
"m-user" : "0.0.43",
"m-home" : "0.0.16",
"m-im" : "0.0.8",
"m-dynamic" : "0.0.3",
"m-muse" : "0.0.23.2",
"m-tests" : "0.0.18.2",
"m-course" : "0.0.37.2",
"m-muse" : "0.0.24",
"m-tests" : "0.0.19",
"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-media" : "0.0.15.1",
"ydl-pay" : "0.0.12.1",
"m-audioim" : "0.0.41.1",
"ydl-webview" : "0.0.32.2",
"ydl-media" : "0.0.16",
"ydl-pay" : "0.0.13",
"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",
]
......
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;
......
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);
......
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 = ""; //小头像
......
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;
}
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
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
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
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()
......
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))
}
}
......
m-user/src/main/java/com/yidianling/user/ui/login/SecretActivity.kt 0 → 100644
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
m-user/src/main/java/com/yidianling/user/widget/SecretDialog.kt 0 → 100644
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
m-user/src/main/res/drawable/user_secret_dialog_bg.xml 0 → 100644
<?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
m-user/src/main/res/drawable/user_secret_left_btn_bg.xml 0 → 100644
<?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
m-user/src/main/res/drawable/user_secret_right_btn_bg.xml 0 → 100644
<?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
m-user/src/main/res/layout/user_activity_secret.xml 0 → 100644
<?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
m-user/src/main/res/layout/user_secret_dialog_layout.xml 0 → 100644
<?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>
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
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)
}
mRightText = sureText
return this
}
......
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("继续测试")
.setTheme(BuildConfig.FLAVOR);
.setSureText("继续测试");
}
testQuestionsPageReturnDialog.show();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment