Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
f1ce7f73
Commit
f1ce7f73
authored
5 years ago
by
洪国微
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into tab
parents
5a3c5379
92018119
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
28 deletions
+28
-28
config.gradle
config.gradle
+25
-25
RegisterAndLoginActivity.kt
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
+2
-3
api.properties
ydl-platform/src/main/res/raw/api.properties
+1
-0
No files found.
config.gradle
View file @
f1ce7f73
ext
{
kotlin_version
=
"1.3.21"
dev_mode
=
tru
e
dev_mode
=
fals
e
ydl_app
=
[
appName
:
"心理咨询壹点灵"
,
...
...
@@ -41,14 +41,14 @@ ext {
ydlPublishVersion
=
[
// -------------- 业务模块 --------------
"m-audioim"
:
"0.0.1
1
"
,
"m-confide"
:
"0.0.1
4
"
,
"m-consultant"
:
"0.0.2
1
"
,
"m-course"
:
"0.0.
7
"
,
"m-fm"
:
"0.0.1
0
"
,
"m-muse"
:
"0.0.
6
"
,
"m-tests"
:
"0.0.
3
"
,
"m-user"
:
"0.0.2
3
"
,
"m-audioim"
:
"0.0.1
2
"
,
"m-confide"
:
"0.0.1
5
"
,
"m-consultant"
:
"0.0.2
2
"
,
"m-course"
:
"0.0.
8
"
,
"m-fm"
:
"0.0.1
1
"
,
"m-muse"
:
"0.0.
7
"
,
"m-tests"
:
"0.0.
4
"
,
"m-user"
:
"0.0.2
5
"
,
//-------------- 业务模块 API 层 --------------
"m-audioim-api"
:
"0.0.1"
,
"m-confide-api"
:
"0.0.1"
,
...
...
@@ -60,25 +60,25 @@ ext {
"m-user-api"
:
"0.0.5"
,
//-------------- 功能组件 --------------
"ydl-flutter-base"
:
"0.0.3"
,
"ydl-media"
:
"0.0.
8
"
,
"ydl-media"
:
"0.0.
9
"
,
"ydl-net"
:
"0.0.1"
,
"ydl-pay"
:
"0.0.
5
"
,
"ydl-platform"
:
"0.0.
19
"
,
"ydl-pay"
:
"0.0.
6
"
,
"ydl-platform"
:
"0.0.
20
"
,
"ydl-utils"
:
"0.0.2"
,
"ydl-webview"
:
"0.0.
19
"
,
"ydl-webview"
:
"0.0.
20
"
,
"router"
:
"0.0.1"
,
]
ydlCompileVersion
=
[
// -------------- 业务模块 --------------
"m-audioim"
:
"0.0.1
1
"
,
"m-confide"
:
"0.0.1
4
"
,
"m-consultant"
:
"0.0.2
1
"
,
"m-course"
:
"0.0.
5
"
,
"m-fm"
:
"0.0.1
0
"
,
"m-muse"
:
"0.0.
6
"
,
"m-tests"
:
"0.0.
3
"
,
"m-user"
:
"0.0.2
3
"
,
"m-audioim"
:
"0.0.1
2
"
,
"m-confide"
:
"0.0.1
5
"
,
"m-consultant"
:
"0.0.2
2
"
,
"m-course"
:
"0.0.
8
"
,
"m-fm"
:
"0.0.1
1
"
,
"m-muse"
:
"0.0.
7
"
,
"m-tests"
:
"0.0.
4
"
,
"m-user"
:
"0.0.2
5
"
,
//-------------- 业务模块 API 层 --------------
"m-audioim-api"
:
"0.0.1"
,
"m-confide-api"
:
"0.0.1"
,
...
...
@@ -90,12 +90,12 @@ ext {
"m-user-api"
:
"0.0.5"
,
//-------------- 功能组件 --------------
"ydl-flutter-base"
:
"0.0.3"
,
"ydl-media"
:
"0.0.
8
"
,
"ydl-media"
:
"0.0.
9
"
,
"ydl-net"
:
"0.0.1"
,
"ydl-pay"
:
"0.0.
5
"
,
"ydl-platform"
:
"0.0.
19
"
,
"ydl-pay"
:
"0.0.
6
"
,
"ydl-platform"
:
"0.0.
20
"
,
"ydl-utils"
:
"0.0.2"
,
"ydl-webview"
:
"0.0.
19
"
,
"ydl-webview"
:
"0.0.
20
"
,
"router"
:
"0.0.1"
,
]
...
...
This diff is collapsed.
Click to expand it.
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
View file @
f1ce7f73
...
...
@@ -315,12 +315,12 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
setCountryIcon
(
countryCode
)
if
(
isFromGuide
)
{
0
if
(
isFromGuide
)
{
img_reg_back
.
visibility
=
View
.
INVISIBLE
img_reg_back
.
isEnabled
=
false
tv_skip
.
visibility
=
View
.
VISIBLE
tv_skip
.
text
=
"随便逛逛"
}
//根据来源不同为当前页面埋点
if
(
isFromGuide
)
{
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
ActionCountUtils
.
count
(
uid
=
""
,
partId
=
UserBIConstants
.
PART_ID_LOGIN_MAIN
,
position
=
UserBIConstants
.
POSITION_LOGIN_TWO_PAGE_VISIT
,
url
=
"无url"
,
api
=
"无api"
,
sign1
=
""
)
}
}
}
private
fun
setHint
()
{
val
hintStr
=
SpannableString
(
resources
.
getString
(
R
.
string
.
user_edittext_hint
))
// 定义hint的值
...
...
This diff is collapsed.
Click to expand it.
ydl-platform/src/main/res/raw/api.properties
View file @
f1ce7f73
...
...
@@ -44,6 +44,7 @@ javacouponurl.prod = https://api.ydl.com/
#java服务器api域名(h5耗时统计,域名问题后续服务端会统一)
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/
#java服务器api统一域名
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment