From e13ff34658898c9f506681aa75244fead1fb2153 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 06 六月 2021 14:17:10 +0800
Subject: [PATCH] 2021-6-6-2
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 4 ++--
.vs/HDL_APP_Project/xs/UserPrefs.xml | 22 +++-------------------
3 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 85dc0b7..d037419 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,45 +1,29 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="266" Column="24" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="22" Column="105" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" Line="387" Column="36" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1142" Column="22" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="986" Column="72" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" Line="201" Column="65" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- </Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
<Node name="3-Intelligence" expanded="True">
<Node name="Automation" expanded="True">
- <Node name="LogicMethod.cs" selected="True" />
+ <Node name="ConditionDeviceFunList.cs" selected="True" />
</Node>
</Node>
<Node name="4-PersonalCenter" expanded="True">
<Node name="PirDevice" expanded="True" />
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Video" expanded="True" />
</Node>
</Node>
</Node>
</Node>
<Node name="HDL-ON_Android" expanded="True">
<Node name="Assets" expanded="True" />
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 81d934a..ca58945 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202105255" android:versionName="1.2.202105255" package="com.hdl.onpro">
- <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
+ <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
<!-- 鍙瀵硅鏉冮檺-->
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" />
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index b1dd561..5e24b64 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -178,11 +178,11 @@
case SPK.SenesorMegahealth:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
- view.btnText.TextID = StringId.kaiqiandbihe;//鐩爣鐘舵��
+ view.btnText.TextID = StringId.mubiaozhuangtai ;//鐩爣鐘舵��
fLayout.AddChidren(view.FLayoutView());
view.btnClick.MouseUpEventHandler += (sender, e) =>
{
- DeviceView(device, view.btnState, StringId.kaiqi, StringId.bihe);
+ DeviceView(device, view.btnState, StringId.wuren, StringId.diedao);
};
if (edit)
{
--
Gitblit v1.8.0