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
919ca7e5
Commit
919ca7e5
authored
Oct 10, 2020
by
霍志良
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:华为渠道隐私协议动态开关,审核通过后默认勾选
parent
1799d203
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
config.gradle
config.gradle
+4
-4
RegisterAndLoginActivity.kt
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
+3
-1
GlobalInfo.java
ydl-platform/src/main/java/com/ydl/ydlcommon/bean/GlobalInfo.java
+1
-1
No files found.
config.gradle
View file @
919ca7e5
...
...
@@ -8,7 +8,7 @@ ext {
"m-confide"
:
"0.0.48.75"
,
"m-consultant"
:
"0.0.59.36"
,
"m-fm"
:
"0.0.30.00"
,
"m-user"
:
"0.0.60.2
8
"
,
"m-user"
:
"0.0.60.2
9
"
,
"m-home"
:
"0.0.22.33"
,
"m-im"
:
"0.0.18.23"
,
"m-dynamic"
:
"0.0.7.13"
,
...
...
@@ -33,7 +33,7 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform"
:
"0.0.39.
59
"
,
"ydl-platform"
:
"0.0.39.
60
"
,
//第二步 若干
"ydl-webview"
:
"0.0.38.33"
,
...
...
@@ -92,7 +92,7 @@ ext {
"m-confide"
:
"0.0.41.4"
,
"m-consultant"
:
"0.0.51.16"
,
"m-fm"
:
"0.0.23.5"
,
"m-user"
:
"0.0.41.
7
"
,
"m-user"
:
"0.0.41.
8
"
,
"m-home"
:
"0.0.6.28"
,
"m-im"
:
"0.0.3.14"
,
"m-dynamic"
:
"0.0.1.7"
,
...
...
@@ -115,7 +115,7 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform"
:
"0.0.39.
59
"
,
"ydl-platform"
:
"0.0.39.
60
"
,
//第二步 若干
"ydl-webview"
:
"0.0.38.32"
,
...
...
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
View file @
919ca7e5
...
...
@@ -29,6 +29,7 @@ import com.umeng.socialize.UMShareConfig
import
com.umeng.socialize.bean.SHARE_MEDIA
import
com.ydl.ydlcommon.base.BaseApp
import
com.ydl.ydlcommon.base.BaseMvpActivity
import
com.ydl.ydlcommon.data.PlatformRamImpl
import
com.ydl.ydlcommon.utils.ActivityManager
import
com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.utils.YDLCacheUtils
...
...
@@ -371,7 +372,8 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
}
var
isAgreeProtocol
=
false
//华为渠道不默认勾选隐私协议,必须全局上下文才可以获取到渠道号。其他渠道默认勾选隐私协议
if
(
WalleChannelReader
.
getChannel
(
applicationContext
)==
"huawei"
){
//protocol_android 1是开启华为渠道默认勾选,2是关闭华为渠道默认勾选,方便应用市场审核
if
(
WalleChannelReader
.
getChannel
(
applicationContext
)==
"huawei"
&&
PlatformRamImpl
.
getInstance
().
getGlobalInfo
()
?.
info
?.
protocol_android
==
2
){
iv_select_protocol
.
setImageResource
(
R
.
drawable
.
user_login_protocol_unselected
)
}
else
{
isAgreeProtocol
=
true
...
...
ydl-platform/src/main/java/com/ydl/ydlcommon/bean/GlobalInfo.java
View file @
919ca7e5
...
...
@@ -42,7 +42,7 @@ public class GlobalInfo implements Serializable{
public
String
notice_url
;
public
PayNotice
pay_notice
;
public
int
login_hide_wx
;
//1隐藏,0显示
public
int
protocol_android
;
//华为渠道隐私协议开关,1不默认勾选,2默认勾选
public
static
class
PayNotice
implements
Serializable
{
public
String
title
;
...
...
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