Skip to content

Y
YDL-Component-Medical
Commit 41d24dc6 by YKai
Options

feat:友盟迁移新仓库，组件升级

parent 3afb39e5
Showing with 35 additions and 35 deletions
build.gradle
...@@ -33,16 +33,16 @@ buildscript { ...@@ -33,16 +33,16 @@ buildscript {
password "fjoi#1+#@" password "fjoi#1+#@"
} }
} }
//Umeng sdk maven 地址
maven { url 'https://dl.bintray.com/umsdk/release' }
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
maven { // maven {
url 'https://dl.bintray.com/zouyuhan/maven' // url 'https://dl.bintray.com/zouyuhan/maven'
} // }
google() google()
jcenter() jcenter()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
//Umeng sdk maven 地址
maven { url 'https://repo1.maven.org/maven2/'}
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.0' classpath 'com.android.tools.build:gradle:3.2.0'
...@@ -81,8 +81,6 @@ allprojects { ...@@ -81,8 +81,6 @@ allprojects {
password "fjoi#1+#@" password "fjoi#1+#@"
} }
} }
//Umeng sdk maven 地址
maven { url 'https://dl.bintray.com/umsdk/release' }
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
// maven { url'http://developer.huawei.com/repo/' } // maven { url'http://developer.huawei.com/repo/' }
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
...@@ -90,12 +88,14 @@ allprojects { ...@@ -90,12 +88,14 @@ allprojects {
// url 'https://maven.google.com' // url 'https://maven.google.com'
url'https://dl.google.com/dl/android/maven2/' url'https://dl.google.com/dl/android/maven2/'
} }
maven { // maven {
url 'https://dl.bintray.com/zouyuhan/maven' // url 'https://dl.bintray.com/zouyuhan/maven'
} // }
google() google()
jcenter() jcenter()
maven { url 'https://maven.aliyun.com/repository/releases' } maven { url 'https://maven.aliyun.com/repository/releases' }
//Umeng sdk maven 地址
maven { url 'https://repo1.maven.org/maven2/'}
} }
} }
......
config.gradle
...@@ -5,11 +5,11 @@ ext { ...@@ -5,11 +5,11 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.08", "m-confide" : "0.0.49.09",
"m-consultant" : "0.0.59.77", "m-consultant" : "0.0.59.78",
"m-fm" : "0.0.30.03", "m-fm" : "0.0.30.03",
"m-user" : "0.0.61.30", "m-user" : "0.0.61.31",
"m-home" : "0.0.22.60", "m-home" : "0.0.22.61",
"m-im" : "0.0.18.53", "m-im" : "0.0.18.53",
"m-dynamic" : "0.0.7.22", "m-dynamic" : "0.0.7.22",
"m-article" : "0.0.0.8", "m-article" : "0.0.0.8",
...@@ -33,10 +33,10 @@ ext { ...@@ -33,10 +33,10 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.40.02", "ydl-platform" : "0.0.40.04",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.44", "ydl-webview" : "0.0.38.45",
"ydl-media" : "0.0.21.9", "ydl-media" : "0.0.21.9",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.37", "m-audioim" : "0.0.49.29.37",
...@@ -88,11 +88,11 @@ ext { ...@@ -88,11 +88,11 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.08", "m-confide" : "0.0.49.09",
"m-consultant" : "0.0.59.77", "m-consultant" : "0.0.59.78",
"m-fm" : "0.0.30.01", "m-fm" : "0.0.30.01",
"m-user" : "0.0.61.18", "m-user" : "0.0.61.31",
"m-home" : "0.0.22.54", "m-home" : "0.0.22.61",
"m-im" : "0.0.18.53", "m-im" : "0.0.18.53",
"m-dynamic" : "0.0.7.22", "m-dynamic" : "0.0.7.22",
"m-article" : "0.0.0.6", "m-article" : "0.0.0.6",
...@@ -115,10 +115,10 @@ ext { ...@@ -115,10 +115,10 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.40.02", "ydl-platform" : "0.0.40.04",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.44", "ydl-webview" : "0.0.38.45",
"ydl-media" : "0.0.21.9", "ydl-media" : "0.0.21.9",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.37", "m-audioim" : "0.0.49.29.37",
...@@ -230,8 +230,8 @@ ext { ...@@ -230,8 +230,8 @@ ext {
"flowlayout" : "cn.lankton:flowlayout:3.1.0", "flowlayout" : "cn.lankton:flowlayout:3.1.0",
"androidanimations" : "com.daimajia.androidanimations:library:2.3@aar", "androidanimations" : "com.daimajia.androidanimations:library:2.3@aar",
//友盟统计 //友盟统计
"umeng-common" : "com.umeng.umsdk:common:9.3.3", "umeng-common" : "com.umeng.umsdk:common:9.3.8",
"umeng-asms" :"com.umeng.umsdk:asms:1.1.4", "umeng-asms" :"com.umeng.umsdk:asms:1.2.2",
//友盟社会化分享 //友盟社会化分享
"umeng-share-core" : "com.umeng.umsdk:share-core:7.1.4", "umeng-share-core" : "com.umeng.umsdk:share-core:7.1.4",
"umeng-share-qq" : "com.umeng.umsdk:share-qq:7.1.4", "umeng-share-qq" : "com.umeng.umsdk:share-qq:7.1.4",
......
m-confide/src/main/java/com/ydl/confide/home/http/ConfideHomeHttpImpl.kt
...@@ -41,13 +41,11 @@ class ConfideHomeHttpImpl private constructor(): IConfideHomeHttp{ ...@@ -41,13 +41,11 @@ class ConfideHomeHttpImpl private constructor(): IConfideHomeHttp{
override fun recommendList(param : ConfideRecommendParam): Observable<BaseAPIResponse<ConfideHomeDataBean>> { override fun recommendList(param : ConfideRecommendParam): Observable<BaseAPIResponse<ConfideHomeDataBean>> {
var inuid = StringBuffer() val inUid = StringBuffer()
if (param != null && param.notInUid != null){ for (i in param.notInUid.indices) {
for (i in param.notInUid.indices) { inUid.append(param.notInUid[i])
inuid.append(param.notInUid[i]) if(i<param.notInUid.size-1){
if(i<param.notInUid.size-1){ inUid.append(",")
inuid.append(",")
}
} }
} }
...@@ -57,7 +55,7 @@ class ConfideHomeHttpImpl private constructor(): IConfideHomeHttp{ ...@@ -57,7 +55,7 @@ class ConfideHomeHttpImpl private constructor(): IConfideHomeHttp{
.append("sexType").append("=").append(param.getSexType()).append("&") .append("sexType").append("=").append(param.getSexType()).append("&")
.append("ageType").append("=").append(param.getAgeType()).append("&") .append("ageType").append("=").append(param.getAgeType()).append("&")
.append("goodType").append("=").append(param.getGoodType()).append("&") .append("goodType").append("=").append(param.getGoodType()).append("&")
.append("notInUid").append("=").append(inuid.toString()).append("&") .append("notInUid").append("=").append(inUid.toString()).append("&")
val confideParam = sb.toString() val confideParam = sb.toString()
return RxUtils.mapObservable(param) return RxUtils.mapObservable(param)
.flatMap { .flatMap {
......
ydl-platform/build.gradle
...@@ -65,7 +65,7 @@ android { ...@@ -65,7 +65,7 @@ android {
} }
dependencies { dependencies {
api fileTree(include: ['*.jar'], dir: 'libs') api fileTree(include: ['*.jar','*.aar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.appcompat:appcompat:1.2.0'
......
ydl-webview/src/main/java/com/ydl/webview/H5JsBean.kt
...@@ -141,7 +141,9 @@ class H5JsBean { ...@@ -141,7 +141,9 @@ class H5JsBean {
var closeReplaceChat=false var closeReplaceChat=false
var merchantType:String?="" var merchantType:String=""
var day:String="" // 预约日期
} }
} }
} }
ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
...@@ -445,7 +445,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler { ...@@ -445,7 +445,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
try { try {
Uri uri = Uri.parse(url); Uri uri = Uri.parse(url);
String host = uri.getHost(); String host = uri.getHost();
if (null != uri && !TextUtils.isEmpty(host) && host.contains("nodeapi.ydl")) { if (!TextUtils.isEmpty(host) && host.contains("nodeapi.ydl")) {
//马亮的需求，在nodeapi.ydl.com 地址后面拼上公共参数，用于判断是否为app //马亮的需求，在nodeapi.ydl.com 地址后面拼上公共参数，用于判断是否为app
String uriAppendSuffix = jtoJHandle.getUriAppendSuffix(); String uriAppendSuffix = jtoJHandle.getUriAppendSuffix();
resultUrl = WebUrlParamsUtils.getSuffix(url, uriAppendSuffix); resultUrl = WebUrlParamsUtils.getSuffix(url, uriAppendSuffix);
......
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