[Change]

修复http DNS加载不到映射关系bug

app/src/main/res/layout/activity_live_play.xml

@@ -313,7 +313,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="请输入要查看的车机SN"
-                    android:text="X2020210526D3DC7BA891CE2D76"
+                    android:text="F803EB2046PZD00274"
                     android:textColor="#850808"
                     android:textSize="16sp"
                     app:layout_constraintEnd_toEndOf="parent"

foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/HttpDnsHelper.kt

@@ -66,7 +66,7 @@ internal class HttpDnsHelper(private val builder: MogoHttpDnsConfig) : Handler.C
     private fun getHttpDnsAddressFromNet() {
         val nAddress = apiManager.requestHttpDns(builder.getCurrentLocation()!!)
         if (addressChangedListener == null) {
-            return
+            L.d(TAG, "addressChangeList is null")
         }
         if (nAddress == null || nAddress.isEmpty()) {
             return
@@ -118,7 +118,7 @@ internal class HttpDnsHelper(private val builder: MogoHttpDnsConfig) : Handler.C
         return defaultUrl ?: host
     }
 
-    override fun getHttpDnsCachedAddress(type: Int, _host: String): String {
+    override fun getHttpDnsCachedAddress(type: Int, _host: String): String? {
         val host = _host.toLowerCase(Locale.getDefault())
         httpDnsCache?.let {
             val currentLoc = builder.getCurrentLocation()?.getCurrentLocation()
@@ -140,7 +140,7 @@ internal class HttpDnsHelper(private val builder: MogoHttpDnsConfig) : Handler.C
             }
         }
         val default = defaultUrl ?: host
-        return addressMap?.get("$type-$host") ?: default
+        return addressMap?.get("$type-$host")
     }
 
     override fun getAllAddress(): Map<String, String>? {

foudations/mogo-httpdns/src/main/java/com/mogo/cloud/httpdns/MogoHttpDnsClient.kt

@@ -18,7 +18,7 @@ object MogoHttpDnsClient : IMogoHttpDns {
      * 先从本地缓存中根据type和host获取ip:port，如果本地缓存中没有，再通过网络获取
      */
     fun getHttpDnsAddressUseCacheIfNecessary(type: Int, _host: String): String? {
-        return getHttpDnsCachedAddress(type, _host)
+        return getHttpDnsCachedAddress(type, _host) ?: return getHttpDnsAddress(type, _host)
     }
 
     override fun addressChangedListener(addressChangedListener: OnAddressChangedListener) {

gradle.properties

@@ -33,7 +33,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
 USERNAME=xintai
 PASSWORD=xintai2018
 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
-RELEASE=true
+RELEASE=false
 # AI CLOUD 云平台
 # 工具类
 MOGO_UTILS_VERSION=1.3.31