From f50e8e60e9da99e4f69d8ab76810dc7e5fb448bc Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 02 十二月 2024 10:29:09 +0800 Subject: [PATCH] 2024年12月02日10:29:05 --- app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 68 ++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java index cff9650..2dfbf4f 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java @@ -1,6 +1,8 @@ package com.hdl.photovoltaic.ui.newC; +import android.Manifest; +import android.content.DialogInterface; import android.os.Bundle; import android.view.View; @@ -21,9 +23,11 @@ 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; @@ -37,12 +41,12 @@ * C绔數绔欏垪琛ㄧ紪杈� */ public class PowerStationsListEdit extends CustomBaseActivity { - private ActivityPowerStationsListBinding viewBinding; + private ActivityPowerStationsListBinding viewBinding;//鏄惁鍦ㄧ紪杈戠姸鎬� private HouseListAdapter houseListAdapter; private List<HouseIdBean> houseListBeanIDList; - private boolean is_edit = false; + private boolean is_edit = false;//琛ㄧず鏄惁鍦ㄧ紪杈戠姸鎬�(true=鍦ㄧ紪杈戠姸鎬�) @Override public Object getContentView() { @@ -71,29 +75,33 @@ private void initEvent() { //杩斿洖鎸夐挳 - viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() { + viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (!is_edit) { finish(); return; } + is_edit = false; - viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.VISIBLE); + viewBinding.addPowerStationRl.setVisibility(View.VISIBLE);//娣诲姞鐢电珯缁勪欢 + viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.VISIBLE); initData();//鍒濆鍖栫紦瀛樻暟鎹� setAllItemEdit(false); houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 } }); //缂栬緫鎸夐挳 - viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setOnClickListener(new View.OnClickListener() { + viewBinding.toolbarTopRl.topMoreBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (is_edit) { return; } + is_edit = true; - viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.GONE); + viewBinding.addPowerStationRl.setVisibility(View.GONE);//娣诲姞鐢电珯缁勪欢 + viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.GONE); initData();//鍒濆鍖栫紦瀛樻暟鎹� setAllItemEdit(true); houseListAdapter.setList(houseListBeanIDList);//閲嶆柊鍒锋柊鍒楄〃 @@ -158,14 +166,28 @@ } }); + } viewBinding.addPowerStationTv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.CAMERA, new PermissionUtils.PermissionState() { + @Override + public void Success(int value) { + if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) { +// HdlThreadLogic.toast(_mActivity, R.string.permission_open); + return; + } + + +// startActivity(CaptureActivity.class); + startActivity(ScanActivity.class); + } + }, true); // String path = HDLUniMP.UNI_EVENT_OPEN_DEVICESCAN + "?scanType=addPowerStation"; // HdlUniLogic.getInstance().openUniMP(path, null); - startActivity(FastScanActivity.class); +// startActivity(FastScanActivity.class); } }); @@ -173,12 +195,10 @@ } private void initView() { - viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF)); - viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE); - viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c); - viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.power_station_selection); - viewBinding.toolbarTopFragmentHouseListRl.topMoreBtn.setVisibility(View.VISIBLE); - viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setImageResource(R.drawable.editor_house); + viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE); + viewBinding.toolbarTopRl.topTitleTv.setText(R.string.power_station_selection); + viewBinding.toolbarTopRl.topMoreBtn.setVisibility(View.VISIBLE); + viewBinding.toolbarTopRl.topMoreIv.setImageResource(R.drawable.editor_house); LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity); houseListAdapter = new HouseListAdapter(_mActivity); viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout); @@ -270,10 +290,11 @@ dialog.setTitle(getString(R.string.loading_title_tip)); dialog.setContent(getString(R.string.switch_power_station).replace("%s", "\"" + houseIdBean.getHomeName() + "\"")); dialog.show(); + dialog.isHideTitle(true); dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() { @Override public void Confirm() { - HdlResidenceLogic.getInstance().switchHouse(houseIdBean); + HdlResidenceLogic.getInstance().switchHouse(houseIdBean,true); dialog.dismiss(); JsonObject jsonObject = new JsonObject(); jsonObject.addProperty("homeId", houseIdBean.getHomeId()); @@ -308,6 +329,21 @@ dialog.dismiss(); } }); + + dialog.setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + //鍙栨秷涔嬪悗杩樺師涔嬪墠鐘舵�� + for (int i = 0; i < houseListBeanIDList.size(); i++) { + HouseIdBean houseIdBean = houseListBeanIDList.get(i); + houseIdBean.setState_select(false); + if (UserConfigManage.getInstance().getHomeId().equals(houseIdBean.getHomeId())) { + houseIdBean.setState_select(true); + } + } + houseListAdapter.notifyDataSetChanged(); + } + }); } @@ -331,7 +367,7 @@ @Override public void onFailure(HDLException e) { - + HdlThreadLogic.toast(_mActivity, e); } }); -- Gitblit v1.8.0