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
fc3f2452
Commit
fc3f2452
authored
Jul 06, 2022
by
刘鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 合规化androidId问题修复
parent
cea87958
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
17 deletions
+14
-17
config.gradle
config.gradle
+2
-2
RxDeviceTool.java
ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/utils/RxDeviceTool.java
+0
-9
JPushUtils.kt
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/JPushUtils.kt
+7
-2
ActionCountUtils.kt
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/actionutil/ActionCountUtils.kt
+5
-4
RxDeviceTool.java
ydl-utils/src/main/java/com/yidianling/common/tools/RxDeviceTool.java
+0
-0
No files found.
config.gradle
View file @
fc3f2452
...
...
@@ -20,7 +20,7 @@ ext {
//mdt 组件
"ydl-tuicore"
:
"0.0.25"
,
//第一步
"ydl-platform"
:
"0.0.41.5
1
"
,
"ydl-platform"
:
"0.0.41.5
4
"
,
//第二步 若干
"ydl-webview"
:
"0.0.39.03"
,
...
...
@@ -104,7 +104,7 @@ ext {
//mdt 组件
"ydl-tuicore"
:
"0.0.25"
,
//第一步
"ydl-platform"
:
"0.0.41.5
1
"
,
"ydl-platform"
:
"0.0.41.5
4
"
,
//第二步 若干
...
...
ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/utils/RxDeviceTool.java
View file @
fc3f2452
...
...
@@ -239,15 +239,6 @@ public class RxDeviceTool {
return
tm
.
getSimState
();
}
/**
* 获取ANDROID ID
*
* @param context
* @return
*/
public
static
String
getAndroidId
(
Context
context
)
{
return
Settings
.
Secure
.
getString
(
context
.
getContentResolver
(),
Settings
.
Secure
.
ANDROID_ID
);
}
/**
* 获取设备型号,如MI2SC
...
...
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/JPushUtils.kt
View file @
fc3f2452
...
...
@@ -10,7 +10,11 @@ import com.ydl.ydlcommon.base.BaseApp
*/
object
JPushUtils
{
fun
getRegistrationID
():
String
{
return
JPushInterface
.
getRegistrationID
(
BaseApp
.
getApp
());
fun
getRegistrationID
():
String
?
{
return
if
(
DeviceTool
.
checkHasAgreeSecret
())
{
JPushInterface
.
getRegistrationID
(
BaseApp
.
getApp
());
}
else
{
null
;
}
}
}
\ No newline at end of file
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/actionutil/ActionCountUtils.kt
View file @
fc3f2452
...
...
@@ -288,10 +288,11 @@ class ActionCountUtils {
baiduActionDataParams
.
appName
(
appName
)
try
{
@SuppressLint
(
"HardwareIds"
)
val
id
=
Settings
.
Secure
.
getString
(
RxTool
.
getContext
().
contentResolver
,
Settings
.
Secure
.
ANDROID_ID
)
if
(
DeviceTool
.
checkHasAgreeSecret
()){
Settings
.
Secure
.
getString
(
RxTool
.
getContext
().
contentResolver
,
Settings
.
Secure
.
ANDROID_ID
)
}
else
{
""
}
LogUtil
.
e
(
"androidid未加密:${id}"
)
}
catch
(
e
:
java
.
lang
.
Exception
)
{
...
...
ydl-utils/src/main/java/com/yidianling/common/tools/RxDeviceTool.java
View file @
fc3f2452
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