WJC
2020-01-02 3f52028f3ca6513f89933ed76e513376fec0962a
2020-01-02-2
9个文件已修改
121 ■■■■ 已修改文件
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/GateWay.Droid/Assets/Language.ini 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Home.Ios/Resources/Language.ini 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/Shared/R.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,22 +1,15 @@
<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>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="Shared" expanded="True">
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Category" selected="True" />
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
    </Pads>
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Common/ZigbeeColor.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/CustomText.cs" Line="94" Column="66" />
      <File FileName="GateWay.Droid/Application.cs" Line="187" Column="16" />
      <File FileName="Home.Ios/AppDelegate.cs" />
      <File FileName="Shared/Common/CommonPage.cs" Line="41" Column="51" />
      <File FileName="Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs" />
      <File FileName="Shared/Common/ZigbeeColor.cs" Line="315" Column="40" />
    </Files>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -362,7 +362,7 @@
5097=取消
5098=确认
5098=确定
5099=提示
5100=逻辑列表
5101=无
@@ -405,7 +405,7 @@
5138=时间条件
5139=条件
5140=推送设置
5141=推送开关
5141=推送消息
5142=自定义推送
5143=日出前
5144=日出后
@@ -533,7 +533,7 @@
5266=布防
5267=请选择布防或撤防为条件
5268=请选择安防类型
5269=有人
5269=检测有人时
5270=无人
5271=开启
5272=关闭
@@ -547,7 +547,7 @@
5280=立即执行
5281=时间范围
5282=自定义房间
5283=设置周期
5283=生效时间
5284=自动化
5285=自动化名称
5286=如果
@@ -613,6 +613,7 @@
5376=应用
5377=没有自动化{\r\n} 请点击右上角添加
5378=推送内容不能为空.
5379=暂无门锁联动事件{\r\n} 请点击右上角添加
ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -362,7 +362,7 @@
5097=取消
5098=确认
5098=确定
5099=提示
5100=逻辑列表
5101=无
@@ -405,7 +405,7 @@
5138=时间条件
5139=条件
5140=推送设置
5141=推送开关
5141=推送消息
5142=自定义推送
5143=日出前
5144=日出后
@@ -533,7 +533,7 @@
5266=布防
5267=请选择布防或撤防为条件
5268=请选择安防类型
5269=有人
5269=检测有人时
5270=无人
5271=开启
5272=关闭
@@ -547,7 +547,7 @@
5280=立即执行
5281=时间范围
5282=自定义房间
5283=设置周期
5283=生效时间
5284=自动化
5285=自动化名称
5286=如果
@@ -613,6 +613,7 @@
5376=应用
5377=没有自动化{\r\n} 请点击右上角添加
5378=推送内容不能为空.
5379=暂无门锁联动事件{\r\n} 请点击右上角添加
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -84,6 +84,30 @@
            middle.AddChidren(textBox);
            textBox.HideSoftInput();
            var textBtn = new Button
            {
                Width = Application.GetRealWidth(80),
                Height = Application.GetRealHeight(50),
                X = Application.GetRealWidth(1080 - 80 - 50),
                Y = Application.GetRealHeight(550 - 25),
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                Text = "50",
            };
            middle.AddChidren(textBtn);
            textBox.TextChangeEventHandler += (sender, e) =>
            {
                var leng = e.Length;
                if (leng > 50)
                {
                    var substring = e.Substring(0, 50);
                    textBox.Text = substring;
                }
                else
                {
                    textBtn.Text = (50 - leng).ToString();
                }
            };
            var btnsave = new Button
            {
                Y = middle.Height - Application.GetRealHeight(260),
@@ -115,6 +139,43 @@
                 RemoveFromParent();
             };
            //var txtInput = new EditTextView();
            //txtInput.Width = bodyFrameLayout.Width - ControlCommonResourse.XXLeft * 2;
            //txtInput.Height = Application.GetRealHeight(470);
            //txtInput.Y = Application.GetRealHeight(32);
            //txtInput.TextAlignment = TextAlignment.TopLeft;
            //txtInput.Gravity = Gravity.CenterHorizontal;
            //txtInput.TextColor = UserCenterColor.Current.TextColor1;
            //txtInput.PlaceholderTextColor = UserCenterColor.Current.TextGrayColor1;
            //txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uYouSuggestionMsg);
            //frameInput.AddChidren(txtInput);
            //txtInput.TextChangeEventHandler += (sender, txtvalue) =>
            //{
            //    if (this.suggestionCount <= 0)
            //    {
            //        return;
            //    }
            //    int length = txtvalue.Length;
            //    if (length > 500)
            //    {
            //        if (btnSubmit.CanClick == true) { btnSubmit.CanClick = false; }
            //        btnFild.Text = "0";
            //        return;
            //    }
            //    if (length == 0)
            //    {
            //        if (btnSubmit.CanClick == true) { btnSubmit.CanClick = false; }
            //    }
            //    else
            //    {
            //        if (btnSubmit.CanClick == false) { btnSubmit.CanClick = true; }
            //    }
            //    btnFild.Text = (500 - length).ToString();
            //};
        }
    }
}
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -284,11 +284,11 @@
            lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.UserIdMode.Count) - 20 - 50);
            lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.UserIdMode.Count) + 20 + 50);
            if (membershipIfon.UserIdMode.Count > 10)
            if (membershipIfon.UserIdMode.Count > 9)
            {
                ///元素超出10个,暂时默认显示10;
                lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 10) - 20 - 50);
                lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 10) + 20 + 50);
                lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 9) - 20 - 50);
                lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 9) + 20 + 50);
            }
            string SelectedLockStatus = "";
            ///定义两个变量记录选中状态;
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -182,7 +182,7 @@
                    Height = Application.GetRealHeight(200) + Application.GetRealHeight(32),
                    Width = Application.GetRealWidth(700),
                    //Gravity = Gravity.CenterHorizontal,
                    Text = Language.StringByID(MyInternationalizationString.automationaddtext).Replace("{\\r\\n}", "\r\n"),
                    Text = Language.StringByID(MyInternationalizationString.tiplocktextnull).Replace("{\\r\\n}", "\r\n"),
                    TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                    TextAlignment = TextAlignment.Center,
                    IsMoreLines = true,
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -296,11 +296,11 @@
            string SelectedDeviceStatuscondition = "";
            lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
            lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
            if (user.UserIdMode.Count > 10)
            if (user.UserIdMode.Count > 9)
            {
                ///元素超出10个,暂时默认显示10;
                lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 10) - 20 - 50);
                lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 10) + 20 + 50);
                lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 9) - 20 - 50);
                lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 9) + 20 + 50);
            }
         
            for (int i = 0; i < user.UserIdMode.Count; i++)
ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
@@ -46,7 +46,7 @@
                Width = Application.GetRealWidth(600),
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.devicestate,
                TextID = MyInternationalizationString.addsensor,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);
ZigbeeApp/Shared/R.cs
@@ -583,6 +583,7 @@
        public readonly static int application = 5376;
        public readonly static int automationaddtext = 5377;
        public readonly static int tiptextnull = 5378;
        public readonly static int tiplocktextnull = 5379;
        #region 登录注册
        /// <summary>