app/src/main/AndroidManifest.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/ui/bean/StatusOverviewBean.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/layout/activity_house_search.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/values/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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 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 -设备列表 app/src/main/java/com/hdl/photovoltaic/ui/bean/StatusOverviewBean.java
New file @@ -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; } } 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) { app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
New file @@ -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) { } } app/src/main/res/layout/activity_house_search.xml
New file @@ -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> app/src/main/res/values/strings.xml
@@ -247,7 +247,6 @@ <string name="port_conflict">应用冲突,需要关闭onpro或者其它版本的调试软件然后再重新启动这个软件试试</string> <string name="cancel_download_successfully">取消下载成功.</string> <string name="writing_firmware_upgrade_memory_succeeded">写入新固件文件到内存成功.</string> <string name="download_firmware_upgrade_file_failed">下载固件升级文件失败.</string>