From d1ebb94e1a17b7c25d4fcf73d85345d92cc86b5c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 一月 2024 18:41:34 +0800
Subject: [PATCH] 2024年01月02日18:41:32

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java |   38 ++++++++++++++++----------------------
 1 files changed, 16 insertions(+), 22 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 0cc5896..e5f3378 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
@@ -2,11 +2,9 @@
 
 import android.Manifest;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.hardware.camera2.CameraManager;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -24,16 +22,12 @@
 import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
 import com.hdl.photovoltaic.enums.ShowErrorMode;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlCommonLogic;
-import com.hdl.photovoltaic.other.HdlDeviceLogic;
 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.HouseIdBean;
-import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
-import com.hdl.photovoltaic.ui.device.FastScanActivity;
 import com.hdl.photovoltaic.uni.HDLUniMP;
 import com.hdl.photovoltaic.utils.PermissionUtils;
 import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -76,7 +70,17 @@
         initView();
         //鍒濆鍖栫晫闈㈢洃鍚櫒
         initEvent();
-
+//        requestPermissions(new PermissionsResultCallback() {
+//            @Override
+//            public void succeed() {
+//
+//
+//            }
+//
+//            @Override
+//            public void failing() {
+//            }
+//        });
 
     }
 
@@ -94,12 +98,8 @@
 //                        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
@@ -127,8 +127,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);
 
             }
@@ -140,11 +139,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);
 
 
@@ -247,7 +245,6 @@
                             if (houseInfoAdapter != null) {
                                 //鏇存柊UI
                                 houseInfoAdapter.setList(list);
-                                houseInfoAdapter.notifyDataSetChanged();
                             }
 
                         }
@@ -281,10 +278,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);

--
Gitblit v1.8.0