Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java

@@ -22,13 +22,13 @@
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.device.FastScanActivity;
import com.hdl.photovoltaic.ui.device.ScanActivity;
import com.hdl.photovoltaic.ui.newC.adapter.HouseListAdapter;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.zxing.qrcode.CaptureActivity;

import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -83,7 +83,7 @@
                }

                is_edit = false;
                viewBinding.addPowerStationTv.setVisibility(View.VISIBLE);//添加电站组件
                viewBinding.addPowerStationRl.setVisibility(View.VISIBLE);//添加电站组件
                viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.VISIBLE);
                initData();//初始化缓存数据
                setAllItemEdit(false);
@@ -99,7 +99,7 @@
                }

                is_edit = true;
                viewBinding.addPowerStationTv.setVisibility(View.GONE);//添加电站组件
                viewBinding.addPowerStationRl.setVisibility(View.GONE);//添加电站组件
                viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.GONE);
                initData();//初始化缓存数据
                setAllItemEdit(true);
@@ -177,7 +177,10 @@
//                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
                            return;
                        }
                        startActivity(FastScanActivity.class);


//                        startActivity(CaptureActivity.class);
                        startActivity(ScanActivity.class);
                    }
                }, true);
//                String path = HDLUniMP.UNI_EVENT_OPEN_DEVICESCAN + "?scanType=addPowerStation";
@@ -348,7 +351,7 @@

                    @Override
                    public void onFailure(HDLException e) {

                        HdlThreadLogic.toast(_mActivity, e);
                    }
                });