Browse Source

@task: restructure ip

bai 3 years ago
parent
commit
39358722d2

+ 2 - 0
demo/src/main/java/com/framework/app/Constants.kt

@@ -7,6 +7,8 @@ const val testIP = "http://192.168.0.48:8876/"
 
 const val tencentIP = "http://82.157.28.170:8876/"
 
+const val IP = testIP
+
 const val pathDownloadMap = "adm/downloadMap?key="
 
 const val deviceId = "device_id"

+ 2 - 2
demo/src/main/java/com/framework/di/Di.kt

@@ -3,7 +3,7 @@ package com.framework.di
 import android.content.Context
 import android.util.Log
 import com.framework.app.api.Api
-import com.framework.app.tencentIP
+import com.framework.app.IP
 import com.framework.mvvm.model.db.AdmDatabase
 import com.framework.mvvm.model.repository.AdmRepository
 import com.framework.mvvm.mv.AdmViewModel
@@ -22,7 +22,7 @@ val httpModule = DI.Module("netModule") {
     bind {
         singleton {
             Retrofit.Builder()
-                .baseUrl(tencentIP)
+                .baseUrl(IP)
                 .client(instance())
                 .addConverterFactory(GsonConverterFactory.create())
                 .build()

+ 2 - 2
demo/src/main/java/com/framework/mvvm/mv/AdmViewModel.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import cn.sagacloud.cadengine.OkhttpUtil
 import com.framework.app.pathDownloadMap
-import com.framework.app.tencentIP
+import com.framework.app.IP
 import com.framework.mvvm.model.db.entity.ObjectEntity
 import com.framework.mvvm.model.repository.AdmRepository
 import com.framework.mvvm.model.vo.AdmRequest
@@ -54,7 +54,7 @@ class AdmViewModel(private val repository: AdmRepository) : ViewModel() {
                         val info = Json.decodeFromString<FloorInfo>(strInfo)
                         val map = info.floorMap
                         val floorMap =
-                            OkhttpUtil.getGzipMap("$tencentIP$pathDownloadMap${map!!}")
+                            OkhttpUtil.getGzipMap("$IP$pathDownloadMap${map!!}")
                         it.floorMap = floorMap
                         repository.updateObject(it)
                     } catch (e: Exception) {