合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

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

old mode 100644
new mode 100755
@@ -67,7 +67,7 @@
                            Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                        }
                        //读取系统当前时间：时-分
                        //读取系统当前时间：时-分 
                        //读取系统当前时间：时-分
                        var h = DateTime.Now.ToString("HH");
                        var m = DateTime.Now.ToString("mm");
                        Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
@@ -345,9 +345,9 @@
        /// 加载自动化列表界面
        /// </summary>
        /// <param name="refresview">Refresview.</param>

        static RowLayout selectedRow = new RowLayout() { Tag = "0" };//记录左滑状态

        
        static  RowLayout selectedRow = new RowLayout() { Tag="0"};//记录左滑状态
        
        private static async void Automationview(VerticalRefreshLayout refresview, bool no)
        {
            refresview.RemoveAll();
@@ -438,7 +438,7 @@
                    //实现android显示逻辑列表的圆角;
                    fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
                    logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);

                   
                }

                i++;

                var logicnameBtn = new Button
@@ -763,14 +763,14 @@
            }
            return false;//表示添加失败;

        }

        ///<summary>

        /// s-one门锁是否存在自动化的方法;

        /// 注意（参数2；3）：valueInt=3是删除设置失效时间自动化；valueInt=2判断是否存在自动化；

        /// 返回值：0不存在;1存在;2删除成功;3删除失败;
        /// </summary>

        public static async System.Threading.Tasks.Task<int> Exist(int valueInt = 2)

        }



      ///<summary>

      /// s-one门锁是否存在自动化的方法;

      /// 注意（参数2；3）：valueInt=3是删除设置失效时间自动化；valueInt=2判断是否存在自动化；

      /// 返回值：0不存在;1存在;2删除成功;3删除失败;
      /// </summary>

      public static async System.Threading.Tasks.Task<int> Exist(int valueInt = 2)

        {

            int exist = 0;

            var Idlist = await Send.GetLogicId(valueInt);

@@ -781,27 +781,27 @@
                    for (int i = 0; i < Idlist.Count; i++)

                    {

                        //valueInt=3一条特殊的自动化(用来设置失效时间)

                        var d = await Send.DelLogic(Idlist[i]);
                        if (d != 0)
                        {
                            //删除成功
                            exist = 2;
                        }
                        else
                        {
                            //删除失败
                            exist = 3;
                        }
                        return exist;
                        var d=await Send.DelLogic(Idlist[i]);

                  if (d == 0)

                  {

                     //删除成功

                     exist = 2;

                  }

                  else

                  {

                     //删除失败
                     exist = 3;

                  }

                  return exist;


                    }
                }
               }
            }
                exist = 1;

            }
            return exist;
        }


     
    }
}