修改设备信息

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

@@ -1,8 +1,11 @@
 package com.ckkj.water.device;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseActivity;
@@ -14,7 +17,9 @@ import com.ckkj.water.device.adapter.DeviceTimeSelectAdapter;
 import com.ckkj.water.device.mvp.DeviceContract;
 import com.ckkj.water.device.mvp.DeviceImpl;
 import com.ckkj.water.device.mvp.DevicePresenter;
+import com.ckkj.water.index.entity.IndexDeviceEntity;
 import com.ckkj.water.network.BaseBean;
+import com.ckkj.water.utils.show.ToastUtil;
 import com.gyf.immersionbar.ImmersionBar;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.core.BasePopupView;
@@ -29,6 +34,7 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
         implements DeviceContract.DeviceView {
 
     private List<String> mTimeList = new ArrayList<>();
+    private IndexDeviceEntity mDeviceEntity;
     private DeviceTimeSelectAdapter mAdapter;
     @Override
     public DevicePresenter createPresenter() {
@@ -38,6 +44,15 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
     @Override
     public void initData(Bundle savedInstanceState) {
         super.initData(savedInstanceState);
+        Bundle bundle = getIntent().getExtras();
+        if(bundle != null){
+            mDeviceEntity = (IndexDeviceEntity) bundle.getSerializable("device_info");
+            if(mDeviceEntity != null){
+                showLoadingDialog();
+                mPresenter.getDeviceDetailInfo(mDeviceEntity.getId());
+                viewBinding.includedTitle.tvTitle.setText(mDeviceEntity.getDeviceName());
+            }
+        }
         mTimeList.add("1min");
         mTimeList.add("2min");
         mTimeList.add("3min");
@@ -55,8 +70,8 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
                 .statusBarDarkFont(true) // 设置状态栏字体为黑色
                 .titleBar(viewBinding.rlTitle)
                 .init();
-        viewBinding.includedTitle.tvTitle.setText("设备名称");
         viewBinding.includedTitle.imgSetting.setVisibility(View.VISIBLE);
+        viewBinding.includedTitle.imgSetting.setImageDrawable(getDrawable(R.mipmap.device_ctrl_setting));
         mAdapter = new DeviceTimeSelectAdapter(mContext,R.layout.device_work_time_item,mTimeList);
         viewBinding.rvTimeList.setAdapter(mAdapter);
         viewBinding.rvTimeList.addItemDecoration(new GridSpacingItemDecoration(4, 10, true));
@@ -90,7 +105,9 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
                 break;
 
             case R.id.img_setting:
-                goTo(mContext, DeviceSettingsActivity.class,null);
+                Bundle bundle = new Bundle();
+                bundle.putSerializable("device_entity",mDeviceEntity);
+                goToForResult(mContext, DeviceSettingsActivity.class,REQUEST_EVENT_CODE_10002,bundle);
                 break;
 
             case R.id.linear_bt:
@@ -117,6 +134,29 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
         }
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if(resultCode == RESULT_OK){
+            switch (requestCode){
+                case REQUEST_EVENT_CODE_10002:
+                    mDeviceEntity = (IndexDeviceEntity) data.getSerializableExtra("device_entity");
+                    viewBinding.includedTitle.tvTitle.setText(mDeviceEntity.getDeviceName());
+                    break;
+            }
+        }
+    }
+
+    /**
+     * 获取设备详情成功
+     * @param bean
+     */
+    @Override
+    public void getDeviceDetailInfo(IndexDeviceEntity bean) {
+        hideDialogLoading();
+
+    }
+
     @Override
     public int getLayoutResId(Bundle savedInstanceState) {
         return 0;
@@ -124,7 +164,8 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
 
     @Override
     public void showError(String message) {
-
+        hideDialogLoading();
+        ToastUtil.showShort(mContext,message);
     }
 
     @Override
@@ -137,6 +178,8 @@ public class DeviceControlActivity extends BaseActivity<DeviceControlLayoutBindi
 
     }
 
+
+
     @Override
     public void editDeviceInfoSuccess(BaseBean bean) {