From b25b6b325094511ff800e676171eae8831ad40d9 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 13 六月 2023 22:01:33 +0800 Subject: [PATCH] 2023年06月13日22:01:19 --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 46 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 35 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java index 55b887a..1b34ca7 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java @@ -1,22 +1,29 @@ package com.hdl.photovoltaic.ui.powerstation; +import android.Manifest; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.hardware.camera2.CameraManager; import android.os.Bundle; import android.util.Log; import android.view.View; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.hdl.photovoltaic.R; import com.hdl.photovoltaic.databinding.FragmentHouseListBinding; import com.hdl.photovoltaic.base.CustomBaseFragment; +import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter; -import com.hdl.photovoltaic.ui.bean.HouseInfoBean; +import com.hdl.photovoltaic.ui.bean.HouseListBean; import com.hdl.photovoltaic.ui.device.FastScanActivity; -import com.hdl.photovoltaic.utils.FlashLightUtils; +import com.hdl.photovoltaic.utils.PermissionUtils; +import com.hdl.photovoltaic.widget.ConfirmationDialog; +import com.hdl.photovoltaic.widget.ConfirmationInputDialog; import java.util.ArrayList; import java.util.List; @@ -26,7 +33,7 @@ private HouseInfoAdapter houseInfoAdapter; private CameraManager manager; - private List<HouseInfoBean> houseInfoBeanList = null; + private List<HouseListBean> houseListBeanList = null; @Override public Object getContentView() { @@ -49,12 +56,17 @@ private void initEvent() { + viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(); - intent.setClass(_mActivity, FastScanActivity.class); - startActivity(intent); + String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.CAMERA}); + if (ary.length > 0) { + requestPermissions(ary, PermissionUtils.STATUS_SUCCESS); + } else { + startActivity(FastScanActivity.class); + } + } }); //璁剧疆涓嬫媺绠ご棰滆壊 @@ -74,7 +86,7 @@ viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setVisibility(View.VISIBLE); viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setImageResource(R.drawable.add); LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity); - houseInfoAdapter = new HouseInfoAdapter(this.houseInfoBeanList); + houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanList); viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout); viewBinding.fragmentHouseSrlListRc.setAdapter(houseInfoAdapter); @@ -82,15 +94,27 @@ } private void initData() { - this.houseInfoBeanList = new ArrayList<>(); + this.houseListBeanList = new ArrayList<>(); for (int i = 0; i < 11; i++) { - HouseInfoBean houseInfoBean = new HouseInfoBean(); - houseInfoBean.setName("鐢电珯" + i); - this.houseInfoBeanList.add(houseInfoBean); + HouseListBean houseListBean = new HouseListBean(); + houseListBean.setHomeName("鐢电珯" + i); + this.houseListBeanList.add(houseListBean); } } + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + if (requestCode == PermissionUtils.STATUS_SUCCESS) { + for (int i = 0; i < permissions.length; i++) { + if (grantResults[i] == PackageManager.PERMISSION_GRANTED) { + startActivity(FastScanActivity.class); + } + } + } + + } } -- Gitblit v1.8.0