From 3d94f1da938ec81c6e666a1d6e09088769e0e538 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 27 六月 2023 13:48:04 +0800
Subject: [PATCH] 2023年06月27日13:47:26
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 81 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 31 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 fdff614..ede359c 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
@@ -5,7 +5,6 @@
import android.content.pm.PackageManager;
import android.hardware.camera2.CameraManager;
import android.os.Bundle;
-import android.os.SystemClock;
import android.util.Log;
import android.view.View;
@@ -13,38 +12,26 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.config.UserConfigManage;
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.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
-import com.hdl.photovoltaic.ui.bean.HouseListBean;
-import com.hdl.photovoltaic.ui.device.FastScanActivity;
+import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
-import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.PermissionUtils;
-import com.hdl.photovoltaic.widget.ConfirmationInputDialog;
-
-import org.json.JSONException;
-import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
-
-import io.dcloud.feature.unimp.DCUniMPJSCallback;
public class HouseListFragment extends CustomBaseFragment {
private FragmentHouseListBinding viewBinding;
private HouseInfoAdapter houseInfoAdapter;
private CameraManager manager;
- private List<HouseListBean> houseListBeanList = null;
+ private List<HouseIdBean> houseListBeanIDList = null;
@Override
@@ -71,8 +58,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() {
+ }
+ });
+
}
});
//璁剧疆涓嬫媺绠ご棰滆壊
@@ -90,11 +90,11 @@
public void onClick(int position) {
//鐐瑰嚮浣忓畢璇︽儏
HdlLogLogic.print("====鐐瑰嚮浣忓畢璇︽儏" + position);
- if (houseListBeanList == null || houseListBeanList.size() <= 0) {
+ if (houseListBeanIDList == null || houseListBeanIDList.size() <= 0) {
return;
}
- HouseListBean houseListBean = houseListBeanList.get(position);
- String path = HDLUniMP.UNI_EVENT_HOME_CREATION + "?homeId=" + houseListBean.getHomeId();
+ HouseIdBean houseIdBean = houseListBeanIDList.get(position);
+ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId();
HdlUniLogic.getInstance().openUniMP(path, null);
}
});
@@ -105,7 +105,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setVisibility(View.VISIBLE);
viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setImageResource(R.drawable.add);
LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
- houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanList);
+ houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanIDList);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
viewBinding.fragmentHouseSrlListRc.setAdapter(houseInfoAdapter);
@@ -113,12 +113,13 @@
}
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);
- }
+ this.houseListBeanIDList = new ArrayList<>();
+// for (int i = 0; i < 11; i++) {
+// HouseListBean houseListBean = new HouseListBean();
+// houseListBean.setHomeName("鐢电珯" + i);
+// this.houseListBeanList.add(houseListBean);
+// }
+ this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseInfoBeanList());
}
@@ -126,12 +127,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();
+ }
}
}
@@ -141,7 +149,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();
+ }
}
}
@@ -149,5 +159,14 @@
}
+ private PermissionsResultCallback mPermissionsResultCallback;
+
+ public interface PermissionsResultCallback {
+
+ void succeed();
+
+ void failing();
+
+ }
}
--
Gitblit v1.8.0