HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -55,7 +55,7 @@ <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchEnableSGenConc>false</MtouchEnableSGenConc> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <CodesignProvision>On+Dev-20210510-1</CodesignProvision> <CodesignProvision>On+Dev-20210428-1</CodesignProvision> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <DebugType>none</DebugType> @@ -934,7 +934,6 @@ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\ComfortableModeSelect.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud4.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\MuteSelect.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\Battery.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ControlRight.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AreaMode.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AutoMode.png" /> @@ -1239,6 +1238,32 @@ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\SmartSpeaker.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" /> <BundleResource Include="Resources\Phone\Public\BatteryEnough.png" /> <BundleResource Include="Resources\Phone\Public\BatteryNot.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> HDL-ON_iOS/Resources/Language.ini
@@ -74,7 +74,7 @@ 73=Floor Management 74=Room Management 75=Administrator migration 76=Privilege Migration 76=Administrator privilege migration 77=Debugging privilege 78=The administrator is migrated to other user. 79=All of the data for the residence is migrated to new user. @@ -441,7 +441,6 @@ 454=Deployment information 455=The name can not be blank. 1000=Room Humidity 1001=V-chip 1002=Anion @@ -530,6 +529,63 @@ 1084=1st Gear 1085=2nd Gear 1086=3rd Gear 1087=Unlock 1088=Temp. Password 1089=Connected 1090=Disconnected 1091=Generate 1092=Effective time 1093=Expire time 1094=Select time 1095=Select Date 1096=Generate 1097=Temporary password has been copied 1098=Clear Password? 1099=The expire time must be later than the effective time 1100=Unlock Method 1101=It'll synchronize with actual lock, confirm to delete? 1102=Delete 1103=Remark 1104=The remark can not be blank. 1105=Assign to 1106=Target Scene Not Exist 1107=Select Scene 1108=Unlock 1109=Always On 1110=Setting 1111=Automation 1112=Turn on "Always On" Mode 1113=Turn off "Always On" Mode 1114=Edit 1115=Always On will be off at {0} 1116=Condition 1117=Motion 1118=Always On 1119=Lock 1120=User 1121=Unlock Method 1122=Fingerprint 1123=Card 1124=Key 1125=Information 1126=Unlock 1127=Alarm 1128=Offline 1129=For first user, Please bind lock password 1130=Please enter admin password 1131=Bind Successfully 1132=Skip to personal password for unlock 1133=Skip 1134=Please draw your pattern 1135=Lock will be always on after setting, confirm to proceed 1136=Confirm 1137=Expire 1138=Always On will expire after {0} hours 1139=Please enter expire time 1140=Expire time should not be more than 72 hours 1141=Expire time should not be less than 1 hour 1142=Fail to set, please try again 5000=Music 5001=Group @@ -1326,7 +1382,69 @@ 1084=风速1档 1085=风速2档 1086=风速3档 1087=一键开锁 1087=Unlock 1088=临时密码开锁 1088=Temp. Password 1089=已连接 1089=Connected 1090=未连接 1090=Disconnected 1091=生成临时密码 1091=Generate 1092=生效时间 1092=Effective time 1093=失效时间 1093= 1094=选择时间 1095=选择日期 1096=Generate 1097=临时密码已经复制 1098=清除当前临时密码？ 1099=生效时间必须大于失效时间 1100=开锁方式管理 1101=删除操作将被同步于实体锁上{0}是否还需要删除？ 1102=确认删除 1103=修改备注名称 1104=备注名称不能为空 1105=分配至 1106=检测不到可供选择的场景 1107=选择场景 1108=锁已打开 1109=常开 1110=时效性常开设置 1111=常开自动化 1112=打开常开模式 1113=关闭常开模式 1114=编辑 1115=常开模式将于{0}关闭 1116=条件 1117=动作 1118=常开模式 1119=锁 1120=用户 1121=开锁方式 1122=指纹 1123=卡 1124=钥匙 1125=信息类型 1126=开锁信息 1127=报警类信息 1128=设备不在线 1129=第一次使用，请先绑定门锁密码 1130=请输入门锁管理员密码 1131=门锁绑定成功 1132=为了安全，请跳转至个人中心{0}设置个人密码，并应用于门锁开锁 1133=跳转 1134=请绘制图案 1135=设置常开模式后{0}您的门锁将处于打开状态{0}是否继续开启 1136=确认开启 1137=失效设置 1138=常开模式将于{0}小时后失效 1139=请输入失效时间 1140=失效时间不能大于72小时 1141=失效时间不能小于1小时 1142=常开模式关闭设置失效，请重试 4000=可视对讲 4001=通话记录 HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/BindScene.png
@@ -313,7 +313,7 @@ topFrameLayout.AddChidren(btnSetting); //如果是成员没有功能 if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true) if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true) { btnSetting.Visible = false; } HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -342,18 +342,6 @@ == false ? StringId.Administrators : StringId.Member }; userTypeView.AddChidren(btnUserTypeName); btnUserTypeName.MouseUpEventHandler += (sender, e) => { var form = new DoorLockListPage(); var listDevice = new System.Collections.Generic.List<Function>(); listDevice.Add(new Function { name = "测试设备1", sid = "1111", spk = "door.sone" }); listDevice.Add(new Function { name = "测试设备2", sid = "2222", spk = "door.sone" }); listDevice.Add(new Function { name = "测试设备3", sid = "3333", spk = "door.sone" }); listDevice.Add(new Function { name = "测试设备4", sid = "4444", spk = "door.sone" }); listDevice.Add(new Function { name = "测试设备5", sid = "5555", spk = "door.sone" }); listDevice.Add(new Function { name = "测试设备6", sid = "6666", spk = "door.sone" }); form.AddForm(listDevice); }; #endregion #region 住宅管理
@@ -24,7 +24,6 @@ Action backAction; public AppUnlockGesturePage(string pw, Action action) { MainPage.BasePageView.ScrollEnabled = false; bodyView = this; bodyView.Tag = "unlockpage"; oldPasswrod = pw; HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs
@@ -313,13 +313,14 @@ { var form = new UI2.Intelligence.Automation.InputPushText(); MainPage.BasePageView.AddChidren(form); form.Show(this.automationInfo.PushSettion); //form.Show(this.automationInfo.PushSettion); form.Show(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; form.action += (pushInfo) => { //赋值 this.automationInfo.PushSettion = pushInfo; }; //form.action += (pushInfo) => //{ // //赋值 // this.automationInfo.PushSettion = pushInfo; //}; }; }
@@ -121,7 +121,7 @@ if (this.listMember != null) { return true; } //主账号需要去获取成员列表,而子账号只能他自己 if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false) if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false) { //获取成员列表 var responePack = new DAL.Server.HttpServerRequest().GetResidenceMemberAccount(); @@ -146,7 +146,7 @@ //自身加进去,自己位于首位 var info = new ResidenceMemberInfo(); info.childAccountId = OnAppConfig.Instance.LastLoginUserId; info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false ? "ADMIN" : "ORDINARY"; info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false ? "ADMIN" : "ORDINARY"; info.nickName = UserInfo.Current.userName; this.listMember.Insert(0, info); if (string.IsNullOrEmpty(info.nickName)) HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
@@ -226,7 +226,7 @@ private void InitUnLockMenuControl() { //如果是成员,则只有一键开锁 if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true) if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true) { //一键开锁 var btnOneKey = new NormalViewControl(100, 25, true); @@ -444,7 +444,7 @@ private void InitBottomMenuIconControl() { //如果是成员,则只有开锁方式管理 if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true) if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true) { //开锁方式管理图标 var btnManagerIcon = new IconViewControl(40); @@ -849,7 +849,7 @@ if (this.listMember != null) { return true; } //主账号需要去获取成员列表,而子账号只能他自己 if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false) if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false) { //获取成员列表 var responePack = new DAL.Server.HttpServerRequest().GetResidenceMemberAccount(); @@ -874,7 +874,7 @@ //自身加进去,自己位于首位 var info = new ResidenceMemberInfo(); info.childAccountId = OnAppConfig.Instance.LastLoginUserId; info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false ? "ADMIN" : "ORDINARY"; info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false ? "ADMIN" : "ORDINARY"; info.nickName = UserInfo.Current.userName; this.listMember.Insert(0, info); if (string.IsNullOrEmpty(info.nickName))
