From 56c2f0faf5e9e33ec783a14c17ad46fbe8e7506c Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 07 五月 2024 09:22:51 +0800 Subject: [PATCH] 2024年05月07日09:22:44 --- app/src/main/java/com/hdl/photovoltaic/ui/bean/StatusOverviewBean.java | 58 +++++++++++++++++++ app/src/main/res/values/strings.xml | 1 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java | 20 ++++++ app/src/main/AndroidManifest.xml | 3 + app/src/main/res/layout/activity_house_search.xml | 9 +++ app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 29 +++------ app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 32 ++++++++++ 7 files changed, 132 insertions(+), 20 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5cfd248..7d121ee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -77,6 +77,9 @@ android:supportsRtl="true" android:theme="@style/Theme.PhotovoltaicDebug"> <activity + android:name=".ui.powerstation.HouseSearchActivity" + android:exported="false" /> + <activity android:name=".ui.home.HomePageFragment" android:exported="false" /> <activity diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java index 363da34..ab7d37a 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java @@ -26,6 +26,7 @@ import com.hdl.photovoltaic.ui.bean.HouseInfoBean; import com.hdl.photovoltaic.ui.bean.MessageBean; import com.hdl.photovoltaic.ui.bean.OidBean; +import com.hdl.photovoltaic.ui.bean.StatusOverviewBean; import com.hdl.sdk.link.HDLLinkLocalSdk; import com.hdl.sdk.link.common.config.TopicConstant; import com.hdl.sdk.link.common.exception.HDLLinkCode; @@ -213,6 +214,37 @@ } /** + * 鐢电珯鐘舵�佹瑙�(瀹夎鍟�) + */ + public void getStatusOverview(CloudCallBeak<StatusOverviewBean> cloudCallBeak) { + String requestUrl = HttpApi.POST_statusOverview; + JsonObject json = new JsonObject(); +// json.addProperty("zoneType", zoneType);//鍖哄煙 + HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() { + @Override + public void onSuccess(String jsonStr) { + if (TextUtils.isEmpty(jsonStr)) { + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(new StatusOverviewBean()); + } + } + Gson gson = new Gson(); + StatusOverviewBean statusOverviewBean = gson.fromJson(jsonStr, StatusOverviewBean.class); + if (cloudCallBeak != null) { + cloudCallBeak.onSuccess(statusOverviewBean); + } + } + + @Override + public void onFailure(HDLException e) { + if (cloudCallBeak != null) { + cloudCallBeak.onFailure(e); + } + } + }); + } + + /** * 娣诲姞銆愯澶囧垪琛ㄣ�戝埌鏈湴缂撳瓨 * * @param list -璁惧鍒楄〃 diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatusOverviewBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatusOverviewBean.java new file mode 100644 index 0000000..7e82ad9 --- /dev/null +++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatusOverviewBean.java @@ -0,0 +1,58 @@ +package com.hdl.photovoltaic.ui.bean; + +import java.io.Serializable; + +/** + * 鐢电珯鐘舵�佸疄浣撶被 + */ +public class StatusOverviewBean implements Serializable { + + private int total;//鎬荤數绔欐暟 + private int fault;//鏁呴殰鐢电珯鏁� + private int offline;//绂荤嚎鐢电珯鏁� + private int connecting;//寰呮帴鍏ョ數绔欐暟 + + private Object extra;//闄勫姞鏁版嵁 + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public int getFault() { + return fault; + } + + public void setFault(int fault) { + this.fault = fault; + } + + public int getOffline() { + return offline; + } + + public void setOffline(int offline) { + this.offline = offline; + } + + public int getConnecting() { + return connecting; + } + + public void setConnecting(int connecting) { + this.connecting = connecting; + } + + public Object getExtra() { + return extra; + } + + public void setExtra(Object extra) { + this.extra = extra; + } + + +} 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..ca77b32 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; @@ -70,6 +69,16 @@ private String key = SortValue.all; private String value = SortValue.all; + + + private String installedCapacityMinKey = SortType.installedCapacityMin; + private int installedCapacityMinValue; + private String installedCapacityMaxKey = SortType.installedCapacityMax; + private int installedCapacityMaxValue; + private String gridTypeKey = SortType.gridType; + private String gridTypeValue; + private String powerStationStatusKey = SortType.powerStationStatus; + private int powerStationStatusValue; private long pageSize = 20;//椤垫暟 @@ -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) { diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java new file mode 100644 index 0000000..058b88b --- /dev/null +++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java @@ -0,0 +1,20 @@ +package com.hdl.photovoltaic.ui.powerstation; + + +import android.os.Bundle; + +import com.hdl.photovoltaic.base.CustomBaseActivity; + +public class HouseSearchActivity extends CustomBaseActivity { + + + @Override + public Object getContentView() { + return null; + } + + @Override + public void onBindView(Bundle savedInstanceState) { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_house_search.xml b/app/src/main/res/layout/activity_house_search.xml new file mode 100644 index 0000000..e4c352c --- /dev/null +++ b/app/src/main/res/layout/activity_house_search.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".ui.powerstation.HouseSearchActivity"> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62cec36..80c0478 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -247,7 +247,6 @@ <string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇�</string> - <string name="cancel_download_successfully">鍙栨秷涓嬭浇鎴愬姛.</string> <string name="writing_firmware_upgrade_memory_succeeded">鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.</string> <string name="download_firmware_upgrade_file_failed">涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触.</string> -- Gitblit v1.8.0