Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

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

@@ -72,7 +72,7 @@
        /// </summary>
        public static void ShowAutotionView(FrameLayout functionSceneAutoBodyView)
        {
            // functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
            //functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
            #region   ---推荐模板的组件
            //推荐模板背景控件
            var bjFrameLayout = new FrameLayout
@@ -703,7 +703,7 @@
        /// <param name="timeVlaue">时间值</param>
        /// <param name="common">设备</param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<bool> LockAddModifyLogic(int timeVlaue, CommonDevice common)
        public static async System.Threading.Tasks.Task<int> LockAddModifyLogic(int timeVlaue, CommonDevice common)
        {
            //读取系统当前时间：时-分
            var h = DateTime.Now.ToString("HH");
@@ -736,9 +736,9 @@
            {
                //添加门锁失效时间的历史记录
                UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
                return true;//表示添加成功;
                return logicIfon.LogicId;//表示添加成功;
            }
            return false;//表示添加失败;
            return 0;//表示添加失败;

        }

@@ -759,7 +759,7 @@
            }
            return exist;
        }

    
        ///<summary>
        ///获取逻辑信息
        /// 返回值：null不存在;其它值都存在;
@@ -799,7 +799,9 @@
            }
            return _if;
        }
       

    

    }
}