Commit 1157bf8e by 霍志良

Merge remote-tracking branch 'origin/声网RTM、RTC升级' into 私聊发起收款

# Conflicts:
#	config.gradle
parents f68cfbed 4ee7aa10
...@@ -5,12 +5,12 @@ ext { ...@@ -5,12 +5,12 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.13", "m-confide" : "0.0.49.19",
"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.87", "m-im" : "0.0.20.85",
"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.41", "m-audioim" : "0.0.49.29.42",
"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.17", "m-confide" : "0.0.49.19",
"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.41", "m-audioim" : "0.0.49.29.42",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
......
...@@ -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
} }
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<p>• 其他已产生但未消耗完毕的权益或未来预期的收益。</p> <p>• 其他已产生但未消耗完毕的权益或未来预期的收益。</p>
<p>4. 壹点灵账号一旦注销,将无法恢复(即使您在注销后以相同手机号码再次向我们申请注册壹点灵账号,此时该账号将默认为新的用户账号。因此,我们善意地提醒您在申请注销前对需要备份的内容提前自行做好备份);</p> <p>4. 壹点灵账号一旦注销,将无法恢复(相同手机号码将不再支持注册、登录。因此,我们善意地提醒您在申请注销前对需要备份地内容提前自行做好备份);</p>
<p>5. 壹点灵账号一旦注销,您与我们曾签署过的相关用户协议、其他权利义务性文件等相应终止(但已约定继续生效的或法律法规另有规定的除外);</p> <p>5. 壹点灵账号一旦注销,您与我们曾签署过的相关用户协议、其他权利义务性文件等相应终止(但已约定继续生效的或法律法规另有规定的除外);</p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment