From 8231d2af7893e221d90c71bd5dec4cf3f2f1f0ce Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 30 十一月 2023 19:07:59 +0800 Subject: [PATCH] 2023年11月30日19:07:47 --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 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 e24ddaf..0075e20 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 @@ -2,6 +2,7 @@ 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; @@ -25,6 +26,7 @@ import com.hdl.photovoltaic.other.HdlUniLogic; import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter; import com.hdl.photovoltaic.ui.bean.HouseIdBean; +import com.hdl.photovoltaic.ui.device.FastScanActivity; import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.utils.PermissionUtils; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; @@ -73,16 +75,19 @@ private void initEvent() { + + //娣诲姞鐢电珯 viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - - // 鎵撳紑灏忕▼搴忛〉闈� -// HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); requestPermissions(new PermissionsResultCallback() { @Override public void succeed() { - // 鎵撳紑灏忕▼搴忛〉闈� + +// Intent intent = new Intent(); +// intent.setClass(_mActivity, FastScanActivity.class); +// startActivity(intent); +// // 鎵撳紑灏忕▼搴忛〉闈� HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); } @@ -110,9 +115,6 @@ HdlResidenceLogic.getInstance().switchHouse(houseIdBean); String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName(); HdlUniLogic.getInstance().openUniMP(path, null); - HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏===1", true); - HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏===2", true); - HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏===3", true); } }); @@ -230,9 +232,10 @@ mPermissionsResultCallback = permissionsResultCallback; - //Manifest.permission.CAMERA, + String[] s = new String[]{ Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.CAMERA, }; String[] ary = PermissionUtils.checkPermission(_mActivity, s); if (ary.length > 0) { -- Gitblit v1.8.0