2020-1-14-01

WJC

2020-01-14 b74c052b43d7c4a830386940a036eb7c2ec9abc2

2020-1-14-01

修复刷不出来联动事件列表的，请合并代码

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

@@ -1,22 +1,16 @@
<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="Home.Ios/Resources/Language.ini">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/MemberList.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/CustomText.cs" Line="171" Column="9" />
      <File FileName="GateWay.Droid/Application.cs" />
      <File FileName="Home.Ios/AppDelegate.cs" />
      <File FileName="Shared/Common/CommonPage.cs" />
      <File FileName="Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs" />
      <File FileName="Shared/Common/ZigbeeColor.cs" Line="315" Column="40" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="2017" Column="14" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1142" Column="20" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="1089" Column="17" />
      <File FileName="Shared/Phone/Device/Logic/TemplatePage.cs" Line="88" Column="23" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="85" Column="62" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="725" Column="114" />
      <File FileName="Shared/R.cs" Line="580" Column="54" />
      <File FileName="Home.Ios/Resources/Language.ini" Line="610" Column="5" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="135" Column="76" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="413" Column="38" />
      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="418" Column="60" />
      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="2048" Column="55" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" />
      <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="246" Column="1" />
      <File FileName="Shared/Common/Logic.cs" />
      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="356" Column="123" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -26,20 +20,17 @@
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="Home.IOS" expanded="True">
              <Node name="Resources" expanded="True">
                <Node name="Language.ini" selected="True" />
              </Node>
              <Node name="Resources" expanded="True" />
            </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="DoorLockLogic" expanded="True" />
                    <Node name="MemberList.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="Suggestion" expanded="True" />
                </Node>
              </Node>
            </Node>
@@ -52,7 +43,9 @@
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
    <BreakpointStore>
      <Breakpoint file="/Users/hdl/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs" relfile="Shared/Phone/Device/Logic/Send.cs" line="524" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -613,7 +613,7 @@
5376=应用
5377=没有自动化{\r\n} 请点击右上角添加
5378=推送内容不能为空.
5379=暂无门锁联动事件{\r\n} 请点击右上角添加
5379=暂无联动事件{\r\n} 请点击右上角添加




 ZigbeeApp/Home.Ios/Resources/Language.ini

@@ -613,7 +613,7 @@
5376=应用
5377=没有自动化{\r\n} 请点击右上角添加
5378=推送内容不能为空.
5379=暂无门锁联动事件{\r\n} 请点击右上角添加
5379=暂无联动事件{\r\n} 请点击右上角添加




 ZigbeeApp/Shared/Phone/.DS_Store

Binary files differ

 ZigbeeApp/Shared/Phone/Device/.DS_Store

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

@@ -723,7 +723,7 @@
            Common.Logic.CurrentLogic = new Common.Logic();
            Common.Logic.CurrentLogic.IsEnable = 1;//默认为开
            Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
            Common.Logic.CurrentLogic.LogicCustomPushText =Common.Logic.CurrentLogic.LogicName+Language.StringByID(MyInternationalizationString.defaulttext);
            //Common.Logic.CurrentLogic.LogicCustomPushText =Common.Logic.CurrentLogic.LogicName+Language.StringByID(MyInternationalizationString.defaulttext);
            var addLogicPage = new Shared.Phone.Device.Logic.AddLogicPage();
            UserView.HomePage.Instance.AddChidren(addLogicPage);
            UserView.HomePage.Instance.PageIndex += 1;
