2020-09-01-2

陈嘉乐

2020-09-02 0f61f7a60bf532e91d08aa2e0716e986bf571413

2020-09-01-2

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,43 +1,13 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/CurrentDeviceState.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Nightlight.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="572" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/LogicDveiceStatus.cs" Line="223" Column="71" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/LogicDveiceStatus.cs" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" />
      <File FileName="Shared/Phone/Device/Logic/Nightlight.cs" Line="324" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="Home.IOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="LogicView" expanded="True" />
                    <Node name="CurrentDeviceState.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Controls" expanded="True">
                      <Node name="CompoundControls" expanded="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
      <Pad Id="MonoDevelop.Debugger.WatchPad">
        <State />
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs

@@ -490,13 +490,13 @@
                        {
                            if (devices["AttriButeId"] == "1281")
                            {
                                if (devices.ContainsKey("IgnoreTime"))
                                if (devices.ContainsKey("IgnoreTime")&& devices["IgnoreTime"]!="0")
                                {
                                    timeValue = int.Parse(devices["IgnoreTime"]);
                                }
                                else
                                {
                                    if (devices["AttriButeData1"] == "1")
                                    if (devices["Range"]== "5")
                                    {
                                        openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                        closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;

 ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs

@@ -221,13 +221,12 @@

            string status = "";
            Dictionary<string, string> dictionaryLight = new Dictionary<string, string>();
            dictionaryLight.Clear();
            switch (if_str)
            {
                case "夜灯开关":
                    {

                        Send.dictionary(dictionaryLight, "TaskType", "1");
                        Send.dictionary(dictionaryLight, "Data2", "0");
                       
                        mFunView openView = new mFunView();
                        openView.frameLayout.Y = Application.GetRealHeight(140 + 20);
                        openView.titleBtn.TextID = MyInternationalizationString.open;
@@ -286,8 +285,6 @@
                    break;
                case "亮度":
                    {
                        Send.dictionary(dictionaryLight, "TaskType", "3");
                        Send.dictionary(dictionaryLight, "Data2", "0");
                        var horizontalSeekBarVol = new DiyImageSeekBar
                        {
                            Y = Application.GetRealHeight(140),//进度条父控件Y坐标
@@ -333,8 +330,6 @@
                    break;
                case "色温":
                    {
                        Send.dictionary(dictionaryLight, "TaskType", "8");
                        Send.dictionary(dictionaryLight, "Data2", "0");
                        Button seekIconBtn = new Button
                        {
                            Y = Application.GetRealHeight(140 + 160),
@@ -392,9 +387,6 @@
                    break;
                case "蜂鸣器":
                    {
                        Send.dictionary(dictionaryLight, "TaskType", "7");
                        Send.dictionary(dictionaryLight, "Data2", "0");


                        mFunView openView = new mFunView();
                        openView.frameLayout.Y = Application.GetRealHeight(140 + 20);
@@ -457,8 +449,10 @@
            }
            completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
            {
                if (selectedDeviceStatus != "")
                if (dictionaryLight.Count!=0)
                {
                    Send.dictionary(dictionaryLight, "TaskType", selectedDeviceStatus);
                    Send.dictionary(dictionaryLight, "Data2", "0");
                    flMain.RemoveFromParent();
                    DicValue(selectedDeviceStatus, dictionaryLight);
                    button.Text = status;