2020-03-17-2

WJC

2020-03-17 bbaae33cad1dadaad27eeac712d30fff248bffa5

2020-03-17-2

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

@@ -12,20 +12,35 @@
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="1198" Column="75" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/mFunView.cs" Line="7" Column="36" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs" Line="1094" Column="10" />
      <File FileName="Shared/Phone/Device/Logic/DelayTime.cs" Line="12" Column="2" />
      <File FileName="Shared/Phone/Device/Logic/DelayTime.cs" Line="61" Column="18" />
      <File FileName="Shared/Phone/Device/Logic/DeviceTarget.cs" Line="78" Column="48" />
      <File FileName="Shared/Phone/Device/Logic/SecurityMode.cs" Line="50" Column="40" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/SaveView.cs" Line="14" Column="30" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True">
                <Node name="Phone" expanded="True">
                  <Node name="ZigeeLogic" expanded="True">
                    <Node name="delay.png" selected="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="CommonForm" expanded="True" />
                  <Node name="Logic" expanded="True">
                    <Node name="LogicView" expanded="True" />
                    <Node name="DelayTime.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="DoorLock" expanded="True" />
                </Node>
              </Node>
            </Node>
          </Node>

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

old mode 100755
new mode 100644
@@ -36,7 +36,7 @@
            };
            this.AddChidren(middle);

            var blancolor = new FrameLayout
            var blancolorFl = new FrameLayout
            {
                Width = Application.GetMinRealAverage(200),
                Height = Application.GetMinRealAverage(200),
@@ -45,32 +45,32 @@
                Radius = (uint)Application.GetMinRealAverage(100),
                X = Application.GetRealWidth(440),
            };
            middle.AddChidren(blancolor);
            var color = new FrameLayout
            middle.AddChidren(blancolorFl);
            var colorBtn = new Button
            {
                Width = blancolor.Width - Application.GetMinRealAverage(24),
                Height = blancolor.Height - Application.GetMinRealAverage(24),
                Width = Application.GetMinRealAverage(200-24),
                Height =Application.GetMinRealAverage(200-24),
                Y = Application.GetRealHeight(12),
                BackgroundColor = 0xFFFEF1ED,
                Radius = (uint)Application.GetMinRealAverage(86),
                Radius = (uint)Application.GetMinRealAverage(88),
                X = Application.GetRealWidth(12),
            };
            blancolor.AddChidren(color);
            blancolorFl.AddChidren(colorBtn);
            var btnicon = new Button
            {
                X = Application.GetRealWidth(48),
                Width = Application.GetRealWidth(80),
                Height = Application.GetRealHeight(80),
                Y = Application.GetRealHeight(48),
                X = Application.GetRealWidth(58),
                Width = Application.GetMinRealAverage(84),
                Height = Application.GetMinRealAverage(84),
                Y = Application.GetRealHeight(58),
                UnSelectedImagePath = "ZigeeLogic/delay.png",
            };
            color.AddChidren(btnicon);
            blancolorFl.AddChidren(btnicon);
            var titleText = new Button
            {
                Width = Application.GetMinRealAverage(580),
                Height = Application.GetMinRealAverage(60),
                X = Application.GetRealWidth(250),
                Y = blancolor.Bottom + Application.GetRealHeight(50),
                Y = blancolorFl.Bottom + Application.GetRealHeight(50),
                TextID = MyInternationalizationString.createtimetext,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
@@ -91,12 +91,14 @@
            {
                Y = Application.GetRealHeight(50),
                Height = Application.GetRealHeight(600),
                //Width=Application.GetRealWidth(1080-400),
                //X=Application.GetRealWidth(200),
            };
            PickerViewfra.AddChidren(mUIPickerView);

            var mList1 = new List<string>();
            var mList2 = new List<string>();
            for (int i = 0; i < 61; i++)
            for (int i = 0; i < 60; i++)
            {
                if (i < 10)
                {
@@ -111,7 +113,8 @@
                }

            }
            mUIPickerView.setNPicker(mList1, mList2, new List<string>());
           
            mUIPickerView.setNPicker(mList1, mList2,null);
            ///默认状态
            mUIPickerView.setCurrentItems(0, 5, 0);
            int timevalue = 5;
@@ -146,6 +149,9 @@

            };




            var btnsave = new Button
            {
                Y = PickerViewfra.Height - Application.GetRealHeight(260),