wjc
2 天以前 94ed29870324b00c3881e517ffee15903133f79b
2025年07月11日15:16:13
5个文件已修改
61 ■■■■ 已修改文件
app/src/main/assets/data/dcloud_control.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/assets/data/dcloud_control.xml
@@ -1,4 +1,4 @@
<hbuilder debug="false" syncDebug="false" version="1.9.9.80110">
<hbuilder debug="true" syncDebug="true" version="1.9.9.80110">
    <apps>
        <app appid="unimp" appver="1.0" />
    </apps>
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -62,7 +62,7 @@
    //是否是B端账号登录(true=B端)
    private boolean isB_account;
    //是否正式服务器(true:正式,false:测试)
    private boolean isOnlineServer = false;
    private boolean isOnlineServer = true;
    public boolean isOnlineServer() {
        return isOnlineServer;
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
@@ -3,6 +3,7 @@
import android.os.Build;
import android.text.TextUtils;
import com.facebook.imagepipeline.cache.BitmapMemoryCacheTrimStrategy;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -197,6 +198,11 @@
                || joinFileName.equals(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3)
                || joinFileName.equals(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3)
                || joinFileName.equals(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_3)
                || joinFileName.equals(FileName.hdl_inv_ecu_info_pv + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
                || joinFileName.equals(FileName.hdl_inv_ecu_info_output + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
                || joinFileName.equals(FileName.hdl_inv_ecu_info_item + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
                || joinFileName.equals(FileName.hdl_inv_ecu_info_signal + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
                || joinFileName.equals(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7)
        ) {
            return address + "/" + UserConfigManage.getInstance().getCurrentAppLanguage() + "/" + deviceType + "/" + deviceModel + "/info/" + fileName + this.getVersion(joinFileName) + ".json";
        }
@@ -248,6 +254,21 @@
        //电池包转换器
        map.put(FileName.hdl_battery_ecu + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B5K_BATTERY, Version.v_1_5_5);//电池包信息
        map.put(FileName.hdl_battery_ecu_cell + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B5K_BATTERY, Version.v_1_5_5);//电池包-电芯信息
        //离网逆变器 7.6kw
        map.put(FileName.hdl_inv_ecu_quick_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//离网逆变器快速配置
        map.put(FileName.hdl_inv_master_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//离网逆变器主机配置
        map.put(FileName.hdl_inv_slave_ecu_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//离网逆变器从机配置
        map.put(FileName.hdl_inv_ecu_info_pv_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//离网逆变器详情光伏输入
        map.put(FileName.hdl_inv_ecu_info_input_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//离网逆变器详情交流输入
        map.put(FileName.hdl_inv_ecu_info_output_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//离网逆变器详情交流输出
        map.put(FileName.hdl_inv_ecu_info_item_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//离网逆变器详情基础参数
        map.put(FileName.hdl_inv_ecu_info_signal_off + concatenation_symbol + DeviceType.INV + concatenation_symbol + DeviceModel.OFF_INV_7, Version.v_1_5_7);//离网逆变器详情统计
        //电池包15k
        map.put(FileName.hdl_battery_ecu + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B15K_BATTERY, Version.v_1_5_7);//电池包信息
        map.put(FileName.hdl_battery_ecu_cell + concatenation_symbol + DeviceType.BATTERY + concatenation_symbol + DeviceModel.INV_KE_GLE_B15K_BATTERY, Version.v_1_5_7);//电池包-电芯信息
        //bms
        map.put(FileName.hdl_bms_ecu_off + concatenation_symbol + DeviceType.BMS + concatenation_symbol + DeviceModel.OFF_INV_BMS_7, Version.v_1_5_7);//离网逆变器BMS详情
        return map;
    }
@@ -385,6 +406,7 @@
        String v_1_5_4 = "1.5.4";
        String v_1_5_5 = "1.5.5";
        String v_1_5_6 = "1.5.6";
        String v_1_5_7 = "1.5.7";
    }
@@ -437,6 +459,21 @@
         */
        String INV_KE_GLE_B5K_BATTERY = "KE-GLE-B5K";
        /**
         * 【离线-逆变器】设备型号 7.6kw
         */
        String OFF_INV_7 = "ME-GLE-S7.6K";
        /**
         * 【离网-逆变器-BMS】设备型号 7.6kw
         */
        String OFF_INV_BMS_7 = "ME-GLE-S7.6K-BMS";
        /**
         * 【电池包15k】设备型号
         */
        String INV_KE_GLE_B15K_BATTERY = "ME-GLE-B15K";
    }
app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
@@ -212,10 +212,16 @@
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BATTERY));//离网-逆变器-电池包
        //离线-3.6kw逆变器
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_3));//离线-逆变器
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_3));//离线-逆变器3.6kw
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_3));//离网-逆变器-虚拟BMS
         //电池包转换器
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B5K_BATTERY));//电池包转换器
        //离线-7.6kw逆变器
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_7));//离线-逆变器7.6kw
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_7));//离网-逆变器-BMS
        this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B15K_BATTERY));//离网-逆变器-电池包15k
        //英文文件夹
@@ -235,6 +241,10 @@
        //电池包转换器
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B5K_BATTERY));//电池包转换器
        //离线-7.6kw逆变器
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_7));//离线-逆变器7.6kw
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_7));//离网-逆变器-BMS
        this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B15K_BATTERY));//离网-逆变器-电池包15k
    }
    /**
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -775,10 +775,10 @@
                                            } else if (s.startsWith("[")) {
                                                uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
                                            } else {
                                                uniSuccessCallback(type, s, callback);
                                                uniSuccessCallback(type, new JsonArray(), callback);
                                            }
                                        } catch (Exception e) {
                                            uniSuccessCallback(type, s, callback);
                                            uniSuccessCallback(type, new JsonArray(), callback);
                                        }
                                    }
                                }
@@ -799,10 +799,10 @@
                                    } else if (json.startsWith("[")) {
                                        uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
                                    } else {
                                        uniSuccessCallback(type, json, callback);
                                        uniSuccessCallback(type, new JsonArray(), callback);
                                    }
                                } catch (Exception e) {
                                    uniSuccessCallback(type, json, callback);
                                    uniSuccessCallback(type, new JsonArray(), callback);
                                }
                                long endTime = System.currentTimeMillis() - startTime;
                                Log.d("====耗时时间====", String.valueOf(endTime));