2024年05月30日14:37:13

mac

2024-05-30 48e53c091965c3510d97ad4fa94e7bea736c90f6

2024年05月30日14:37:13

备份

 app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java

@@ -93,7 +93,11 @@
    public void getStatistics(String type, String time, CloudCallBeak<List<StatisticsBean>> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Home_page_statistics;
        JsonObject json = new JsonObject();
        json.addProperty("dataType", "GE");//发电量（GE ： 发电量 ;POWER ： 发电功率）
        if (TimeType.day.equals(type)) {
            json.addProperty("dataType", "POWER");//发电量（GE ： 发电量 ;POWER ： 发电功率）
        } else {
            json.addProperty("dataType", "GE");//发电量（GE ： 发电量 ;POWER ： 发电功率）
        }
        json.addProperty("type", type);//类型
        if (!TextUtils.isEmpty(time)) {
            if (!UserConfigManage.getInstance().isZh()) {

 app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java

@@ -373,6 +373,9 @@
        this.bottomViewChangeOfStyle();
    }

    /**
     * 底部模块样式改变
     */
    private void bottomViewChangeOfStyle() {
        if (this.currentFragmentIndex == 0) {
            //首页界面

 app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java

@@ -33,7 +33,7 @@
    private String systemStatusDesc;//状态

    private String inv;//inv状态
    private int deviceStatus;//1:待机,2:连接中,3:故障,4:运行,5:离线
    private int deviceStatus;// ： 连接中，2 ： 故障，3 ： 运行，4 ： 离线
    private String addresses;//子网号/设备号
    private List<DeviceAttributeBean> status;


 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java

@@ -196,12 +196,16 @@
        searchDeviceAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() {
            @Override
            public void onClick(int position, CloudInverterDeviceBean deviceBean) {
                if (deviceBean.getDeviceStatus() == 4) {
                    HdlThreadLogic.toast(_mActivity, R.string.device_off);
                    return;
                }
                //配置本地通信的信息
                HDLLinkConfig.getInstance().setHomeId(deviceBean.getHomeId());
                HDLLinkConfig.getInstance().setLocalSecret(deviceBean.getLocalSecret());
                List<CloudInverterDeviceBean> newList = new ArrayList<>();
                newList.add(deviceBean);
                //目的是为了获取拿到网关ID，mqtt通讯秘钥等信息，缓存本地逆变器列表里面，发送数据数据时自动去缓存列表里面去查找；
                //目的是为了获取拿到网关ID，mqtt通讯秘钥等信息，拿到后缓存到本地逆变器列表里面，发送数据数据时自动去缓存列表里面去查找；
                HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                    @Override
                    public void onSuccess(List<GatewayBean> obj) {

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java

@@ -48,6 +48,7 @@
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;

@@ -426,9 +427,16 @@
//                gatewayBean.setHomeId(deviceBean.getHomeId());
//                gatewayBean.setSpk(deviceBean.getSpk());
//                gatewayBean.setDeviceType(deviceBean.getDeviceType());
                if (deviceBean.getDeviceStatus() == 4) {
                    HdlThreadLogic.toast(_mActivity, R.string.device_off);
                    return;
                }
                //配置本地通信的信息
                HDLLinkConfig.getInstance().setHomeId(deviceBean.getHomeId());
                HDLLinkConfig.getInstance().setLocalSecret(deviceBean.getLocalSecret());
                List<CloudInverterDeviceBean> newList = new ArrayList<>();
                newList.add(deviceBean);
                // //目的是为了获取拿到网关ID，mqtt通讯秘钥等信息，缓存本地逆变器列表里面，发送数据数据时自动去缓存列表里面去查找；
                //目的是为了获取拿到网关ID，mqtt通讯秘钥等信息，拿到后缓存到本地逆变器列表里面，发送数据数据时自动去缓存列表里面去查找；
                HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, deviceBean.getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
                    @Override
                    public void onSuccess(List<GatewayBean> obj) {

 app/src/main/res/layout/fragment_home_page.xml

@@ -4,6 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/bj"
    tools:context=".ui.home.HomePageFragment">

    <TextView

 app/src/main/res/layout/fragment_house_list.xml

@@ -4,7 +4,8 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/house_list_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
    android:background="@drawable/bj">
    <!--头部标签-->
    <RelativeLayout
        android:id="@+id/title_cl"

 app/src/main/res/layout/fragment_me.xml

@@ -3,7 +3,8 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/me_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
    android:background="@drawable/bj">

    <TextView
        android:id="@+id/me_title_tv"

 app/src/main/res/layout/fragment_message.xml

@@ -3,6 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/message_parent"
    android:layout_width="match_parent"
    android:background="@drawable/bj"
    android:layout_height="match_parent">
    <!--头部标签-->
    <RelativeLayout

 app/src/main/res/values/strings.xml

@@ -306,5 +306,6 @@
    <string name="active_power">有功功率</string>
    <string name="t">吨</string>
    <string name="number">棵</string>
    <string name="device_off">设备已离线!</string>

</resources>