Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

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

@@ -1,7 +1,6 @@
package com.hdl.photovoltaic.ui.newC;


import android.content.Intent;
import android.os.Bundle;
import android.view.View;

@@ -10,7 +9,6 @@

import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
@@ -21,14 +19,9 @@
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.CPowerStationActivity;
import com.hdl.photovoltaic.ui.StartActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.newC.adapter.HouseListAdapter;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;

import java.util.ArrayList;
@@ -72,7 +65,7 @@

    private void initEvent() {
        //返回按钮
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                if (!is_edit) {
@@ -115,9 +108,13 @@
            houseListAdapter.setMoveOnclickListener(new HouseListAdapter.OnMoveClickListener() {
                @Override
                public void onMoveClick(int position, HouseIdBean houseIdBean) {
                    if (position == 0) {
                        HdlThreadLogic.toast(_mActivity, getString(R.string.already_the_first_one));
                        return;
                    }
                    String frontHomeId = "";
                    if (position > 0) {
                        frontHomeId = houseListBeanIDList.get(position - 1).getHomeId();
                    if (position > 1) {
                        frontHomeId = houseListBeanIDList.get(position - 2).getHomeId();
                    }
                    HdlResidenceLogic.getInstance().moveResidence(houseIdBean.getHomeId(), frontHomeId, new CloudCallBeak<Boolean>() {
                        @Override
@@ -125,6 +122,7 @@
                            //移动电站位置
                            HdlResidenceLogic.getInstance().moveHouseId(houseIdBean.getHomeId());
                            initData();//初始化缓存数据
                            setAllItemEdit(is_edit);
                            houseListAdapter.setList(houseListBeanIDList);//重新刷新列表
                            nullDataUpdateUi(houseListBeanIDList);//检测数据是否为空
                        }
@@ -160,7 +158,7 @@

    private void initView() {
        viewBinding.toolbarTopFragmentHouseListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
        viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
        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);
@@ -258,19 +256,17 @@
        dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
            @Override
            public void Confirm() {
                UserConfigManage.getInstance().setHomeId(houseIdBean.getHomeId());
                UserConfigManage.getInstance().Save();
                HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
                dialog.dismiss();
                JsonObject jsonObject = new JsonObject();
                jsonObject.addProperty("homeId", houseIdBean.getHomeId());
                jsonObject.addProperty("homeName", houseIdBean.getHomeName());
                jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus());
                jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus() + "");
                HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
                uniCallBackBaseBean.setData(jsonObject);
                HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
                finish();

//                //todo 逻辑: 这里可以指定关闭小程序详情，然后再重新打开详情界面;
//                String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C
//                        + "?homeId=" + houseIdBean.getHomeId()
@@ -283,6 +279,14 @@
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
            @Override
            public void Cancel() {
                //取消之后还原之前状态
                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();
                dialog.dismiss();
            }