Skip to content

Y
YDL-Component-Medical
Commit a5a9259e by 刘鹏
Options

Merge branch 'feat/fp/v4.3.97' into 'release' 

Feat/fp/v4.3.97

See merge request app_android_lib/YDL-Component!165
parents ab8e344a 2f4043c8
Showing with 51 additions and 44 deletions
config.gradle
...@@ -5,43 +5,31 @@ ext { ...@@ -5,43 +5,31 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.50.25", "m-confide" : "0.0.50.26",
"m-consultant" : "0.0.60.67", "m-consultant" : "0.0.60.68",
"m-fm" : "0.0.30.09", "m-fm" : "0.0.30.09",
"m-user" : "0.0.62.49", "m-user" : "0.0.62.51",
"m-home" : "0.0.23.90", "m-home" : "0.0.23.90",
"m-im" : "0.0.21.57", "m-im" : "0.0.21.58",
"m-dynamic" : "0.0.7.74", "m-dynamic" : "0.0.7.74",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
"m-muse" : "0.0.28.81",
"m-muse" : "0.0.28.78",
"m-tests" : "0.0.24.18", "m-tests" : "0.0.24.18",
"m-course" : "0.0.43.39", "m-course" : "0.0.43.39",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.6",
"m-confide-api" : "0.0.2.16",
"m-consultant-api": "0.0.5.63",
"m-course-api" : "0.0.3.6",
"m-fm-api" : "0.0.3",
"m-muse-api" : "0.0.1",
"m-tests-api" : "0.0.2",
"m-user-api" : "0.0.10.24",
"m-home-api" : "0.0.4.4",
"m-im-api" : "0.0.12.24",
"m-dynamic-api" : "0.0.3.71",
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//mdt 组件 //mdt 组件
"ydl-tuicore" : "0.0.23", "ydl-tuicore" : "0.0.23",
//第一步 //第一步
"ydl-platform" : "0.0.41.39", "ydl-platform" : "0.0.41.40",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.92", "ydl-webview" : "0.0.38.93",
"ydl-media" : "0.0.21.52", "ydl-media" : "0.0.21.52",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.30.18", "m-audioim" : "0.0.49.30.19",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
...@@ -49,6 +37,20 @@ ext { ...@@ -49,6 +37,20 @@ ext {
"router" : "0.0.1", "router" : "0.0.1",
"ydl-net" : "0.0.3.94", "ydl-net" : "0.0.3.94",
"ydl-utils" : "0.0.3.8", "ydl-utils" : "0.0.3.8",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.6",
"m-confide-api" : "0.0.2.16",
"m-consultant-api": "0.0.5.63",
"m-course-api" : "0.0.3.6",
"m-fm-api" : "0.0.3",
"m-muse-api" : "0.0.1",
"m-tests-api" : "0.0.2",
"m-user-api" : "0.0.10.24",
"m-home-api" : "0.0.4.4",
"m-im-api" : "0.0.12.24",
"m-dynamic-api" : "0.0.3.71",
] ]
ydl_app = [ ydl_app = [
appName : "壹点灵心理咨询", appName : "壹点灵心理咨询",
...@@ -90,49 +92,51 @@ ext { ...@@ -90,49 +92,51 @@ ext {
ydlCompileVersion = [ ydlCompileVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.50.25", "m-confide" : "0.0.50.26",
"m-consultant" : "0.0.60.67", "m-consultant" : "0.0.60.68",
"m-fm" : "0.0.30.09", "m-fm" : "0.0.30.09",
"m-user" : "0.0.62.49", "m-user" : "0.0.62.51",
"m-home" : "0.0.23.90", "m-home" : "0.0.23.90",
"m-im" : "0.0.21.57", "m-im" : "0.0.21.58",
"m-dynamic" : "0.0.7.74", "m-dynamic" : "0.0.7.74",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
"m-muse" : "0.0.28.78", "m-muse" : "0.0.28.81",
"m-tests" : "0.0.24.18", "m-tests" : "0.0.24.18",
"m-course" : "0.0.43.39", "m-course" : "0.0.43.39",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.6",
"m-confide-api" : "0.0.2.16",
"m-consultant-api": "0.0.5.63",
"m-course-api" : "0.0.3.6",
"m-fm-api" : "0.0.3",
"m-muse-api" : "0.0.1",
"m-tests-api" : "0.0.2",
"m-user-api" : "0.0.10.24",
"m-home-api" : "0.0.4.4",
"m-im-api" : "0.0.12.24",
"m-dynamic-api" : "0.0.3.71",
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//mdt 组件 //mdt 组件
"ydl-tuicore" : "0.0.23", "ydl-tuicore" : "0.0.23",
//第一步 //第一步
"ydl-platform" : "0.0.41.39", "ydl-platform" : "0.0.41.40",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.92", "ydl-webview" : "0.0.38.93",
"ydl-media" : "0.0.21.52", "ydl-media" : "0.0.21.52",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.30.18", "m-audioim" : "0.0.49.30.19",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
"router" : "0.0.1", "router" : "0.0.1",
"ydl-net" : "0.0.3.94", "ydl-net" : "0.0.3.94",
"ydl-utils" : "0.0.3.8", "ydl-utils" : "0.0.3.8",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.6",
"m-confide-api" : "0.0.2.16",
"m-consultant-api": "0.0.5.63",
"m-course-api" : "0.0.3.6",
"m-fm-api" : "0.0.3",
"m-muse-api" : "0.0.1",
"m-tests-api" : "0.0.2",
"m-user-api" : "0.0.10.24",
"m-home-api" : "0.0.4.4",
"m-im-api" : "0.0.12.24",
"m-dynamic-api" : "0.0.3.71",
] ]
dependencies = [ dependencies = [
......
m-user/src/main/java/com/yidianling/user/ui/login/H5Activity.java
...@@ -63,7 +63,7 @@ public class H5Activity extends BaseActivity { ...@@ -63,7 +63,7 @@ public class H5Activity extends BaseActivity {
//无网络 读取本地文件 //无网络 读取本地文件
web_view.loadUrl("file:///android_asset/html/yinsi.html"); web_view.loadUrl("file:///android_asset/html/yinsi.html");
}else { }else {
web_view.loadUrl("https://m.ydl.com/Protol/yinsi");//加载url web_view.loadUrl("https://m.ydl.com/Protol/yinsi/shdh");//加载url
} }
} else { } else {
//用户协议0 //用户协议0
......
m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt
...@@ -303,7 +303,7 @@ object OneKeyLoginHelp { ...@@ -303,7 +303,7 @@ object OneKeyLoginHelp {
val appName= mActivity.resources.getString(R.string.user_login_name_start) val appName= mActivity.resources.getString(R.string.user_login_name_start)
var appPrivacyOneTip = "${appName}用户使用协议" var appPrivacyOneTip = "${appName}用户使用协议"
var appPrivacyOne = "https://h5.ydl.com/SDUserProtol" var appPrivacyOne = "https://h5.ydl.com/SDUserProtol"
var appPrivacyTwo = "https://m.ydl.com/Protol/yinsi" var appPrivacyTwo = "https://m.ydl.com/Protol/yinsi/shdh"
if (mAppType == YDL_EXPERT_APP) { if (mAppType == YDL_EXPERT_APP) {
loginLogo = "ic_expert_login_logo" loginLogo = "ic_expert_login_logo"
loginHeight = 60 loginHeight = 60
...@@ -417,7 +417,7 @@ object OneKeyLoginHelp { ...@@ -417,7 +417,7 @@ object OneKeyLoginHelp {
.setSwitchAccTextColor(Color.parseColor("#999999")) .setSwitchAccTextColor(Color.parseColor("#999999"))
.setSwitchOffsetY_B(80) .setSwitchOffsetY_B(80)
.setAppPrivacyOne("壹点灵用户使用协议", "https://h5.ydl.com/SDUserProtol") .setAppPrivacyOne("壹点灵用户使用协议", "https://h5.ydl.com/SDUserProtol")
.setAppPrivacyTwo("隐私协议", "https://m.ydl.com/Protol/yinsi") .setAppPrivacyTwo("隐私协议", "https://m.ydl.com/Protol/yinsi/shdh")
.setAppPrivacyColor(Color.parseColor("#bfbfbf"), Color.parseColor("#991da1f2")) .setAppPrivacyColor(Color.parseColor("#bfbfbf"), Color.parseColor("#991da1f2"))
.setCheckboxHidden(checkBoxHidden) // 设置是否同意协议的checkbox隐藏 .setCheckboxHidden(checkBoxHidden) // 设置是否同意协议的checkbox隐藏
.setCheckBoxHeight(22) .setCheckBoxHeight(22)
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/DeviceTool.java
...@@ -153,6 +153,9 @@ public class DeviceTool { ...@@ -153,6 +153,9 @@ public class DeviceTool {
* 检查是否同意隐私协议 * 检查是否同意隐私协议
* */ * */
public static boolean checkHasAgreeSecret() { public static boolean checkHasAgreeSecret() {
if (BuildConfig.DEBUG){
LogUtil.e("合规化：设备数据获取");
}
String hasAgreeSecret = SharedPreferencesEditor.getString("hasAgreeSecret"); String hasAgreeSecret = SharedPreferencesEditor.getString("hasAgreeSecret");
return "true".equals(hasAgreeSecret); return "true".equals(hasAgreeSecret);
} }
......
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