Skip to content

Y
YDL-Component-Medical
Commit f1ce7f73 by 洪国微
Options

Merge branch 'dev' into tab

parents 5a3c5379 92018119
Showing with 28 additions and 28 deletions
config.gradle
ext { ext {
kotlin_version = "1.3.21" kotlin_version = "1.3.21"
dev_mode = true dev_mode = false
ydl_app = [ ydl_app = [
appName : "心理咨询壹点灵", appName : "心理咨询壹点灵",
...@@ -41,14 +41,14 @@ ext { ...@@ -41,14 +41,14 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
"m-audioim" : "0.0.11", "m-audioim" : "0.0.12",
"m-confide" : "0.0.14", "m-confide" : "0.0.15",
"m-consultant" : "0.0.21", "m-consultant" : "0.0.22",
"m-course" : "0.0.7", "m-course" : "0.0.8",
"m-fm" : "0.0.10", "m-fm" : "0.0.11",
"m-muse" : "0.0.6", "m-muse" : "0.0.7",
"m-tests" : "0.0.3", "m-tests" : "0.0.4",
"m-user" : "0.0.23", "m-user" : "0.0.25",
//-------------- 业务模块 API 层 -------------- //-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.1", "m-audioim-api" : "0.0.1",
"m-confide-api" : "0.0.1", "m-confide-api" : "0.0.1",
...@@ -60,25 +60,25 @@ ext { ...@@ -60,25 +60,25 @@ ext {
"m-user-api" : "0.0.5", "m-user-api" : "0.0.5",
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
"ydl-flutter-base": "0.0.3", "ydl-flutter-base": "0.0.3",
"ydl-media" : "0.0.8", "ydl-media" : "0.0.9",
"ydl-net" : "0.0.1", "ydl-net" : "0.0.1",
"ydl-pay" : "0.0.5", "ydl-pay" : "0.0.6",
"ydl-platform" : "0.0.19", "ydl-platform" : "0.0.20",
"ydl-utils" : "0.0.2", "ydl-utils" : "0.0.2",
"ydl-webview" : "0.0.19", "ydl-webview" : "0.0.20",
"router" : "0.0.1", "router" : "0.0.1",
] ]
ydlCompileVersion = [ ydlCompileVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
"m-audioim" : "0.0.11", "m-audioim" : "0.0.12",
"m-confide" : "0.0.14", "m-confide" : "0.0.15",
"m-consultant" : "0.0.21", "m-consultant" : "0.0.22",
"m-course" : "0.0.5", "m-course" : "0.0.8",
"m-fm" : "0.0.10", "m-fm" : "0.0.11",
"m-muse" : "0.0.6", "m-muse" : "0.0.7",
"m-tests" : "0.0.3", "m-tests" : "0.0.4",
"m-user" : "0.0.23", "m-user" : "0.0.25",
//-------------- 业务模块 API 层 -------------- //-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.1", "m-audioim-api" : "0.0.1",
"m-confide-api" : "0.0.1", "m-confide-api" : "0.0.1",
...@@ -90,12 +90,12 @@ ext { ...@@ -90,12 +90,12 @@ ext {
"m-user-api" : "0.0.5", "m-user-api" : "0.0.5",
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
"ydl-flutter-base": "0.0.3", "ydl-flutter-base": "0.0.3",
"ydl-media" : "0.0.8", "ydl-media" : "0.0.9",
"ydl-net" : "0.0.1", "ydl-net" : "0.0.1",
"ydl-pay" : "0.0.5", "ydl-pay" : "0.0.6",
"ydl-platform" : "0.0.19", "ydl-platform" : "0.0.20",
"ydl-utils" : "0.0.2", "ydl-utils" : "0.0.2",
"ydl-webview" : "0.0.19", "ydl-webview" : "0.0.20",
"router" : "0.0.1", "router" : "0.0.1",
] ]
......
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
...@@ -315,12 +315,12 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -315,12 +315,12 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
setCountryIcon(countryCode) setCountryIcon(countryCode)
if (isFromGuide) {0 if (isFromGuide) {
img_reg_back.visibility = View.INVISIBLE img_reg_back.visibility = View.INVISIBLE
img_reg_back.isEnabled = false img_reg_back.isEnabled = false
tv_skip.visibility = View.VISIBLE tv_skip.visibility = View.VISIBLE
tv_skip.text = "随便逛逛" tv_skip.text = "随便逛逛"
}
//根据来源不同为当前页面埋点 //根据来源不同为当前页面埋点
if (isFromGuide) { if (isFromGuide) {
ActionCountUtils.count(uid = "", partId = UserBIConstants.PART_ID_LOGIN_MAIN, position = UserBIConstants.POSITION_LOGIN_ONE_PAGE_VISIT,url = "无url",api = "无api",sign1 = "") ActionCountUtils.count(uid = "", partId = UserBIConstants.PART_ID_LOGIN_MAIN, position = UserBIConstants.POSITION_LOGIN_ONE_PAGE_VISIT,url = "无url",api = "无api",sign1 = "")
...@@ -328,7 +328,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -328,7 +328,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
ActionCountUtils.count(uid = "", partId = UserBIConstants.PART_ID_LOGIN_MAIN, position = UserBIConstants.POSITION_LOGIN_TWO_PAGE_VISIT, url = "无url", api = "无api",sign1 = "") ActionCountUtils.count(uid = "", partId = UserBIConstants.PART_ID_LOGIN_MAIN, position = UserBIConstants.POSITION_LOGIN_TWO_PAGE_VISIT, url = "无url", api = "无api",sign1 = "")
} }
} }
}
private fun setHint() { private fun setHint() {
val hintStr = SpannableString(resources.getString(R.string.user_edittext_hint))// 定义hint的值 val hintStr = SpannableString(resources.getString(R.string.user_edittext_hint))// 定义hint的值
......
ydl-platform/src/main/res/raw/api.properties
...@@ -44,6 +44,7 @@ javacouponurl.prod = https://api.ydl.com/ ...@@ -44,6 +44,7 @@ javacouponurl.prod = https://api.ydl.com/
#java服务器api域名（h5耗时统计,域名问题后续服务端会统一） #java服务器api域名（h5耗时统计,域名问题后续服务端会统一）
javatempurl.test = https://47.97.49.44:8082/api/ javatempurl.test = https://47.97.49.44:8082/api/
javatempurl.auto_test = https://auto_testdc.ydl.com/api/
javatempurl.prod = https://dc.ydl.com/api/ javatempurl.prod = https://dc.ydl.com/api/
#java服务器api统一域名 #java服务器api统一域名
......
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