From a1ac20d9cbe90b566bffe3ed39a6e07700c3248f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 19 六月 2023 10:30:06 +0800
Subject: [PATCH] Merge branch 'wjc'
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 15 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 346bf75..fdff614 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,31 +1,51 @@
package com.hdl.photovoltaic.ui.powerstation;
+import android.Manifest;
import android.content.Context;
+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;
+import androidx.annotation.NonNull;
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.HdlUniLogic;
import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
-import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
-import com.hdl.photovoltaic.utils.FlashLightUtils;
+import com.hdl.photovoltaic.ui.bean.HouseListBean;
+import com.hdl.photovoltaic.ui.device.FastScanActivity;
+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 FlashLightUtils flashLightUtils;
private CameraManager manager;
- private List<HouseInfoBean> houseInfoBeanList = null;
+ private List<HouseListBean> houseListBeanList = null;
+
@Override
public Object getContentView() {
@@ -35,7 +55,6 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- flashLightUtils = new FlashLightUtils(_mActivity);
manager = (CameraManager) _mActivity.getSystemService(Context.CAMERA_SERVICE);
initData();
@@ -47,14 +66,13 @@
}
-
private void initEvent() {
-
viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
+ // 鎵撳紑灏忕▼搴忛〉闈�
+ HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_HOME_CREATION, null);
}
});
//璁剧疆涓嬫媺绠ご棰滆壊
@@ -67,15 +85,27 @@
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_HOME_CREATION + "?homeId=" + houseListBean.getHomeId();
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
+ });
}
private void initView() {
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.my_power_station_鎴戠殑鐢电珯);
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);
@@ -83,18 +113,39 @@
}
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);
}
}
- private void openCamera() {
+ /**
+ * 鐢宠鏉冮檺
+ */
+ private void requestPermissions() {
+ String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.CAMERA});
+ if (ary.length > 0) {
+ requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
+ } else {
+ startActivity(FastScanActivity.class);
+ }
+ }
+ @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