From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期三, 22 六月 2022 11:22:18 +0800 Subject: [PATCH] 修改引用路径 --- ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json | 374 ++++++++++++++++++++++------------------- ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll | 0 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs | 4 ZigbeeApp/GateWay.sln | 70 ++++--- ZigbeeApp/Home.Ios/Home.IOS.csproj | 9 ZigbeeApp/Home.Ios/LaunchScreen.storyboard | 26 +- ZigbeeApp/Home.Ios/Info.plist | 2 7 files changed, 264 insertions(+), 221 deletions(-) diff --git a/ZigbeeApp/GateWay.sln b/ZigbeeApp/GateWay.sln index 5032ec6..56ef649 100644 --- a/ZigbeeApp/GateWay.sln +++ b/ZigbeeApp/GateWay.sln @@ -6,15 +6,17 @@ EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "Shared\Shared.shproj", "{D83486B1-9BE8-4728-A314-3C0B849E1AAB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndriodBluetooth", "AndriodBluetooth\AndriodBluetooth.csproj", "{930FE62C-60E3-4AB6-8645-CAD9E33ADC45}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{85F1AF50-75A6-4011-B811-56B32DA77568}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GateWay.Droid", "GateWay.Droid\GateWay.Droid.csproj", "{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Home.IOS", "Home.Ios\Home.IOS.csproj", "{F1296E2C-3777-4385-85B2-DA77617E3178}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EzvizLib.ios", "..\..\..\HDLDemo\鍏ㄨ閫歕EzvizLib.ios\EzvizLib.ios.csproj", "{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.IOS.HDLFVSDK", "..\..\..\HDLDemo\鍏ㄨ閫歕FVSDK-xamarin\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK.csproj", "{56776799-6E94-4016-B369-068B96C6ACDE}" +EndProject +Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "AndriodBluetooth", "AndriodBluetooth\AndriodBluetooth.csproj", "{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}" +EndProject +Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{910EE201-816C-442E-8E4D-E613999AEFA1}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -42,30 +44,6 @@ {47EFF987-3192-4A56-A463-A940F245FF7D}.Release|iPhone.Build.0 = Release|Any CPU {47EFF987-3192-4A56-A463-A940F245FF7D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {47EFF987-3192-4A56-A463-A940F245FF7D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|iPhone.Build.0 = Debug|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|Any CPU.Build.0 = Release|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|iPhone.ActiveCfg = Release|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|iPhone.Build.0 = Release|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|Any CPU.Build.0 = Debug|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhone.Build.0 = Debug|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|Any CPU.ActiveCfg = Release|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|Any CPU.Build.0 = Release|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhone.ActiveCfg = Release|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhone.Build.0 = Release|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|Any CPU.Build.0 = Debug|Any CPU {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|iPhone.ActiveCfg = Debug|Any CPU @@ -102,6 +80,42 @@ {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhone.Build.0 = Release|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhone.Build.0 = Debug|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Release|Any CPU.Build.0 = Release|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhone.ActiveCfg = Release|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhone.Build.0 = Release|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|iPhone.Build.0 = Debug|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|Any CPU.Build.0 = Release|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|iPhone.ActiveCfg = Release|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|iPhone.Build.0 = Release|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|iPhone.Build.0 = Debug|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Release|Any CPU.Build.0 = Release|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Release|iPhone.ActiveCfg = Release|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Release|iPhone.Build.0 = Release|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {910EE201-816C-442E-8E4D-E613999AEFA1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json index 09ece6d..dba5cef 100644 --- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,258 +1,286 @@ { - "images": [ + "images" : [ { - "filename": "40_40.png", - "size": "20x20", - "scale": "2x", - "idiom": "iphone" + "filename" : "40_40.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" }, { - "filename": "60_60.png", - "size": "20x20", - "scale": "3x", - "idiom": "iphone" + "filename" : "60_60.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" }, { - "filename": "58_58.png", - "size": "29x29", - "scale": "2x", - "idiom": "iphone" + "filename" : "58_58.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" }, { - "filename": "87_87.png", - "size": "29x29", - "scale": "3x", - "idiom": "iphone" + "filename" : "87_87.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" }, { - "filename": "80_80.png", - "size": "40x40", - "scale": "2x", - "idiom": "iphone" + "filename" : "80_80.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" }, { - "filename": "120_120.png", - "size": "40x40", - "scale": "3x", - "idiom": "iphone" + "filename" : "120_120.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" }, { - "filename": "120_120-1.png", - "size": "60x60", - "scale": "2x", - "idiom": "iphone" + "filename" : "120_120-1.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" }, { - "filename": "180_180.png", - "size": "60x60", - "scale": "3x", - "idiom": "iphone" + "filename" : "180_180.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" }, { - "filename": "20_20.png", - "size": "20x20", - "scale": "1x", - "idiom": "ipad" + "filename" : "20_20.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" }, { - "filename": "40_40-1.png", - "size": "20x20", - "scale": "2x", - "idiom": "ipad" + "filename" : "40_40-1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" }, { - "filename": "29_29.png", - "size": "29x29", - "scale": "1x", - "idiom": "ipad" + "filename" : "29_29.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" }, { - "filename": "58_58-1.png", - "size": "29x29", - "scale": "2x", - "idiom": "ipad" + "filename" : "58_58-1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" }, { - "filename": "40_40-2.png", - "size": "40x40", - "scale": "1x", - "idiom": "ipad" + "filename" : "40_40-2.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" }, { - "filename": "80_80-1.png", - "size": "40x40", - "scale": "2x", - "idiom": "ipad" + "filename" : "80_80-1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" }, { - "filename": "167_167.png", - "size": "83.5x83.5", - "scale": "2x", - "idiom": "ipad" + "filename" : "76_76.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" }, { - "filename": "76_76.png", - "size": "76x76", - "scale": "1x", - "idiom": "ipad" + "filename" : "152_152.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" }, { - "filename": "152_152.png", - "size": "76x76", - "scale": "2x", - "idiom": "ipad" + "filename" : "167_167.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" }, { - "filename": "1024_1024.png", - "size": "1024x1024", - "scale": "1x", - "idiom": "ios-marketing" + "filename" : "1024_1024.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" }, { - "filename": "120_120-2.png", - "size": "60x60", - "scale": "2x", - "idiom": "car" + "filename" : "120_120-2.png", + "idiom" : "car", + "scale" : "2x", + "size" : "60x60" }, { - "filename": "180_180-1.png", - "size": "60x60", - "scale": "3x", - "idiom": "car" + "filename" : "180_180-1.png", + "idiom" : "car", + "scale" : "3x", + "size" : "60x60" }, { - "role": "notificationCenter", - "size": "24x24", - "subtype": "38mm", - "scale": "2x", - "idiom": "watch" + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "24x24", + "subtype" : "38mm" }, { - "role": "notificationCenter", - "size": "27.5x27.5", - "subtype": "42mm", - "scale": "2x", - "idiom": "watch" + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "27.5x27.5", + "subtype" : "42mm" }, { - "role": "companionSettings", - "filename": "58_58-2.png", - "size": "29x29", - "scale": "2x", - "idiom": "watch" + "filename" : "58_58-2.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "2x", + "size" : "29x29" }, { - "role": "companionSettings", - "filename": "87_87-1.png", - "size": "29x29", - "scale": "3x", - "idiom": "watch" + "filename" : "87_87-1.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "3x", + "size" : "29x29" }, { - "role": "appLauncher", - "filename": "80_80-2.png", - "size": "40x40", - "subtype": "38mm", - "scale": "2x", - "idiom": "watch" + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "33x33", + "subtype" : "45mm" }, { - "role": "appLauncher", - "size": "44x44", - "subtype": "40mm", - "scale": "2x", - "idiom": "watch" + "filename" : "80_80-2.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "40x40", + "subtype" : "38mm" }, { - "role": "appLauncher", - "size": "50x50", - "subtype": "44mm", - "scale": "2x", - "idiom": "watch" + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "44x44", + "subtype" : "40mm" }, { - "role": "quickLook", - "size": "86x86", - "subtype": "38mm", - "scale": "2x", - "idiom": "watch" + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "46x46", + "subtype" : "41mm" }, { - "role": "quickLook", - "size": "98x98", - "subtype": "42mm", - "scale": "2x", - "idiom": "watch" + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "50x50", + "subtype" : "44mm" }, { - "role": "quickLook", - "size": "108x108", - "subtype": "44mm", - "scale": "2x", - "idiom": "watch" + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "51x51", + "subtype" : "45mm" }, { - "filename": "1024_1024-1.png", - "size": "1024x1024", - "scale": "1x", - "idiom": "watch-marketing" + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "86x86", + "subtype" : "38mm" }, { - "size": "16x16", - "scale": "1x", - "idiom": "mac" + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "98x98", + "subtype" : "42mm" }, { - "size": "16x16", - "scale": "2x", - "idiom": "mac" + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "108x108", + "subtype" : "44mm" }, { - "size": "32x32", - "scale": "1x", - "idiom": "mac" + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "117x117", + "subtype" : "45mm" }, { - "size": "32x32", - "scale": "2x", - "idiom": "mac" + "filename" : "1024_1024-1.png", + "idiom" : "watch-marketing", + "scale" : "1x", + "size" : "1024x1024" }, { - "size": "128x128", - "scale": "1x", - "idiom": "mac" + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" }, { - "size": "128x128", - "scale": "2x", - "idiom": "mac" + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" }, { - "size": "256x256", - "scale": "1x", - "idiom": "mac" + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" }, { - "filename": "512_512.png", - "size": "256x256", - "scale": "2x", - "idiom": "mac" + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" }, { - "filename": "512_512-1.png", - "size": "512x512", - "scale": "1x", - "idiom": "mac" + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" }, { - "filename": "1024_1024-2.png", - "size": "512x512", - "scale": "2x", - "idiom": "mac" + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "512_512.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "512_512-1.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "1024_1024-2.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" } ], - "info": { - "version": 1, - "author": "xcode" + "info" : { + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj index f749f27..5951681 100644 --- a/ZigbeeApp/Home.Ios/Home.IOS.csproj +++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj @@ -100,6 +100,9 @@ <Reference Include="Shared.IOS"> <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath> </Reference> + <Reference Include="Elian.iOS"> + <HintPath>..\Shared\DLL\Elian.iOS.dll</HintPath> + </Reference> <Reference Include="Shared.IOS.HDLFVSDK"> <HintPath>..\Shared\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath> </Reference> @@ -152,12 +155,6 @@ <Compile Include="Reachability.cs" /> <Compile Include="ZXingOverlayView.cs" /> <Compile Include="ESVideo.cs" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj"> - <Project>{85F1AF50-75A6-4011-B811-56B32DA77568}</Project> - <Name>Elian.iOS</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" /> diff --git a/ZigbeeApp/Home.Ios/Info.plist b/ZigbeeApp/Home.Ios/Info.plist index b8a50e0..e23d73e 100755 --- a/ZigbeeApp/Home.Ios/Info.plist +++ b/ZigbeeApp/Home.Ios/Info.plist @@ -56,7 +56,7 @@ <key>CFBundleShortVersionString</key> <string>1.2.1</string> <key>CFBundleVersion</key> - <string>2020123101</string> + <string>2022042704</string> <key>CFBundleURLTypes</key> <array> <dict> diff --git a/ZigbeeApp/Home.Ios/LaunchScreen.storyboard b/ZigbeeApp/Home.Ios/LaunchScreen.storyboard index f18534b..b9628d7 100755 --- a/ZigbeeApp/Home.Ios/LaunchScreen.storyboard +++ b/ZigbeeApp/Home.Ios/LaunchScreen.storyboard @@ -1,8 +1,10 @@ -锘�<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM"> + <device id="retina6_1" orientation="portrait" appearance="light"/> <dependencies> - <deployment identifier="iOS" /> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530" /> + <deployment identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <scenes> <!--View Controller--> @@ -10,18 +12,18 @@ <objects> <viewController id="01J-lp-oVM" sceneMemberID="viewController"> <layoutGuides> - <viewControllerLayoutGuide type="top" id="Llm-lL-Icb" /> - <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok" /> + <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/> + <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/> </layoutGuides> <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3"> - <rect key="frame" x="0.0" y="0.0" width="600" height="600" /> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" /> - <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" /> + <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </view> </viewController> - <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder" /> + <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="53" y="375" /> + <point key="canvasLocation" x="53" y="375"/> </scene> </scenes> -</document> \ No newline at end of file +</document> diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll index 4aabfe1..dd7f728 100644 --- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll +++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll Binary files differ diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs index 9d6f45a..cde9b36 100644 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs @@ -537,7 +537,9 @@ public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "") { //鍒濆鍖朩i-Fi杩炴帴 - Com.Mediatek.Elian.ElianNative.InitSmartConnection("1", 1, 1); + //Com.Mediatek.Elian.ElianNative.InitSmartConnection("1", 1, 1); + Com.Mediatek.Elian.ElianNative.InitSmartConnection( 1, 1); + //寮�濮媁i-Fi杩炴帴 var result = Com.Mediatek.Elian.ElianNative.StartSmartConnection(wifiName, wifiPsw, p2); return true; -- Gitblit v1.8.0