|
@@ -4,20 +4,21 @@ import android.Manifest
|
|
|
import android.content.SharedPreferences
|
|
|
import android.content.pm.PackageManager
|
|
|
import android.os.Bundle
|
|
|
+import android.widget.Button
|
|
|
import androidx.appcompat.app.AppCompatActivity
|
|
|
import androidx.constraintlayout.widget.ConstraintLayout
|
|
|
import androidx.core.app.ActivityCompat
|
|
|
import androidx.core.content.edit
|
|
|
-import androidx.lifecycle.Lifecycle
|
|
|
import androidx.lifecycle.lifecycleScope
|
|
|
-import androidx.lifecycle.repeatOnLifecycle
|
|
|
+import com.framework.app.deviceId
|
|
|
+import com.framework.app.timestamp
|
|
|
import com.framework.app.tools.MacUtil
|
|
|
import com.framework.mvvm.model.vo.AdmRequest
|
|
|
import com.framework.mvvm.mv.AdmViewModel
|
|
|
import com.sybotan.android.demo.R
|
|
|
import com.sybotan.android.demo.activities.poc.SceneActivity
|
|
|
import com.sybotan.android.demo.activities.poc.SpaceActivity
|
|
|
-import kotlinx.coroutines.flow.collect
|
|
|
+import com.sybotan.android.demo.tools.ToastUtils
|
|
|
import kotlinx.coroutines.launch
|
|
|
import org.jetbrains.anko.startActivity
|
|
|
import org.kodein.di.DI
|
|
@@ -35,10 +36,49 @@ class PocActivity : AppCompatActivity(), DIAware {
|
|
|
|
|
|
private val REQUEST_EXTERNAL_STORAGE = 1 // 不可改
|
|
|
|
|
|
+ private lateinit var downloadBtn: Button
|
|
|
+
|
|
|
+ private lateinit var uploadBtn: Button
|
|
|
+
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
super.onCreate(savedInstanceState)
|
|
|
setContentView(R.layout.activity_poc)
|
|
|
checkStoragePermission()
|
|
|
+ downloadBtn = findViewById(R.id.downloadBtn)
|
|
|
+ uploadBtn = findViewById(R.id.uploadBtn)
|
|
|
+ downloadBtn.setOnClickListener {
|
|
|
+ lifecycleScope.launch {
|
|
|
+ val buildings = mVm.getBuildings()
|
|
|
+ println("download buildings: ${buildings.size} $buildings")
|
|
|
+ for (building in buildings) {
|
|
|
+ mVm.requestBuilding(
|
|
|
+ AdmRequest(
|
|
|
+ userId = "bdtp",
|
|
|
+ projectId = building.projectId,
|
|
|
+ groupCode = "BR",
|
|
|
+ buildingId = building.id,
|
|
|
+ uploadFlag = sp.getString(deviceId, "") ?: "",
|
|
|
+ lastDownloadTime = sp.getString(timestamp, "") ?: ""
|
|
|
+ )
|
|
|
+ ) {
|
|
|
+ println("buildingIdTimestamp -> ${it.buildingId}, ${it.timestamp}")
|
|
|
+ sp.edit { putString(it.buildingId, it.timestamp) }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ uploadBtn.setOnClickListener {
|
|
|
+ lifecycleScope.launch {
|
|
|
+ val buildings = mVm.getBuildings()
|
|
|
+ println("upload buildings: $buildings")
|
|
|
+ for (building in buildings) {
|
|
|
+ mVm.uploadBuilding(building.id)
|
|
|
+ }
|
|
|
+ ToastUtils.showMyToast("建筑数据上传完成")
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
val spaceCL = findViewById<ConstraintLayout>(R.id.spaceCL)
|
|
|
spaceCL.setOnClickListener {
|
|
|
startActivity<SpaceActivity>()
|
|
@@ -103,24 +143,6 @@ class PocActivity : AppCompatActivity(), DIAware {
|
|
|
putString("deviceId", mac)
|
|
|
}
|
|
|
|
|
|
- lifecycleScope.launch {
|
|
|
- lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
|
|
|
- mVm.buildings.collect { buildings ->
|
|
|
- println("buildings in flow: $buildings")
|
|
|
- for (building in buildings) {
|
|
|
- mVm.requestBuilding(
|
|
|
- AdmRequest(
|
|
|
- userId = "bdtp",
|
|
|
- projectId = building.projectId,
|
|
|
- groupCode = "BR",
|
|
|
- buildingId = building.id!!,
|
|
|
- uploadFlag = sp.getString("deviceId", "") ?: ""
|
|
|
- )
|
|
|
- )
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
}
|