2019-12-30-2

WJC

2019-12-30 df30e8562e49b45e7a9a3497d368cebd6085be87

2019-12-30-2

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,12 +1,9 @@
<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicCommunalPage.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/AddLogicPage.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="708" Column="22" />
      <File FileName="Shared/Phone/Device/Logic/DeviceTarget.cs" Line="258" Column="45" />
      <File FileName="Shared/Phone/Device/Logic/SecurityMode.cs" Line="328" Column="9" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="1222" Column="15" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -16,19 +13,18 @@
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="Home.IOS" expanded="True">
              <Node name="Resources" expanded="True" />
              <Node name="Resources" expanded="True">
                <Node name="Phone" expanded="True" />
              </Node>
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Category" expanded="True" />
                  <Node name="Logic" expanded="True">
                    <Node name="LogicCommunalPage.cs" selected="True" />
                    <Node name="DoorLockLogic" expanded="True" />
                    <Node name="AddLogicPage.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="ZigBee" expanded="True">
                  <Node name="Common" expanded="True" />
                  <Node name="Device" expanded="True" />
                </Node>
              </Node>
            </Node>

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -612,6 +612,7 @@
5375=添加开关/灯光
5376=应用
5377=没有自动化{\r\n} 请点击右上角添加
5378=推送内容不能为空.




 ZigbeeApp/Home.Ios/Resources/Language.ini

@@ -612,6 +612,7 @@
5375=添加开关/灯光
5376=应用
5377=没有自动化{\r\n} 请点击右上角添加
5378=推送内容不能为空.




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

@@ -153,7 +153,7 @@
            {
                if (clickTag == "no" || tempScene == null)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                              Language.StringByID(MyInternationalizationString.scenetip),
                                              Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();

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

@@ -103,6 +103,14 @@
            btnsave.MouseUpEventHandler += (sender, e) =>
             {
                 Common.Logic.CurrentLogic.LogicCustomPushText = textBox.Text.Trim();
                 if (string.IsNullOrEmpty(Common.Logic.CurrentLogic.LogicCustomPushText))
                 {
                     var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                           Language.StringByID(MyInternationalizationString.tiptextnull),
                           Language.StringByID(MyInternationalizationString.confrim));
                           alert.Show();
                           return;
                 }
                 if (Common.Logic.CurrentLogic.LogicId != 0)
                 {
                     ///只改推送内容；

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

@@ -432,10 +432,11 @@
            {
                if (!onceBackBtn.Visible && !everydayBack.Visible)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                 

                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                                     Language.StringByID(MyInternationalizationString.selectweek),
                                                 Language.StringByID(MyInternationalizationString.confrim));

                    alert.Show();
                    return;
                }

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

@@ -1566,7 +1566,7 @@
                {
                    if (!edit)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs

@@ -544,7 +544,7 @@
                {
                    if (conditionsIndex == -1)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                               Language.StringByID(MyInternationalizationString.usertip),
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs

@@ -2106,7 +2106,7 @@
                {
                    if (!edit)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs

@@ -151,7 +151,7 @@
            {
                if (clickTag == "no" || tempScene == null)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                              Language.StringByID(MyInternationalizationString.scenetip),
                                              Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();

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

@@ -202,10 +202,10 @@

                if (monselectedlist.Count == 0)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),

                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                                     Language.StringByID(MyInternationalizationString.selectweek),
                                                 Language.StringByID(MyInternationalizationString.confrim));

                    alert.Show();
                    return;
                }

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

@@ -247,7 +247,8 @@
            {
                if (!edit)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),

                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                           Language.StringByID(MyInternationalizationString.delaytip),
                                           Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();

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

@@ -2020,7 +2020,10 @@
                var name = logicTextBox.Text.Trim();
                if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
                {
                    new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                      Language.StringByID(MyInternationalizationString.PleaseEnterLogicName),
                      Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }
                ///先隐藏判断名字相同的功能；

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

@@ -2108,7 +2108,7 @@
                {
                    if (!edit)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();

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

@@ -443,9 +443,9 @@
                {
                    if (!edit)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.complete));
                         Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
                        return;
                    }

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

@@ -393,7 +393,8 @@
            {
                if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible && !urgentwithdrawalSelected.Visible)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                   
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                               Language.StringByID(MyInternationalizationString.securitytip),
                                               Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();

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

@@ -623,6 +623,7 @@
                        logic.LogicName = Logicifon["LogicName"].ToString();
                        logic.LogicType = int.Parse(Logicifon["LogicType"].ToString());
                        logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
                        logic.LogicCustomPushText =Logicifon["LogicCustomPushText"].ToString();
                        logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
                        logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
                        logic.Accounts = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Accounts"].ToString());
@@ -1138,33 +1139,36 @@
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<string>Data(string command, string url, string method, object obj = null)
        {
            var getUrl = CommonPage.RequestHttpsHost + url;//请求地址；
            var getUrl ="";
            var jObject = new JObject();
            if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 1)
            {
                getUrl = CommonPage.RequestHttpsHost + url;//请求地址；
                jObject.Add("IsOtherAccountCtrl", false);
                jObject.Add("LoginAccessToken", Config.Instance.Token);
            }
            else
            {
                getUrl = Config.Instance.AdminRequestBaseUrl + url;//请求地址；
                jObject.Add("IsOtherAccountCtrl", true);
                jObject.Add("LoginAccessToken", Config.Instance.AdminRequestToken);
            }
            switch (command)
            {
                case "添加/更新":
                    {
                        jObject.Add("RequestVersion", CommonPage.RequestVersion);
                        jObject.Add("LoginAccessToken", Config.Instance.Token);
                        //jObject.Add("LoginAccessToken", Config.Instance.Token);
                        jObject.Add("HomeId", Config.Instance.HomeId);
                        jObject.Add("LogicID", Common.Logic.CurrentLogic.LogicId);
                        jObject.Add("PushUserIds", new JArray { Config.Instance.Guid });
                        jObject.Add("PushContent", Common.Logic.CurrentLogic.LogicCustomPushText);

                    }
                    break;
                case "删除":
                    {
                        jObject.Add("RequestVersion", CommonPage.RequestVersion);
                        jObject.Add("LoginAccessToken", Config.Instance.Token);
                        //jObject.Add("LoginAccessToken", Config.Instance.Token);
                        jObject.Add("HomeId", Config.Instance.HomeId);
                        jObject.Add("LogicID", Common.Logic.CurrentLogic.LogicId);
                    }

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

@@ -2070,9 +2070,9 @@
                {
                    if (!edit)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.complete));
                        Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
                        return;
                    }

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

