Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebu...

刘卫锦

2023-06-27 fcad47d04eee15a9c1c9e5a27314163c201c3c26

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java

@@ -20,8 +20,11 @@
import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.databinding.LoadingConfirmInputBinding;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.MyPowerStationActivity;
import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
import com.hdl.photovoltaic.ui.bean.HouseListBean;
import com.hdl.photovoltaic.ui.device.FastScanActivity;
@@ -44,6 +47,7 @@
    private CameraManager manager;

    private List<HouseListBean> houseListBeanList = null;


    @Override
    public Object getContentView() {
@@ -69,8 +73,21 @@
        viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

                // 打开小程序页面
                HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_HOME_CREATION, null);
//                HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
                requestPermissions(new PermissionsResultCallback() {
                    @Override
                    public void succeed() {
                        // 打开小程序页面
                        HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
                    }

                    @Override
                    public void failing() {
                    }
                });

            }
        });
        //设置下拉箭头颜色
@@ -81,6 +98,19 @@

                viewBinding.fragmentHouseSrl.setRefreshing(false);
                Log.d("HouseListFragment", "下拉刷新");
            }
        });
        houseInfoAdapter.setNoOnclickListener(new HouseInfoAdapter.OnclickListener() {
            @Override
            public void onClick(int position) {
                //点击住宅详情
                HdlLogLogic.print("====点击住宅详情" + position);
                if (houseListBeanList == null || houseListBeanList.size() <= 0) {
                    return;
                }
                HouseListBean houseListBean = houseListBeanList.get(position);
                String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseListBean.getHomeId();
                HdlUniLogic.getInstance().openUniMP(path, null);
            }
        });
    }
@@ -99,11 +129,12 @@

    private void initData() {
        this.houseListBeanList = new ArrayList<>();
        for (int i = 0; i < 11; i++) {
            HouseListBean houseListBean = new HouseListBean();
            houseListBean.setHomeName("电站" + i);
            this.houseListBeanList.add(houseListBean);
        }
//        for (int i = 0; i < 11; i++) {
//            HouseListBean houseListBean = new HouseListBean();
//            houseListBean.setHomeName("电站" + i);
//            this.houseListBeanList.add(houseListBean);
//        }
        this.houseListBeanList.addAll(HdlResidenceLogic.getInstance().getHouseInfoBeanList());


    }
@@ -111,12 +142,19 @@
    /**
     * 申请权限
     */
    private void requestPermissions() {
        String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.CAMERA});
    private void requestPermissions(PermissionsResultCallback permissionsResultCallback) {
        mPermissionsResultCallback = permissionsResultCallback;
        //Manifest.permission.CAMERA,
        String[] s = new String[]{
                Manifest.permission.ACCESS_FINE_LOCATION
        };
        String[] ary = PermissionUtils.checkPermission(_mActivity, s);
        if (ary.length > 0) {
            requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
        } else {
            startActivity(FastScanActivity.class);
            if (mPermissionsResultCallback != null) {
                mPermissionsResultCallback.succeed();
            }
        }
    }

@@ -126,7 +164,9 @@
        if (requestCode == PermissionUtils.STATUS_SUCCESS) {
            for (int i = 0; i < permissions.length; i++) {
                if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
                    startActivity(FastScanActivity.class);
                    if (mPermissionsResultCallback != null) {
                        mPermissionsResultCallback.succeed();
                    }
                }

            }
@@ -134,5 +174,14 @@

    }

    private PermissionsResultCallback mPermissionsResultCallback;

    public interface PermissionsResultCallback {

        void succeed();

        void failing();

    }

}