JLChen
2020-03-19 af3480f93219c486f51d6aeac5e910dac8f9c382
2020-03-19 1.HDLDiyImageVerticalSeekBar 进度修改为从下到上。
3个文件已修改
28 ■■■■ 已修改文件
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/activity_setting.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java
@@ -162,8 +162,27 @@
                    return;
                }
                proDialog.show();
//                HDLCommand.geothermalCtrlTemp(appliancesInfo, tempInt);//自动根据当前模式设置当前模式的温度。
                HDLCommand.geothermalCtrlTemp(appliancesInfo, tempInt);//自动根据当前模式设置当前模式的温度。
                switch (gModeState) {
                    case 1:
                    case 2:
                    case 3:
                    case 4:
                        HDLCommand.geothermalCtrlTemp(appliancesInfo, tempInt);//自动根据当前模式设置当前模式的温度。
                        break;
                    case 5:
                        proDialog.dismiss();
                        //当前地热模式为自动
                        showToast("自动模式,不能控制温度");
                        break;
                    default:
                        proDialog.dismiss();
                        //当前地热模式为自动
                        showToast("未知模式,不能控制温度");
                        break;
                }
//                switch (gModeState) {
//
app/src/main/res/layout/activity_setting.xml
@@ -133,7 +133,6 @@
                android:layout_height="match_parent"
                android:layout_marginTop="10dp"
                android:gravity="center|left"
                android:inputType="number"
                android:hint="SDK备注"
                android:textSize="16dp"
                android:text="SDK特殊设备"
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
@@ -405,9 +405,9 @@
     * 控制地热模块温度
     *
     * @param info
     * @param state 2020-03-15
     * @param tempInt 2020-03-15
     */
    public static void geothermalCtrlTemp(final AppliancesInfo info, int state) {
    public static void geothermalCtrlTemp(final AppliancesInfo info, int tempInt) {
//        HDLDeviceManager.isGeothermalCtrlSuccess = false;
        HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
        if (geothermalCtrlFailTimer != null) {
@@ -415,7 +415,7 @@
            geothermalCtrlFailTimer = null;
        }
        if (info.getBigType() == Configuration.GEOTHERMAL_BIG_TYPE) {
            byte[] sendbytes = GeothermalParser.getGeothermalAddByteTemp(info, state);
            byte[] sendbytes = GeothermalParser.getGeothermalAddByteTemp(info, tempInt);
            addSendData(info, sendbytes, Configuration.CONTROL);
            geothermalCtrlFailTimer = new Timer();