Merge branch 'master' into wjc

陈嘉乐

2021-03-02 c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1

 Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs

@@ -386,8 +386,10 @@

                    } else {
                        //提示错误
                        SmartHome.Method method = new SmartHome.Method ();
                        method.ShowGetTimerListErrorInfo (revertObj.Data.ToString ());
                        IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);

                        //SmartHome.Method method = new SmartHome.Method ();
                        //method.ShowGetTimerListErrorInfo (revertObj.Data.ToString ());
                    }
                } catch (Exception ex) {
                    Utlis.WriteLine (ex.Message);