@@ -1118,7 +1118,7 @@
                {
                    if (!edit)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();

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

@@ -245,7 +245,8 @@
            {
                if (!edit)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),

                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                           Language.StringByID(MyInternationalizationString.delaytip),
                                           Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();

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

@@ -1248,7 +1248,10 @@
                //}
                if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
                {
                    new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                      Language.StringByID(MyInternationalizationString.PleaseEnterLogicName),
                      Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }
                //var logicname = Common.Logic.LogicList.Find((logic) => Common.Logic.CurrentLogic.LogicId != logic.LogicId && logic.LogicName == name);

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

@@ -367,7 +367,8 @@

                    if (btnendtime.Tag.ToString() != "0" &&  startval.ToString()==btnendtime.Tag.ToString())
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                       
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                              Language.StringByID(MyInternationalizationString.nottime),
                                              Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
@@ -375,7 +376,8 @@
                    }
                    if (btnendtime.Tag.ToString() != "0" && startval > int.Parse(btnendtime.Tag.ToString()))
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
             
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                              Language.StringByID(MyInternationalizationString.timesetting),
                                              Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
@@ -441,7 +443,8 @@

                    if (btnstarttime.Tag.ToString() != "0" && endval.ToString() == btnstarttime.Tag.ToString())
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                       
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                              Language.StringByID(MyInternationalizationString.nottime),
                                              Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
@@ -449,7 +452,8 @@
                    }
                    if (btnstarttime.Tag.ToString() != "0" && endval < int.Parse(btnstarttime.Tag.ToString()))
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                       
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                              Language.StringByID(MyInternationalizationString.timesetting),
                                              Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
@@ -479,13 +483,20 @@
            ///完成点击事件
            EventHandler<MouseEventArgs>completeclick=(sender, e) =>
            {

                if (timeBucketConditionsInfo.ContainsKey("Type"))
                {
                    timeBucketConditionsInfo.Remove("Type");
                }
                if (timeBucketConditionsInfo.ContainsKey("IsValid"))
                {
                    timeBucketConditionsInfo.Remove("IsValid");
                }
                timeBucketConditionsInfo.Add("Type", "5");
                timeBucketConditionsInfo.Add("IsValid", "1");

                if (string.IsNullOrEmpty(btnstarttime.Text) || string.IsNullOrEmpty(btnendtime.Text))
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                           Language.StringByID(MyInternationalizationString.completeNext),
                                          Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
@@ -493,7 +504,7 @@
                }
                if (btnstarttime.Text == btnendtime.Text)
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                          Language.StringByID(MyInternationalizationString.sametime),
                                         Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();

 ZigbeeApp/Shared/R.cs

@@ -582,6 +582,7 @@
        public readonly static int addlighting = 5375;
        public readonly static int application = 5376;
        public readonly static int automationaddtext = 5377;
        public readonly static int tiptextnull = 5378;

        #region 登录注册
        /// <summary>