CrabtreeOn,印度客户定制APP,迁移2.0平台版本
JLChen
2021-03-31 c406a2bb214bd693ecc9c62b8c592c8b3537144d
2021-03-31 1.更新
2个文件已修改
50 ■■■■ 已修改文件
Crabtree/.vs/SmartHome/xs/UserPrefs.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -2,7 +2,10 @@
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.Workbench>
    <Files>
      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="642" Column="44" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" Line="1167" Column="53" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/SceneMethod.cs" Line="62" Column="43" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs" Line="1850" Column="23" />
      <File FileName="SmartHome/HDL/Operation/Device/FanModule.cs" Line="6" Column="15" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -27,7 +30,6 @@
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOnNew/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" relfile="SmartHome/HDL/Common/HttpUtil/HttpServerRequest.cs" line="153" column="1" />
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOnNew/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" relfile="SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs" line="703" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
@@ -1163,17 +1163,23 @@
                                        };
                                        deviceRowView.AddChidren (fanLevel);
                                        //刚开始默认显示1档
                                        value = "2";
                                        SetFanButtonState (btnFanLevel, value);
                                        fanLevel.ProgressChanged += (sender, e) => {
                                            if (!btnChoose.IsSelected) {
                                                btnChoose.IsSelected = true;
                                            }
                                            value = e.ToString ();
                                            if (value == "0") {
                                                btnFanLevel.Text = "OFF";
                                            } else {
                                                btnFanLevel.Text = value;
                                            }
                                            //if (value == "0") {
                                            //    btnFanLevel.Text = "OFF";
                                            //} else {
                                            //    btnFanLevel.Text = value;
                                            //}
                                            SetFanButtonState (btnFanLevel, value);
                                            DeviceDateFun (btnChoose.Tag as Function, value, btnChoose.IsSelected);
                                        };
@@ -1192,11 +1198,12 @@
                                                        var fundev = dev.attributes [a];
                                                        if (fundev.key == "fan_speed_percent") {
                                                            fanLevel.Progress = int.Parse (fundev.value);
                                                            if (fundev.value == "0") {
                                                                btnFanLevel.Text = "OFF";
                                                            } else {
                                                                btnFanLevel.Text = fundev.value;
                                                            }
                                                            //if (fundev.value == "0") {
                                                            //    btnFanLevel.Text = "OFF";
                                                            //} else {
                                                            //    btnFanLevel.Text = fundev.value;
                                                            //}
                                                            SetFanButtonState (btnFanLevel, fundev.value);
                                                        }
                                                    }
                                                }
@@ -1226,6 +1233,23 @@
                }
            });
        }
        /// <summary>
        ///
        /// </summary>
        /// <param name="btnFanLevel"></param>
        /// <param name="value"></param>
        void SetFanButtonState (Button btnFanLevel, string value)
        {
            if (btnFanLevel == null) return;
            if (value == "0") {
                btnFanLevel.Text = "OFF";
            } else {
                btnFanLevel.Text = value;
            }
        }
        /// <summary>
        /// 设备数据转换
        /// </summary>