2021-11-23-03

xm

2021-11-23 d05533c164bcf83fe5ce0bc98e5596aea4a3f0ef

2021-11-23-03

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,16 +1,17 @@
<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">
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget." />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs">
    <Files>
      <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" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="196" Column="40" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunTypeView.cs" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="911" Column="6" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -20,12 +21,16 @@
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True" />
                    <Node name="Automation" expanded="True">
                      <Node name="LogicMethod.cs" selected="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True" selected="True" />
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Properties" expanded="True" />
            </Node>
          </Node>
        </State>
      </Pad>
@@ -37,11 +42,11 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.2ffc9a07" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <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" />
      <Breakpoint file="/Users/hdl/Desktop/git/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/AddInputType.cs

@@ -193,17 +193,18 @@
                        //离开地点
                        strname = Language.StringByID(StringId.likai);
                    }
                    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);
                    }
          //再一次编辑地理围栏<控件暂时不支持显示记录上一次的状态>
          //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();

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

@@ -856,7 +856,8 @@
                logicDataList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LogicData>>(date);
            }
            ///有自动列表才处理
            if (logicDataList.Count>0) {
      if (logicDataList.Count > 0)
      {
                ///遍历所有列表
                for (int i = 0; i < logicDataList.Count; i++)
                {
@@ -878,28 +879,44 @@
                    //定义一个局部变量
                    string direction = string.Empty;
                    //两点距离小于配置距离<既自动化配置输入条件地理围栏半径>,说明进入区域
                    if (r<radius) {
          if (r < radius)
          {
                        //到达某地
                        direction = "arrive";
                    } else {
          }
          else
          {
                        //离开
                        direction = "leave";
                    }
          var isPush = pushList.Find((o) => o.homeId == HomeId && o.userId == UserInfo.Current.ID && o.userLogicId == logicDate.userLogicId && o.arriveOnLeave == direction);
          if (isPush == null)
          {
                    //推送给云端是否成功
                    bool f= Send.GeoFenceStateReport(logicDate.userLogicId,logicDate.sid, direction);
                    //if () { }
                    //Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
            bool push = Send.GeoFenceStateReport(logicDate.userLogicId, logicDate.sid, direction);
            if (push)
            {
              pushList.Add(new Push
              {
                homeId = HomeId,
                userId = UserInfo.Current.ID,
                userLogicId = logicDate.userLogicId,
                arriveOnLeave = direction,
              });
            }
          }
                }

            }
    }
    /// <summary>
    /// 
    /// </summary>
    private static List<Push> pushList = new List<Push>();

        }


       
    }
    public class DD {

  public class Push
  {
        /// <summary>
        /// 云端唯一id
        /// </summary>
@@ -917,17 +934,13 @@
        /// </summary>
        public string homeId = "";
        /// <summary>
        /// 是否推送过（true：已经推送，false：没有不推送）
    /// 到达某地 离开
        /// </summary>
        public bool IsPush;
    public string arriveOnLeave = "";
        /// <summary>
        /// 到达某地
    ///  用户id
        /// </summary>
        public string arrive = "";
        /// <summary>
        /// 离开
        /// </summary>
        public string leave = "";
    public string userId = "";

    }
}