修改设备信息/解绑设备

app/src/main/java/com/ckkj/water/device/DeviceSettingsActivity.java

@@ -2,11 +2,13 @@ package com.ckkj.water.device;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.View;
 
 import androidx.annotation.Nullable;
 
 import com.ckkj.water.ConstantUtil;
+import com.ckkj.water.EventMessage;
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseActivity;
 import com.ckkj.water.base.BaseFragment;
@@ -19,6 +21,10 @@ import com.ckkj.water.network.BaseBean;
 import com.ckkj.water.utils.show.ToastUtil;
 import com.gyf.immersionbar.ImmersionBar;
 
+import de.greenrobot.event.EventBus;
+import de.greenrobot.event.Subscribe;
+import de.greenrobot.event.ThreadMode;
+
 /**
  * 设备控制页面
  */
@@ -65,6 +71,9 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
     public void onClick(View v){
         switch (v.getId()){
             case R.id.img_back:
+                Intent intent = new Intent();
+                intent.putExtra("device_entity",mDeviceEntity);
+                setResult(RESULT_OK,intent);
                 finish();
                 break;
 
@@ -124,6 +133,14 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        Intent intent = new Intent();
+        intent.putExtra("device_entity",mDeviceEntity);
+        setResult(RESULT_OK,intent);
+        super.onBackPressed();
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -153,12 +170,24 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
 
     @Override
     public void finish() {
-        Intent intent = new Intent();
-        intent.putExtra("device_entity",mDeviceEntity);
-        setResult(RESULT_OK,intent);
+
         super.finish();
     }
 
+    @Override
+    public void deleteDeviceSuccess(BaseBean bean) {
+        hideDialogLoading();
+        ToastUtil.showShort(mContext, getString(R.string.unbind_success));
+        EventBus.getDefault().post(new EventMessage(EventMessage.ACTIVITY_FINISH));
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                finish();
+            }
+        },500);
+    }
+
+
     @Override
     public int getLayoutResId(Bundle savedInstanceState) {
         return 0;
@@ -186,10 +215,7 @@ public class DeviceSettingsActivity extends BaseActivity<DeviceSettingsLayoutBin
 
 
 
-    @Override
-    public void deleteDeviceSuccess(BaseBean bean) {
 
-    }
 
     @Override
     public void turnOnOffDeviceSuccess(BaseBean bean) {