Commit 2b3ed756 by YKai

feat:防抓包代码合并,对应组件升级

parent d09b2fd7
...@@ -36,7 +36,7 @@ ext { ...@@ -36,7 +36,7 @@ ext {
"ydl-platform" : "0.0.40.02", "ydl-platform" : "0.0.40.02",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.43", "ydl-webview" : "0.0.38.44",
"ydl-media" : "0.0.21.8", "ydl-media" : "0.0.21.8",
"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",
...@@ -118,7 +118,7 @@ ext { ...@@ -118,7 +118,7 @@ ext {
"ydl-platform" : "0.0.40.02", "ydl-platform" : "0.0.40.02",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.43", "ydl-webview" : "0.0.38.44",
"ydl-media" : "0.0.21.8", "ydl-media" : "0.0.21.8",
"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",
......
...@@ -20,7 +20,7 @@ object ProxyCheckUtils { ...@@ -20,7 +20,7 @@ object ProxyCheckUtils {
val proxyAddress: String val proxyAddress: String
val proxyPort: Int val proxyPort: Int
if (IS_ICS_OR_LATER) { if (IS_ICS_OR_LATER) {
proxyAddress = System.getProperty("http.proxyHost") proxyAddress = System.getProperty("http.proxyHost")?:""
val portStr = System.getProperty("http.proxyPort") val portStr = System.getProperty("http.proxyPort")
proxyPort = (portStr ?: "-1").toInt() proxyPort = (portStr ?: "-1").toInt()
} else { } else {
......
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