From c5870308a67f732f9669cc5a49053f0c4254a17b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 07 五月 2024 09:38:32 +0800
Subject: [PATCH] 2024年05月07日09:38:30

---
 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java |   33 ++++++++++++---------------------
 1 files changed, 12 insertions(+), 21 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 56b4f0c..60aa18f 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,6 +1,5 @@
 package com.hdl.photovoltaic.ui.powerstation;
 
-import android.Manifest;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.view.View;
@@ -69,9 +68,19 @@
     private boolean isClickPowerStationLabel = true;//(鐢电珯鏍囩=true锛岃澶囨爣绛�=false)
 
     private String key = SortValue.all;
-    private String value = SortValue.all;
+    private String value = SortValue.all;//descending:闄嶅簭,ascending:鍗囧簭
 
-    private long pageSize = 20;//椤垫暟
+
+    private String installedCapacityMinKey = SortType.installedCapacityMin;
+    private int installedCapacityMinValue;//鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
+    private String installedCapacityMaxKey = SortType.installedCapacityMax;
+    private int installedCapacityMaxValue;//鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
+    private String gridTypeKey = SortType.gridType;
+    private String gridTypeValue;//骞剁綉鐘舵��(鍏ㄩ儴 涓嶄紶璇ヨ繃婊ゅ弬鏁�,FULL_GRID:骞剁綉,OFFLINE:绂荤綉)
+    private String powerStationStatusKey = SortType.powerStationStatus;
+    private int powerStationStatusValue;//鐢电珯鐘舵��(鍏ㄩ儴 涓嶄紶璇ヨ繃婊ゅ弬鏁�,1:姝e父(杩愯),2:绂荤嚎,3:寰呮帴鍏�,4:鏁呴殰)
+
+    private final long pageSize = 20;//椤垫暟
 
 
     @Override
@@ -681,24 +690,6 @@
         });
     }
 
-    /**
-     * 鐢宠鏉冮檺
-     */
-    private void requestPermissions(PermissionsResultCallback permissionsResultCallback) {
-
-
-        mPermissionsResultCallback = permissionsResultCallback;
-
-        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);
-        } else {
-            if (mPermissionsResultCallback != null) {
-                mPermissionsResultCallback.succeed();
-            }
-        }
-    }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {

--
Gitblit v1.8.0