Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC

JLChen

2021-11-23 3db5c3218f405795dc9a2d0f6afdde8ab8ac9e73

Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,43 +1,32 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/MainPage.cs">
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008101-001D2D8A363A001E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs">
    <Files>
      <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="87" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="1142" Column="38" />
      <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="880" Column="6" />
      <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1575" Column="25" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="832" Column="30" />
      <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="224" Column="50" />
      <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="79" Column="30" />
      <File FileName="HDL_ON/UI/MainPage.cs" Line="111" Column="27" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="312" Column="10" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs" Line="70" Column="65" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs" Line="171" Column="44" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs" Line="1054" Column="23" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="506" Column="61" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="93" Column="61" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunTypeView.cs" Line="5" Column="18" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs" Line="5" Column="18" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="DAL" expanded="True">
                <Node name="DriverLayer" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI0-Public" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="4-PersonalCenter" expanded="True" />
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True" />
                  </Node>
                </Node>
                <Node name="MainPage.cs" selected="True" />
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True" />
            <Node name="HDL-ON_iOS" expanded="True" selected="True" />
          </Node>
        </State>
      </Pad>
      <Pad Id="MonoDevelop.Debugger.WatchPad">
        <State>
          <Value>this.Height</Value>
        </State>
      </Pad>
    </Pads>
@@ -48,11 +37,11 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1415" column="1" />
      <Breakpoint file="/Users/wenjucheng/Desktop/wjc/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1415" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />

 HDL_ON/UI/UI2/3-Intelligence/Automation 2.zip

Binary files differ

 HDL_ON/UI/UI2/3-Intelligence/Automation.zip

Binary files differ

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs

@@ -193,12 +193,17 @@
                        //离开地点
                        strname = Language.StringByID(StringId.likai);
                    }
                    //纬度
                    latitude = Convert.ToDouble(input.geo_fence.latitude);
                    //经度
                    longitude = Convert.ToDouble(input.geo_fence.longitude);
                    //半径
                    r = int.Parse(input.geo_fence.radius);
                    if (!string.IsNullOrEmpty(input.geo_fence.latitude) && !string.IsNullOrEmpty(input.geo_fence.longitude))
                    {
                        //纬度
                        var latitude1 = Convert.ToDouble(input.geo_fence.latitude);
                        //经度
                        var longitude1 = Convert.ToDouble(input.geo_fence.longitude);
                        //半径
                        r = int.Parse(input.geo_fence.radius);
                        //WGS84坐标转高德坐标
                        LogicMethod.CurrLogicMethod.WGS84_to_GCJ02(longitude1, latitude1, out longitude, out latitude);
                    }
                }
            }
            PublicInterface publicInterface = new PublicInterface();
@@ -297,7 +302,7 @@
                              MainPage.BasePageView.AddChidren(addLogic);
                              addLogic.Show();
                              MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
                }, strname, Language.StringByID(StringId.save), true, latitude, longitude, r);
#endif
             });


 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs

@@ -216,7 +216,8 @@
                    var conditionArray = new JArray { };
                    foreach (var dic in dictionary.condition)
                    {
                        var conditionJOb = new JObject { };
                        
                           var conditionJOb = new JObject { };
                        conditionJOb.Add("key", dic["key"]);
                        var c1 = "";
                        dic.TryGetValue("comparator", out c1);

 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs

@@ -90,6 +90,7 @@
                        brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
                        brightnessView.btnText.TextID = StringId.brightnesLogic;
                        fLayout.AddChidren(brightnessView.FLayoutView());
                        brightnessView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
                        #endregion
                        #region 点击事件
                        ///开关点击事件

 HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs

@@ -108,9 +108,6 @@
                        index = i;
                        break;
                    }
                    ///找到标记索引，退出循环体
                    index = i;
                    break;
                }
            }
            if (index != -1)