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
1157bf8e
Commit
1157bf8e
authored
Jan 10, 2022
by
霍志良
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/声网RTM、RTC升级' into 私聊发起收款
# Conflicts: # config.gradle
parents
f68cfbed
4ee7aa10
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
config.gradle
config.gradle
+7
-7
build.gradle
m-audioim/build.gradle
+1
-1
accountUnregister.html
m-user/src/main/assets/html/accountUnregister.html
+1
-1
No files found.
config.gradle
View file @
1157bf8e
...
@@ -5,12 +5,12 @@ ext {
...
@@ -5,12 +5,12 @@ ext {
ydlPublishVersion
=
[
ydlPublishVersion
=
[
// -------------- 业务模块 --------------
// -------------- 业务模块 --------------
//第三步 若干
//第三步 若干
"m-confide"
:
"0.0.49.1
3
"
,
"m-confide"
:
"0.0.49.1
9
"
,
"m-consultant"
:
"0.0.60.02"
,
"m-consultant"
:
"0.0.60.02"
,
"m-fm"
:
"0.0.30.04"
,
"m-fm"
:
"0.0.30.04"
,
"m-user"
:
"0.0.61.
82
"
,
"m-user"
:
"0.0.61.
91
"
,
"m-home"
:
"0.0.22.84"
,
"m-home"
:
"0.0.22.84"
,
"m-im"
:
"0.0.20.8
7
"
,
"m-im"
:
"0.0.20.8
5
"
,
"m-dynamic"
:
"0.0.7.35"
,
"m-dynamic"
:
"0.0.7.35"
,
"m-article"
:
"0.0.0.10"
,
"m-article"
:
"0.0.0.10"
,
...
@@ -39,7 +39,7 @@ ext {
...
@@ -39,7 +39,7 @@ ext {
"ydl-webview"
:
"0.0.38.47"
,
"ydl-webview"
:
"0.0.38.47"
,
"ydl-media"
:
"0.0.21.42"
,
"ydl-media"
:
"0.0.21.42"
,
"ydl-pay"
:
"0.0.18.19"
,
"ydl-pay"
:
"0.0.18.19"
,
"m-audioim"
:
"0.0.49.29.4
1
"
,
"m-audioim"
:
"0.0.49.29.4
2
"
,
"ydl-flutter-base"
:
"0.0.14.38"
,
"ydl-flutter-base"
:
"0.0.14.38"
,
//以下 几乎不会动
//以下 几乎不会动
...
@@ -88,10 +88,10 @@ ext {
...
@@ -88,10 +88,10 @@ ext {
// -------------- 业务模块 --------------
// -------------- 业务模块 --------------
//第三步 若干
//第三步 若干
"m-confide"
:
"0.0.49.1
7
"
,
"m-confide"
:
"0.0.49.1
9
"
,
"m-consultant"
:
"0.0.60.02"
,
"m-consultant"
:
"0.0.60.02"
,
"m-fm"
:
"0.0.30.07"
,
"m-fm"
:
"0.0.30.07"
,
"m-user"
:
"0.0.61.
82
"
,
"m-user"
:
"0.0.61.
91
"
,
"m-home"
:
"0.0.22.83"
,
"m-home"
:
"0.0.22.83"
,
"m-im"
:
"0.0.20.87"
,
"m-im"
:
"0.0.20.87"
,
"m-dynamic"
:
"0.0.7.35"
,
"m-dynamic"
:
"0.0.7.35"
,
...
@@ -121,7 +121,7 @@ ext {
...
@@ -121,7 +121,7 @@ ext {
"ydl-webview"
:
"0.0.38.47"
,
"ydl-webview"
:
"0.0.38.47"
,
"ydl-media"
:
"0.0.21.42"
,
"ydl-media"
:
"0.0.21.42"
,
"ydl-pay"
:
"0.0.18.19"
,
"ydl-pay"
:
"0.0.18.19"
,
"m-audioim"
:
"0.0.49.29.4
1
"
,
"m-audioim"
:
"0.0.49.29.4
2
"
,
"ydl-flutter-base"
:
"0.0.14.38"
,
"ydl-flutter-base"
:
"0.0.14.38"
,
//以下 几乎不会动
//以下 几乎不会动
...
...
m-audioim/build.gradle
View file @
1157bf8e
...
@@ -75,7 +75,7 @@ dependencies {
...
@@ -75,7 +75,7 @@ dependencies {
kapt
"com.alibaba:arouter-compiler:$arouter_compiler"
kapt
"com.alibaba:arouter-compiler:$arouter_compiler"
api
"com.alibaba:arouter-api:$arouter_api"
api
"com.alibaba:arouter-api:$arouter_api"
api
(
'com.ydl:ydl-av:1.
2.9
@aar'
){
api
(
'com.ydl:ydl-av:1.
3.2
@aar'
){
transitive
=
true
transitive
=
true
}
}
...
...
m-user/src/main/assets/html/accountUnregister.html
View file @
1157bf8e
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
<p>
• 其他已产生但未消耗完毕的权益或未来预期的收益。
</p>
<p>
• 其他已产生但未消耗完毕的权益或未来预期的收益。
</p>
<p>
4. 壹点灵账号一旦注销,将无法恢复(
即使您在注销后以相同手机号码再次向我们申请注册壹点灵账号,此时该账号将默认为新的用户账号。因此,我们善意地提醒您在申请注销前对需要备份的
内容提前自行做好备份);
</p>
<p>
4. 壹点灵账号一旦注销,将无法恢复(
相同手机号码将不再支持注册、登录。因此,我们善意地提醒您在申请注销前对需要备份地
内容提前自行做好备份);
</p>
<p>
5. 壹点灵账号一旦注销,您与我们曾签署过的相关用户协议、其他权利义务性文件等相应终止(但已约定继续生效的或法律法规另有规定的除外);
</p>
<p>
5. 壹点灵账号一旦注销,您与我们曾签署过的相关用户协议、其他权利义务性文件等相应终止(但已约定继续生效的或法律法规另有规定的除外);
</p>
...
...
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