202009301

wxr

2020-09-30 ea318e20d9a513bfae81a9203cef4bca0fc23c2c

202009301

节前备份

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,10 +1,14 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.61286FD1-B849-4457-AA51-F3CD79A395F6" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs">
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget." />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/1-HomePage/HomePage.cs">
    <Files>
      <File FileName="HDL-ON_Android/Properties/AndroidManifest.xml" Line="15" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs" Line="132" Column="55" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" Line="618" Column="49" />
      <File FileName="HDL-ON_Android/Properties/AndroidManifest.xml" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs" Line="127" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="9" Column="39" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" Line="167" Column="31" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="348" Column="19" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="354" Column="45" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -13,16 +17,33 @@
            <Node name="HDL_ON" expanded="True">
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="PersonalDataPageBLL.cs" selected="True" />
                  <Node name="1-HomePage" expanded="True">
                    <Node name="HomePage.cs" selected="True" />
                  </Node>
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Scene" expanded="True" />
                  </Node>
                  <Node name="4-PersonalCenter" expanded="True" />
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Assets" expanded="True">
                <Node name="Phone" expanded="True">
                  <Node name="PersonalCenter" expanded="True">
                    <Node name="AppUnlockSetting" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True" />
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True">
                <Node name="Phone" expanded="True" />
                <Node name="Phone" expanded="True">
                  <Node name="Classification" expanded="True" />
                  <Node name="PersonalCenter" expanded="True">
                    <Node name="AppUnlockSetting" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
          </Node>
@@ -36,7 +57,7 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>

 HDL-ON_Android/Assets/Phone/PersonalCenter/AppUnlockSetting/1.png

 HDL-ON_Android/Assets/Phone/PersonalCenter/AppUnlockSetting/1On.png

 HDL-ON_Android/Assets/Phone/PersonalCenter/AppUnlockSetting/3.png

 HDL-ON_Android/Assets/Phone/PersonalCenter/AppUnlockSetting/3On.png

 HDL-ON_Android/Assets/Phone/PersonalCenter/AppUnlockSetting/4.png

 HDL-ON_Android/Assets/Phone/PersonalCenter/AppUnlockSetting/4On.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/.DS_Store

Binary files differ

 HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/1.png

 HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/1On.png

 HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/3.png

 HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/3On.png

 HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/4.png

 HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/4On.png

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -859,7 +859,18 @@
                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);

                btnSettingIcon.MouseUpEventHandler = (sender, e) => {

                    Action backAction = () => {
                        //LoadSceneFunctionControlZone();
                    };
                    Action refreshAction = () => {
                        btnName.Text = function.name;
                        btnZone.Text = function.GetRoomListName();
                        view.BackgroundImagePath = (function as Scene).ImagePath;
                    };
                    var aep = new SceneEditPage(function as Scene, backAction);
                    MainPage.BasePageView.AddChidren(aep);
                    aep.LoadPage(StringId.EditScene, refreshAction);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };
            }
            catch (Exception ex)