From 57e16d05ef4924a480a5895cdb485556cc820e9b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 六月 2023 09:45:53 +0800
Subject: [PATCH] Merge branch 'wjc'
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 37 +++++++++++++------------------------
1 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/app/src/main/java/com/example/photovoltaic/ui/home/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
similarity index 68%
rename from app/src/main/java/com/example/photovoltaic/ui/home/HouseListFragment.java
rename to app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index ed55005..346bf75 100644
--- a/app/src/main/java/com/example/photovoltaic/ui/home/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -1,7 +1,6 @@
-package com.example.photovoltaic.ui.home;
+package com.hdl.photovoltaic.ui.powerstation;
import android.content.Context;
-import android.hardware.camera2.CameraAccessException;
import android.hardware.camera2.CameraManager;
import android.os.Bundle;
import android.util.Log;
@@ -10,12 +9,12 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import com.example.photovoltaic.R;
-import com.example.photovoltaic.base.CustomBaseFragment;
-import com.example.photovoltaic.databinding.FragmentHouseListBinding;
-import com.example.photovoltaic.ui.adapter.HouseInfoAdapter;
-import com.example.photovoltaic.ui.bean.HouseInfoBean;
-import com.example.photovoltaic.utils.FlashLightUtils;
+import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.databinding.FragmentHouseListBinding;
+import com.hdl.photovoltaic.base.CustomBaseFragment;
+import com.hdl.photovoltaic.ui.adapter.HouseInfoAdapter;
+import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
+import com.hdl.photovoltaic.utils.FlashLightUtils;
import java.util.ArrayList;
import java.util.List;
@@ -24,7 +23,7 @@
private FragmentHouseListBinding viewBinding;
private HouseInfoAdapter houseInfoAdapter;
private FlashLightUtils flashLightUtils;
- private CameraManager manager;
+ private CameraManager manager;
private List<HouseInfoBean> houseInfoBeanList = null;
@@ -36,8 +35,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- flashLightUtils = new FlashLightUtils(_mActivity);
- manager = (CameraManager) _mActivity.getSystemService(Context.CAMERA_SERVICE);
+ flashLightUtils = new FlashLightUtils(_mActivity);
+ manager = (CameraManager) _mActivity.getSystemService(Context.CAMERA_SERVICE);
initData();
//鍒濆鍖�
@@ -55,12 +54,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-// try {
-// manager.setTorchMode("0",true);
-// } catch (CameraAccessException e) {
-// e.printStackTrace();
-// }
-// flashLightUtils.open();
+
}
});
//璁剧疆涓嬫媺绠ご棰滆壊
@@ -68,13 +62,8 @@
viewBinding.fragmentHouseSrl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
-// flashLightUtils.cloes();
-// try {
-// manager.setTorchMode("0",false);
-// } catch (CameraAccessException e) {
-// e.printStackTrace();
-// }
-// viewBinding.fragmentHouseSrl.setRefreshing(false);
+
+ viewBinding.fragmentHouseSrl.setRefreshing(false);
Log.d("HouseListFragment", "涓嬫媺鍒锋柊");
}
});
--
Gitblit v1.8.0