|
@@ -63,16 +63,19 @@ class PocActivity : BaseActivity(), DIAware {
|
|
|
private lateinit var version: TextView
|
|
|
|
|
|
// 测试用,后期动态设置
|
|
|
- private val request =
|
|
|
+ /* private val request =
|
|
|
AdmRequest(userId = "admjd", projectId = "Pj9909990002", groupCode = "JD")
|
|
|
-
|
|
|
- //private val request =
|
|
|
- // AdmRequest(userId = "bdtp", projectId = "Pj5001120003", groupCode = "XG")
|
|
|
-
|
|
|
+*/
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
super.onCreate(savedInstanceState)
|
|
|
setContentView(R.layout.activity_poc)
|
|
|
checkStoragePermission()
|
|
|
+ val bundle = intent.getBundleExtra("project")!!
|
|
|
+ val userId = bundle.getString("userId")!!
|
|
|
+ val projectId = bundle.getString("projectId")!!
|
|
|
+ val groupCode = bundle.getString("groupCode")!!
|
|
|
+ val request = AdmRequest(userId = userId, projectId = projectId, groupCode = groupCode)
|
|
|
+
|
|
|
downloadBtn = findViewById(R.id.downloadBtn)
|
|
|
uploadBtn = findViewById(R.id.uploadBtn)
|
|
|
dictBtn = findViewById(R.id.dictBtn)
|
|
@@ -87,7 +90,7 @@ class PocActivity : BaseActivity(), DIAware {
|
|
|
scene3DBtn.setOnClickListener { startActivity<Scene3DActivity>() }
|
|
|
|
|
|
downloadBtn.setOnClickListener {
|
|
|
- mVm.downloadBuilding(sp) {
|
|
|
+ mVm.downloadBuilding(request, sp) {
|
|
|
// ToastUtils.showMyToast("下载完成")
|
|
|
val builder = AlertDialog.Builder(this)
|
|
|
val dialog = builder.setMessage("建筑数据下载成功")
|
|
@@ -97,14 +100,14 @@ class PocActivity : BaseActivity(), DIAware {
|
|
|
dialog.show()
|
|
|
}
|
|
|
// 单独下载一边关系数据
|
|
|
- mVm.downloadBuilding(sp, true)
|
|
|
+ mVm.downloadBuilding(request, sp, true)
|
|
|
}
|
|
|
|
|
|
uploadBtn.setOnClickListener {
|
|
|
lifecycleScope.launch(Dispatchers.IO) {
|
|
|
LocalDataOperation.getInstance().offlineSendRequest.uploadImageNew(this@PocActivity)
|
|
|
}
|
|
|
- mVm.uploadBuilding {
|
|
|
+ mVm.uploadBuilding(request) {
|
|
|
// ToastUtils.showMyToast("建筑数据上传成功")
|
|
|
val builder = AlertDialog.Builder(this)
|
|
|
val dialog = builder.setMessage("建筑数据上传成功")
|