Browse Source

@task: deviceId

bai 3 years ago
parent
commit
b7effd9afb

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

@@ -12,6 +12,6 @@ const val IP = tencentIP
 
 const val pathDownloadMap = "adm/downloadMap?key="
 
-const val deviceId = "device_id"
+const val DEVICE_ID = "device_id"
 
 const val timestamp = "timestamp"

+ 3 - 2
demo/src/main/java/com/framework/mvvm/model/repository/AdmRepository.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import com.framework.app.api.Api
 import com.framework.app.base.IRepository
+import com.framework.app.DEVICE_ID
 import com.framework.mvvm.model.data.*
 import com.framework.mvvm.model.db.AdmDatabase
 import com.framework.mvvm.model.db.entity.*
@@ -358,7 +359,7 @@ class AdmRepository(
             val problemEquips =
                 problemEquipDao.getProblemByBuildingId(buildingId).filter { it.state == "1" }
 
-            val deviceId = sp.getString("deviceId", "") ?: ""
+            val deviceId = sp.getString(DEVICE_ID, "") ?: ""
 
             val building = Building(
                 buildingId = buildingId,
@@ -386,7 +387,7 @@ class AdmRepository(
                 }
                 is SuccessResponse -> {
                     val result = response.data
-                    Log.e("AdmViewModel", "uploadBuilding success: $result")
+                    Log.e("AdmViewModel", """uploadBuilding success: $result""")
                     files.forEach {
                         it.state = "2"
                         if (it.creationTime.isNullOrEmpty())

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

@@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import cn.sagacloud.cadengine.OkhttpUtil
 import com.framework.app.IP
-import com.framework.app.deviceId
+import com.framework.app.DEVICE_ID
 import com.framework.app.pathDownloadMap
 import com.framework.app.timestamp
 import com.framework.mvvm.model.db.entity.ObjectEntity
@@ -106,7 +106,7 @@ class AdmViewModel(private val repository: AdmRepository) : ViewModel() {
                         projectId = building.projectId,
                         groupCode = "BR",
                         buildingId = building.id,
-                        uploadFlag = sp.getString(deviceId, "") ?: "",
+                        uploadFlag = sp.getString(DEVICE_ID, "") ?: "",
                         lastDownloadTime = sp.getString(timestamp, "") ?: ""
                     )
                 ) {

+ 3 - 3
demo/src/main/java/com/sybotan/android/demo/DemoApp.kt

@@ -31,7 +31,7 @@ import android.util.Log
 import androidx.core.content.edit
 import com.arashivision.sdkcamera.InstaCameraSDK
 import com.arashivision.sdkmedia.InstaMediaSDK
-import com.framework.app.deviceId
+import com.framework.app.DEVICE_ID
 import com.framework.di.*
 import com.sybotan.android.demo.tools.AssetsUtil
 import org.kodein.di.DI
@@ -89,11 +89,11 @@ class DemoApp : Application(), DIAware {
 
         // Copy sample pictures from assets to local
         copyHdrSourceFromAssets()
-        val deviceId = sp.getString(deviceId, "") ?: ""
+        val deviceId = sp.getString(DEVICE_ID, "") ?: ""
 
         if (deviceId.isEmpty()) {
             sp.edit {
-                putString(deviceId, "${UUID.randomUUID()}")
+                putString(DEVICE_ID, "${UUID.randomUUID()}")
             }
         }