From e62bcdaa38f0f00e25610b1a6c6ba847d65640ff Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 26 六月 2023 15:44:15 +0800 Subject: [PATCH] 2023年06月26日15:44:09 --- app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 89 +++++++++++++++++++++----------------------- 1 files changed, 42 insertions(+), 47 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 3c595e7..9373411 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,5 +1,6 @@ package com.hdl.photovoltaic.ui.powerstation; +import android.Manifest; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.camera2.CameraManager; @@ -15,10 +16,14 @@ 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.HdlResidenceLogic; 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.HouseListBean; import com.hdl.photovoltaic.ui.device.FastScanActivity; @@ -27,6 +32,7 @@ import com.hdl.photovoltaic.utils.PermissionUtils; import com.hdl.photovoltaic.widget.ConfirmationInputDialog; +import org.json.JSONException; import org.json.JSONObject; import java.util.ArrayList; @@ -40,6 +46,7 @@ private CameraManager manager; private List<HouseListBean> houseListBeanList = null; + @Override public Object getContentView() { @@ -60,52 +67,13 @@ } - private void initEvent() { viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { -// String path = "pages/powerStationDetail/index"; -//// HDLUniMP.UNI_PATH_MILLIMETER;//鍘熺敓閫氱煡灏忕▼搴忓湴鍧� -// HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean(); -// uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_HOME_DETAILS); -// uniCallBackBaseBean.setPath(path); -// JSONObject jsonObject = uniCallBackBaseBean.getJSONObject(); -// -// HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, jsonObject, new HDLUniMPSDKManager.IOnOtherUniMPEventCallBack() { -// @Override -// public void onOtherUniMPEventReceive(String appid, String event, Object data, DCUniMPJSCallback callback) { -// -// } -// }); -// -// HdlThreadLogic.runThread(new Runnable() { -// @Override -// public void run() { -// SystemClock.sleep(3000); -// HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, "2342", "764574574"); -// -// } -// }, null, null); - - -// String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.CAMERA}); -// if (ary.length > 0) { -// requestPermissions(ary, PermissionUtils.STATUS_SUCCESS); -// } else { -// startActivity(FastScanActivity.class); -// } - - ConfirmationInputDialog confirmationInputDialog = new ConfirmationInputDialog(_mActivity); - confirmationInputDialog.show(); - confirmationInputDialog.setNoOnclickListener(new ConfirmationInputDialog.onNoOnclickListener() { - @Override - public void Cancel() { - confirmationInputDialog.dismiss(); - } - }); - + // 鎵撳紑灏忕▼搴忛〉闈� + HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); } }); //璁剧疆涓嬫媺绠ご棰滆壊 @@ -116,6 +84,19 @@ viewBinding.fragmentHouseSrl.setRefreshing(false); 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_OPEN_HOME_DETAILS + "?homeId=" + houseListBean.getHomeId(); + HdlUniLogic.getInstance().openUniMP(path, null); } }); } @@ -134,13 +115,26 @@ 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); +// for (int i = 0; i < 11; i++) { +// HouseListBean houseListBean = new HouseListBean(); +// houseListBean.setHomeName("鐢电珯" + i); +// this.houseListBeanList.add(houseListBean); +// } + this.houseListBeanList.addAll(HdlResidenceLogic.getInstance().getHouseInfoBeanList()); + + + } + + /** + * 鐢宠鏉冮檺 + */ + 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 @@ -156,4 +150,5 @@ } } + } -- Gitblit v1.8.0