2020-07-17-1

陈嘉乐

2020-07-17 627093aca723d4bfb971b97c828e8b3a22dbda78

2020-07-17-1

修改球形移动传感器UI

 .DS_Store

Binary files differ

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

@@ -1,20 +1,30 @@
<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/CurrentDeviceState.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicView/SaveView.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="22" Column="42" />
      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="25" Column="42" />
      <File FileName="Home.Ios/AppDelegate.cs" Line="14" Column="55" />
      <File FileName="Shared/Phone/Device/Logic/Nightlight.cs" Line="13" Column="10" />
      <File FileName="Shared/Phone/Device/Logic/Illumination.cs" Line="191" Column="60" />
      <File FileName="Home.Ios/Resources/Language.ini" Line="616" Column="10" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/TopView.cs" Line="42" Column="44" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/SaveView.cs" Line="7" Column="18" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="Home.IOS" expanded="True" />
            <Node name="Home.IOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="CurrentDeviceState.cs" selected="True" />
                    <Node name="LogicView" expanded="True">
                      <Node name="SaveView.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

 ZigbeeApp/GateWay.Droid/Assets/Language.ini

@@ -614,8 +614,8 @@
5408=蜂鸣器
5409=环境光照度
5410=照度值<
5411=暗{\r\n} 0lux
5412=亮{\r\n} 100lux
5411=暗
5412=亮
5413=在室内条件下,黑暗照度值约为0.02lux,黄昏照度值{\r\n}约为10lux,阴天照度值约为5~50lux,请根据实际{\r\n}需要进行调节
5414=可视对讲
5415=栋

 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs

Diff too large

 ZigbeeApp/Home.Ios/Resources/Language.ini

@@ -614,8 +614,8 @@
5408=蜂鸣器
5409=环境光照度
5410=照度值<
5411=暗{\r\n} 0lux
5412=亮{\r\n} 100lux
5411=暗
5412=亮
5413=在室内条件下,黑暗照度值约为0.02lux,黄昏照度值{\r\n}约为10lux,阴天照度值约为5~50lux,请根据实际{\r\n}需要进行调节
5414=可视对讲
5415=栋

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

@@ -22,7 +22,7 @@
            {
                RemoveFromParent();
            };
            FrameLayout middle = new FrameLayout
            FrameLayout middle= new FrameLayout
            {
                Y = view.topRowLayout.Bottom,
                Height = Application.GetRealHeight(Method.H - 184),
@@ -47,8 +47,9 @@
                //TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                TextSize = 12,
                TextAlignment=TextAlignment.CenterLeft,
            };
            middle.AddChidren(illuminationBtn);
            blankFraLayout.AddChidren(illuminationBtn);
            //-图标控件
            Button lessBtn = new Button
            {
@@ -58,7 +59,7 @@
                Width = Application.GetMinRealAverage(104),
                UnSelectedImagePath = "ZigeeLogic/lesLuminositys.png",
            };
            middle.AddChidren(lessBtn);
            blankFraLayout.AddChidren(lessBtn);
            //+图标控件
            Button addBtn = new Button
            {
@@ -68,13 +69,13 @@
                Width = Application.GetMinRealAverage(104),
                UnSelectedImagePath = "ZigeeLogic/addLuminosity.png",
            };
            middle.AddChidren(addBtn);
            blankFraLayout.AddChidren(addBtn);
            //进度条控件
            var horizontalSeekBarVol = new DiyImageSeekBar
            {
                Y = Application.GetRealHeight(173),//进度条父控件Y坐标
                X = Application.GetRealWidth(104),//进度条X坐标
                Width = Application.GetRealWidth(873),//进度条的长度
                X = Application.GetRealWidth(104-20),//进度条X坐标
                Width = Application.GetRealWidth(873+40),//进度条的长度
                Height = Application.GetRealHeight(56),//进度条父控件高度
                IsProgressTextShow = false,//显示百分比
                IsClickable = true,//进度条是否滑动
@@ -89,7 +90,7 @@
                MinValue = 0,
                Progress = progresValue,
            };
            middle.AddChidren(horizontalSeekBarVol);
            blankFraLayout.AddChidren(horizontalSeekBarVol);
            lessBtn.MouseUpEventHandler += (sender, e) =>
            {
                horizontalSeekBarVol.Progress = horizontalSeekBarVol.Progress - 1;
@@ -109,32 +110,57 @@

            Button text1Btn = new Button()
            {
                X = Application.GetRealWidth(81),
                X = Application.GetRealWidth(95),
                Y = Application.GetRealHeight(426 - 184),
                Height = Application.GetRealHeight(100),
                Width = Application.GetRealWidth(63+15),
                Text = Language.StringByID(MyInternationalizationString.dark).Replace("{\\r\\n}", "\r\n"),
                Height = Application.GetRealHeight(50),
                Width = Application.GetRealWidth(100),
                Text = Language.StringByID(MyInternationalizationString.dark),
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 12,
                TextAlignment = TextAlignment.Center,
                IsMoreLines = true,
                TextAlignment = TextAlignment.CenterLeft,
            };
            middle.AddChidren(text1Btn);
            blankFraLayout.AddChidren(text1Btn);

            Button text0Btn = new Button()
            {
                X = Application.GetRealWidth(81),
                Y = text1Btn.Bottom,
                Height = Application.GetRealHeight(50),
                Width = Application.GetRealWidth(100),
                Text = "0lux",
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 12,
                TextAlignment = TextAlignment.CenterLeft,
            };
            blankFraLayout.AddChidren(text0Btn);

            Button text2Btn = new Button()
            {
                X = Application.GetRealWidth(913-20),
                X = Application.GetRealWidth(950),
                Y = Application.GetRealHeight(426 - 184),
                Height = Application.GetRealHeight(100),
                Width = Application.GetRealWidth(109+20),
                Text = Language.StringByID(MyInternationalizationString.bright).Replace("{\\r\\n}", "\r\n"),
                Height = Application.GetRealHeight(50),
                Width = Application.GetRealWidth(100),
                Text = Language.StringByID(MyInternationalizationString.bright),
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 12,
                TextAlignment = TextAlignment.Center,
                IsMoreLines = true,
                TextAlignment = TextAlignment.CenterLeft,

            };
            middle.AddChidren(text2Btn);
            blankFraLayout.AddChidren(text2Btn);

            Button text100Btn = new Button()
            {
                X = Application.GetRealWidth(913),
                Y = text2Btn.Bottom,
                Height = Application.GetRealHeight(50),
                Width = Application.GetRealWidth(109+17),
                Text = "100lux",
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 12,
                TextAlignment = TextAlignment.CenterLeft,
            };
            blankFraLayout.AddChidren(text100Btn);
         
            //提示图标
            Button tipIconBtn = new Button
            {
@@ -144,7 +170,7 @@
                Width = Application.GetMinRealAverage(58),
                UnSelectedImagePath = "ZigeeLogic/tipIcon.png",
            };
            middle.AddChidren(tipIconBtn);
            blankFraLayout.AddChidren(tipIconBtn);

            //提示文字
            Button tipTextBtn = new Button()
@@ -160,7 +186,7 @@
                IsMoreLines = true,

            };
            middle.AddChidren(tipTextBtn);
            blankFraLayout.AddChidren(tipTextBtn);

            //保存控件
            LogicView.SaveView saveView = new LogicView.SaveView();