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
83c3950c
Commit
83c3950c
authored
May 28, 2021
by
霍志良
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:huawei、VIVO不默认勾选隐私协议,其他渠道动态开关配置
parent
5d6408a3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
config.gradle
config.gradle
+2
-2
RegisterAndLoginActivity.kt
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
+3
-3
No files found.
config.gradle
View file @
83c3950c
...
...
@@ -8,7 +8,7 @@ ext {
"m-confide"
:
"0.0.49.09"
,
"m-consultant"
:
"0.0.59.78"
,
"m-fm"
:
"0.0.30.03"
,
"m-user"
:
"0.0.61.3
3
"
,
"m-user"
:
"0.0.61.3
4
"
,
"m-home"
:
"0.0.22.61"
,
"m-im"
:
"0.0.19.12"
,
"m-dynamic"
:
"0.0.7.22"
,
...
...
@@ -91,7 +91,7 @@ ext {
"m-confide"
:
"0.0.49.09"
,
"m-consultant"
:
"0.0.59.78"
,
"m-fm"
:
"0.0.30.01"
,
"m-user"
:
"0.0.61.3
3
"
,
"m-user"
:
"0.0.61.3
4
"
,
"m-home"
:
"0.0.22.61"
,
"m-im"
:
"0.0.19.12"
,
"m-dynamic"
:
"0.0.7.22"
,
...
...
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
View file @
83c3950c
...
...
@@ -367,14 +367,14 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
var
isAgreeProtocol
=
false
//华为渠道不默认勾选隐私协议,必须全局上下文才可以获取到渠道号。其他渠道默认勾选隐私协议
//protocol_android 1是开启默认勾选,2是关闭默认勾选,方便应用市场审核
//新逻辑:华为
一直不默认勾选(上线后华为也会抽查隐私协议勾选情况),vivo审核不默认勾选,通过后默认勾选
//新逻辑:华为
和VIVO一直不默认勾选(上线后华为、VIVO也会抽查隐私协议勾选情况)
val
privacyOnOffType
=
PlatformRamImpl
.
getInstance
().
getGlobalInfo
()
?.
info
?.
protocol_android
?:
2
val
channel
=
WalleChannelReader
.
getChannel
(
applicationContext
)
if
(
channel
==
"huawei"
)
{
if
(
channel
==
"huawei"
||
channel
==
"vivo"
)
{
iv_select_protocol
.
setImageResource
(
R
.
drawable
.
user_login_protocol_unselected_new
)
}
else
if
(
privacyOnOffType
==
2
&&
(
channel
==
"vivo"
)
)
{
}
else
if
(
privacyOnOffType
==
2
)
{
iv_select_protocol
.
setImageResource
(
R
.
drawable
.
user_login_protocol_unselected_new
)
}
else
{
isAgreeProtocol
=
true
...
...
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