@@ -1876,7 +1876,7 @@
                            if (logiciocnBtn.Tag.ToString() == "3")
                            {
                                Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
                                Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
                                //Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
                                var addLogicPage = new Logic.AddLogicPage();
                                HomePage.Instance.AddChidren(addLogicPage);
                                HomePage.Instance.PageIndex += 1;
@@ -1886,7 +1886,7 @@
                            {

                                Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
                                Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
                                //Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
                                Logic.TemplatePage templatePage = new Logic.TemplatePage();
                                Logic.TemplatePage.s = logiciocnBtn.Tag.ToString();
                                HomePage.Instance.AddChidren(templatePage);

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

@@ -325,6 +325,29 @@
                    TextSize = 14,
                };
                doorlockRow.AddChidren(doorlockBtn);
                if (string.IsNullOrEmpty(doorlockBtn.Text))
                {
                    string strname = "";
                    switch (userIdmode.OpenMode)
                    {
                        case 0:
                            {
                                strname = Language.StringByID(MyInternationalizationString.lockpassword);
                            }
                            break;
                        case 3:
                            {
                                strname = Language.StringByID(MyInternationalizationString.ic);
                            }
                            break;
                        case 15:
                            {
                                strname = Language.StringByID(MyInternationalizationString.fingerprint);
                            }
                            break;
                    }
                    doorlockBtn.Text = strname + "ID" + userIdmode.UserId;
                }

                var doorlockSelected = new Button
                {
@@ -350,7 +373,7 @@
                        //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                        attriButeId = userIdmode.OpenMode.ToString();
                    attriButeData2 = userIdmode.UserId;
                    modeName = userIdmode.ModeName;
                    modeName = doorlockBtn.Text;
                };
                doorlockRow.MouseUpEventHandler += doorlockclick;
                doorlockBtn.MouseUpEventHandler += doorlockclick;
@@ -386,7 +409,8 @@
                lockConditionsInfo.Add("Range", "0");
                var accounts = new Dictionary<string, string>();
                accounts.Add("Type", "1");
                accounts.Add("Account", membershipIfon.UserName + modeName);
                accounts.Add("Account", Config.Instance.Guid);
                accounts.Add("Option3", membershipIfon.UserName + modeName);//用来显示名称
                accounts.Add("UserId", attriButeData2);
                if (SelectedLockStatus != "")
                {

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

@@ -353,7 +353,7 @@
                                                {
                                                    if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
                                                    {
                                                        devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
                                                        devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Option3"];
                                                        break;
                                                    }
                                                }
@@ -1166,6 +1166,7 @@
        }
        public  void AddCondition(int value)
        {
            Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
            var addCondition = new AddCondition();
            addCondition.conditionsIndex = value;
            UserView.HomePage.Instance.AddChidren(addCondition);

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

@@ -83,7 +83,7 @@
                Common.Logic.CurrentLogic.LogicType = 1;
                Common.Logic.CurrentLogic.Relationship = 1;
                Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
                Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
                //Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
                var lockLogicCommunalPage = new LockLogicCommunalPage();
                UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                UserView.HomePage.Instance.PageIndex += 1;
@@ -152,7 +152,7 @@
        /// <summary>
        /// 加载自动化列表的界面
        /// </summary>
        public void Automationview()
        public void Automationview() 
        {
            middle.RemoveAll();


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

@@ -763,7 +763,7 @@
                                                {
                                                    if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
                                                    {
                                                        devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
                                                        devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Option3"];
                                                        break;

                                                    }

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

@@ -332,6 +332,30 @@
                    TextSize = 14,
                };
                doorlockRow.AddChidren(doorlockBtn);
                if (string.IsNullOrEmpty(doorlockBtn.Text))
                {
                    string strname = "";
                    switch (userifon.OpenMode)
                    {
                        case 0:
                            {
                                strname = Language.StringByID(MyInternationalizationString.lockpassword);
                            }
                            break;
                        case 3:
                            {
                                strname = Language.StringByID(MyInternationalizationString.ic);
                            }
                            break;
                        case 15:
                            {
                                strname = Language.StringByID(MyInternationalizationString.fingerprint);
                            }
                            break;
                    }
                    doorlockBtn.Text = strname + "ID" + userifon.UserId;
                }


                var doorlockSelected = new Button
                {
@@ -391,7 +415,8 @@
                deviceConditionsInfo.Add("Range", "0");
                deviceConditionsInfo.Add("AttriButeId", openMode);
                deviceConditionsInfo.Add("AttriButeData2", userId);
                userdictionary.Add("Account", accountname);
                userdictionary.Add("Account", Config.Instance.Guid);
                userdictionary.Add("Option3", accountname);//用来显示名称
                userdictionary.Add("Type", "1");
                userdictionary.Add("UserId", userId);
                if (edit)

 ZigbeeApp/Shared/Shared.projitems

@@ -437,12 +437,12 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SecurityMode.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\WeekPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\CustomText.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockAddDevice.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\AddAction.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockLogicCommunalPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockAddScene.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockLogicList.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\AddCondition.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockAddDevice.cs" />

  </ItemGroup>

  <ItemGroup>

    <Folder Include="$(MSBuildThisFileDirectory)Pad\" />