From dbff6d6f9200417ea60e2fe507b79cbe2eb7ea32 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 11 一月 2024 18:19:48 +0800
Subject: [PATCH] 2024年01月11日18:19:42

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java |   54 +++++++++++++++++++++++++-----------------------------
 1 files changed, 25 insertions(+), 29 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 8f7ee04..3a5c20c 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
@@ -70,8 +70,6 @@
         initView();
         //鍒濆鍖栫晫闈㈢洃鍚櫒
         initEvent();
-
-
     }
 
     private void initEvent() {
@@ -81,25 +79,25 @@
         viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                requestPermissions(new PermissionsResultCallback() {
-                    @Override
-                    public void succeed() {
 
-//                        Intent intent = new Intent();
-//                        intent.setClass(_mActivity, FastScanActivity.class);
-//                        startActivity(intent);
-                        String path = HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION
-                                + "&token=" + UserConfigManage.getInstance().getToken()
-                                + "&refreshToken=" + UserConfigManage.getInstance().getRefreshToken()
-                                + "&regionUrl=" + AppConfigManage.getUserRegionUrl();
-//                        // 鎵撳紑灏忕▼搴忛〉闈�
-                        HdlUniLogic.getInstance().openUniMP(path, null);
-                    }
+                HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
 
-                    @Override
-                    public void failing() {
-                    }
-                });
+//                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);
+//                    }
+//
+//                    @Override
+//                    public void failing() {
+//                        HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
+//                    }
+//                });
+
 
             }
         });
@@ -121,8 +119,7 @@
                 String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS
                         + "?homeId=" + houseIdBean.getHomeId()
                         + "&homeName=" + houseIdBean.getHomeName()
-                        + "&powerStationStatus=" + houseIdBean.getPowerStationStatus()
-                        + "&serverAddress=" + AppConfigManage.getUserRegionUrl();
+                        + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
                 HdlUniLogic.getInstance().openUniMP(path, null);
 
             }
@@ -134,11 +131,10 @@
         viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setVisibility(View.VISIBLE);
         viewBinding.toolbarTopFragmentHouseListRl.topMoreIv.setImageResource(R.drawable.add);
         LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
-        houseInfoAdapter = new HouseInfoAdapter(this.houseListBeanIDList, _mActivity);
+        houseInfoAdapter = new HouseInfoAdapter(_mActivity);
         viewBinding.fragmentHouseSrlListRc.setLayoutManager(linearLayout);
         viewBinding.fragmentHouseSrlListRc.setAdapter(houseInfoAdapter);
-
-
+        houseInfoAdapter.setList(this.houseListBeanIDList);
         this.nullDataUpdateUi(houseListBeanIDList);
 
 
@@ -241,7 +237,6 @@
                             if (houseInfoAdapter != null) {
                                 //鏇存柊UI
                                 houseInfoAdapter.setList(list);
-                                houseInfoAdapter.notifyDataSetChanged();
                             }
 
                         }
@@ -275,10 +270,7 @@
 
         mPermissionsResultCallback = permissionsResultCallback;
 
-        String[] s = new String[]{
-                Manifest.permission.ACCESS_FINE_LOCATION,
-                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) {
             requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
@@ -298,6 +290,10 @@
                     if (mPermissionsResultCallback != null) {
                         mPermissionsResultCallback.succeed();
                     }
+                } else {
+                    if (mPermissionsResultCallback != null) {
+                        mPermissionsResultCallback.failing();
+                    }
                 }
 
             }

--
Gitblit v1.8.0