|
@@ -7,17 +7,14 @@ import android.view.View
|
|
|
import android.widget.Button
|
|
|
import android.widget.ImageView
|
|
|
import android.widget.TextView
|
|
|
-import android.widget.Toast
|
|
|
import com.sybotan.android.demo.R
|
|
|
import com.sybotan.android.demo.activities.BaseActivity
|
|
|
-import com.sybotan.android.demo.bean.request.Position
|
|
|
import com.sybotan.android.demo.bean.request.ReqDeviceJob
|
|
|
-import com.sybotan.android.demo.bean.result.ResDeviceModel
|
|
|
+import com.sybotan.android.demo.bean.result.Position
|
|
|
import com.sybotan.android.demo.entitiies.DeviceType
|
|
|
import com.sybotan.android.demo.retrofit.BaseViewModelInterface
|
|
|
import com.sybotan.android.demo.viewmodel.DeviceVM
|
|
|
import com.zbar.lib.CaptureActivity
|
|
|
-import com.sybotan.android.demo.bean.request.Z
|
|
|
|
|
|
class DeviceActivity : BaseActivity() {
|
|
|
companion object {
|
|
@@ -47,6 +44,12 @@ class DeviceActivity : BaseActivity() {
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
super.onCreate(savedInstanceState)
|
|
|
setContentView(R.layout.activity_device)
|
|
|
+
|
|
|
+ val intent = intent
|
|
|
+ val bundle = intent.getBundleExtra("equip")
|
|
|
+ val spaceId = bundle.getString("spaceId")
|
|
|
+ val position = bundle.getSerializable("position") as Position
|
|
|
+
|
|
|
val deviceCl = findViewById<ConstraintLayout>(R.id.deviceCl)
|
|
|
deviceOkIv = findViewById(R.id.deviceOkIv)
|
|
|
deviceInfoTv = findViewById(R.id.deviceInfoTv)
|
|
@@ -75,10 +78,10 @@ class DeviceActivity : BaseActivity() {
|
|
|
val saveBtn = findViewById<Button>(R.id.saveBtn)
|
|
|
saveBtn.setOnClickListener {
|
|
|
val deivce = ReqDeviceJob(
|
|
|
- spaceId = "12",
|
|
|
+ spaceId = spaceId,
|
|
|
type = mType,
|
|
|
remark = mRemark,
|
|
|
- position = Position(x = "1", y = "1",z = Z("2","wall"))
|
|
|
+ position = position
|
|
|
)
|
|
|
mDeviceModel.addDevice(deivce)
|
|
|
}
|
|
@@ -90,8 +93,8 @@ class DeviceActivity : BaseActivity() {
|
|
|
private fun initViewModel() {
|
|
|
mDeviceModel = DeviceVM(BaseViewModelInterface { name, params ->
|
|
|
if (name == DeviceVM.DEVICE_ADD) {
|
|
|
- val response = params as ResDeviceModel
|
|
|
- println("response: $response")
|
|
|
+ setResult(RESULT_OK)
|
|
|
+ finish()
|
|
|
}
|
|
|
}, this)
|
|
|
}
|