| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/HDL-ON_Android.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,25 +1,15 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.SiriIntentUI> <MonoDevelop.MacDev.AppleDevelopmentTeam /> </MonoDevelop.Ide.ItemProperties.SiriIntentUI> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs"> <Files> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs" Line="203" Column="17" IsPinned="True" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="79" /> </Files> <MonoDevelop.Ide.Workbench> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL-ON_iOS" expanded="True" selected="True" /> <Node name="HDL-ON_Android" selected="True" /> </Node> </State> </Pad> <Pad Id="MonoDevelop.Debugger.WatchPad"> <State> <Value>tempFunction.deviceId</Value> <Value>updata2.ToString()</Value> </State> </Pad> </Pads> @@ -32,13 +22,13 @@ <String>SiriIntent/SiriIntent.csproj</String> <String>SceneKit/SceneKit.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.2ffc9a07" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="28" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/SkipControl.cs" relfile="HDL-ON_iOS/Other/SkipControl.cs" line="25" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="14" column="1" /> <Breakpoint file="/Users/hdl/Desktop/git/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="28" column="1" /> <Breakpoint file="/Users/hdl/Desktop/git/HDL_APP_Project/HDL-ON_iOS/Other/SkipControl.cs" relfile="HDL-ON_iOS/Other/SkipControl.cs" line="25" column="1" /> <Breakpoint file="/Users/hdl/Desktop/git/HDL_APP_Project/HdlSiriKit/SkipControl.cs" relfile="HdlSiriKit/SkipControl.cs" line="14" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> HDL-ON_Android/HDL-ON_Android.csproj
@@ -33,7 +33,6 @@ <DefineConstants>DEBUG;TRACE;__Android__</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> <MandroidI18n>cjk</MandroidI18n> <AndroidDexTool>d8</AndroidDexTool> <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent> @@ -62,7 +61,7 @@ <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent> <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime> <AndroidKeyStore>True</AndroidKeyStore> <AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore> <AndroidSigningKeyStore>/Users/hdl/Desktop/on_plus/on_plus.keystore</AndroidSigningKeyStore> <AndroidSigningStorePass>85521566</AndroidSigningStorePass> <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass> <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias> HDL_ON/UI/MainPage.cs
@@ -26,82 +26,6 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.3.1103"; ///// <summary> ///// 客户端类型 ///// </summary> //public static string ClientType = APIClientType.HDL_ON_PRO.ToString(); /// <summary> /// /// </summary> public static Entity.CityInfo cityInfo = new Entity.CityInfo(); /// <summary> /// 天气刷新action /// </summary> public static Action RefreshAir; /// <summary> /// 回退页面action 没有需要可以不用 /// </summary> public static Action ReturnRefreshAction; /// <summary> /// 无登录模式 /// </summary> public static bool NoLoginMode = false; /// <summary> /// 网络连接状态 /// 0:无网络 /// </summary> public static int InternetStatus = 2; /// <summary> /// 是否进入后台 /// </summary> public static bool IsEnterBackground = false; /// <summary> /// 当前分页索引 /// 0:收藏 /// 1:分类 /// 2:智能 /// 3:个人 /// </summary> public static int CurPageIndex = 9999; ///// <summary> ///// 公司代码 ///// 预留第三方定制标记 ///// 0:HDL ///// </summary> //public static int Company = 0; /// <summary> /// 右滑后退提示按钮 /// </summary> public static Button BtnBackIcon; /// <summary> /// 后退右滑了多少距离，超过一定距离才触发后退事件 /// </summary> public static int StartX = 0; /// <summary> /// 是否全面屏手机 /// </summary> public static bool Increase { /// <summary> /// BaseView /// </summary> public static FrameLayout BaseView { get; internal set; } /// <summary> /// BasePageView /// </summary> public static PageLayout BasePageView { get; set; } /// <summary> /// 用户控制父容器 /// </summary> public static UserPage UserBasePage; /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.3.1123"; ///// <summary> ///// 客户端类型 @@ -222,8 +146,6 @@ BaseView = Application.MainPage; Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor; //#region 测试 //var ddd = new UI.test.TestDialog(); //ddd.InitView(); HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs
@@ -245,7 +245,8 @@ }; functionRow.AddChidren(btnChooseIcon); btnChooseIcon.MouseUpEventHandler = (sender, e) => { btnChooseIcon.MouseUpEventHandler = (sender, e) => { btnChooseIcon.IsSelected = !btnChooseIcon.IsSelected; if (btnChooseIcon.IsSelected) { @@ -359,7 +360,8 @@ dialog.Show(); btnOpen.MouseUpEventHandler = (sender, e) => { btnOpen.MouseUpEventHandler = (sender, e) => { btnState.Text = btnOpen.Text; output.status = new List<SecurityOutputStatus>() {
