From a95a9bbff540ff62654797e071b52870525cf6a0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 17:55:03 +0800
Subject: [PATCH] 卡死修复
---
HDL-ON_iOS/Info.plist | 12
HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json | 350 +++++++++-------
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL-ON_iOS/LaunchScreen.storyboard | 12
ys/Jars/hdl_ezvizsdk.aar | 0
HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json | 770 ++++++++++++++++++++----------------
HDL_ON/UI/MainPage.cs | 18
HDL-ON_iOS/Resources/LaunchScreen.xib | 65 +-
SiriIntents/Server/HttpUtil.cs | 4
9 files changed, 684 insertions(+), 551 deletions(-)
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
index 1502cbc..7a43594 100644
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,246 +1,274 @@
{
- "images": [
+ "images" : [
{
- "filename": "40x40.png",
- "size": "20x20",
- "scale": "2x",
- "idiom": "iphone"
+ "filename" : "40x40.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "20x20"
},
{
- "filename": "60x60.png",
- "size": "20x20",
- "scale": "3x",
- "idiom": "iphone"
+ "filename" : "60x60.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "20x20"
},
{
- "filename": "58x58.png",
- "size": "29x29",
- "scale": "2x",
- "idiom": "iphone"
+ "filename" : "58x58.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "29x29"
},
{
- "filename": "87x87.png",
- "size": "29x29",
- "scale": "3x",
- "idiom": "iphone"
+ "filename" : "87x87.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "29x29"
},
{
- "filename": "80x80.png",
- "size": "40x40",
- "scale": "2x",
- "idiom": "iphone"
+ "filename" : "80x80.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "40x40"
},
{
- "filename": "120x120.png",
- "size": "40x40",
- "scale": "3x",
- "idiom": "iphone"
+ "filename" : "120x120.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "40x40"
},
{
- "filename": "120x120-1.png",
- "size": "60x60",
- "scale": "2x",
- "idiom": "iphone"
+ "filename" : "120x120-1.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "60x60"
},
{
- "filename": "180.png",
- "size": "60x60",
- "scale": "3x",
- "idiom": "iphone"
+ "filename" : "180.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "60x60"
},
{
- "filename": "20x20.png",
- "size": "20x20",
- "scale": "1x",
- "idiom": "ipad"
+ "filename" : "20x20.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "20x20"
},
{
- "filename": "40x40-1.png",
- "size": "20x20",
- "scale": "2x",
- "idiom": "ipad"
+ "filename" : "40x40-1.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "20x20"
},
{
- "filename": "29x29.png",
- "size": "29x29",
- "scale": "1x",
- "idiom": "ipad"
+ "filename" : "29x29.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "29x29"
},
{
- "filename": "58x58-1.png",
- "size": "29x29",
- "scale": "2x",
- "idiom": "ipad"
+ "filename" : "58x58-1.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "29x29"
},
{
- "filename": "40x40-2.png",
- "size": "40x40",
- "scale": "1x",
- "idiom": "ipad"
+ "filename" : "40x40-2.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "40x40"
},
{
- "filename": "80x80-1.png",
- "size": "40x40",
- "scale": "2x",
- "idiom": "ipad"
+ "filename" : "80x80-1.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "40x40"
},
{
- "size": "83.5x83.5",
- "scale": "2x",
- "idiom": "ipad"
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "76x76"
},
{
- "size": "76x76",
- "scale": "1x",
- "idiom": "ipad"
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "76x76"
},
{
- "size": "76x76",
- "scale": "2x",
- "idiom": "ipad"
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "83.5x83.5"
},
{
- "filename": "1024.png",
- "size": "1024x1024",
- "scale": "1x",
- "idiom": "ios-marketing"
+ "filename" : "1024.png",
+ "idiom" : "ios-marketing",
+ "scale" : "1x",
+ "size" : "1024x1024"
},
{
- "size": "60x60",
- "scale": "2x",
- "idiom": "car"
+ "idiom" : "car",
+ "scale" : "2x",
+ "size" : "60x60"
},
{
- "size": "60x60",
- "scale": "3x",
- "idiom": "car"
+ "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",
- "size": "29x29",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "companionSettings",
+ "scale" : "2x",
+ "size" : "29x29"
},
{
- "role": "companionSettings",
- "size": "29x29",
- "scale": "3x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "companionSettings",
+ "scale" : "3x",
+ "size" : "29x29"
},
{
- "role": "appLauncher",
- "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"
+ "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"
},
{
- "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"
+ "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"
},
{
- "size": "256x256",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "32x32"
},
{
- "size": "512x512",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "128x128"
},
{
- "size": "512x512",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "128x128"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "256x256"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "256x256"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "512x512"
+ },
+ {
+ "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/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json b/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json
index 8254cff..15497d0 100644
--- a/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json
@@ -1,528 +1,608 @@
{
- "images": [
+ "images" : [
{
- "idiom": "universal"
+ "idiom" : "universal"
},
{
- "scale": "1x",
- "idiom": "universal"
- },
- {
- "filename": "device_bg.png",
- "scale": "2x",
- "idiom": "universal"
- },
- {
- "scale": "3x",
- "idiom": "universal"
- },
- {
- "idiom": "iphone"
- },
- {
- "scale": "1x",
- "idiom": "iphone"
- },
- {
- "scale": "2x",
- "idiom": "iphone"
- },
- {
- "subtype": "retina4",
- "scale": "2x",
- "idiom": "iphone"
- },
- {
- "scale": "3x",
- "idiom": "iphone"
- },
- {
- "idiom": "ipad"
- },
- {
- "scale": "1x",
- "idiom": "ipad"
- },
- {
- "scale": "2x",
- "idiom": "ipad"
- },
- {
- "idiom": "watch"
- },
- {
- "scale": "2x",
- "idiom": "watch"
- },
- {
- "screenWidth": "{130,145}",
- "scale": "2x",
- "idiom": "watch"
- },
- {
- "screenWidth": "{146,165}",
- "scale": "2x",
- "idiom": "watch"
- },
- {
- "idiom": "mac"
- },
- {
- "scale": "1x",
- "idiom": "mac"
- },
- {
- "scale": "2x",
- "idiom": "mac"
- },
- {
- "idiom": "car"
- },
- {
- "scale": "2x",
- "idiom": "car"
- },
- {
- "scale": "3x",
- "idiom": "car"
- },
- {
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "idiom": "universal"
+ "idiom" : "universal"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "1x",
- "idiom": "universal"
+ "idiom" : "universal"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "2x",
- "idiom": "universal"
+ "idiom" : "universal",
+ "scale" : "1x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "3x",
- "idiom": "universal"
+ "idiom" : "universal",
+ "scale" : "1x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "iphone"
+ "idiom" : "universal",
+ "scale" : "1x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "1x",
- "idiom": "iphone"
+ "filename" : "device_bg.png",
+ "idiom" : "universal",
+ "scale" : "2x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "iphone"
+ "idiom" : "universal",
+ "scale" : "2x"
},
{
- "subtype": "retina4",
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "2x",
- "idiom": "iphone"
+ "idiom" : "universal",
+ "scale" : "2x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "3x",
- "idiom": "iphone"
+ "idiom" : "universal",
+ "scale" : "3x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "idiom": "ipad"
+ "idiom" : "universal",
+ "scale" : "3x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "1x",
- "idiom": "ipad"
+ "idiom" : "universal",
+ "scale" : "3x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "2x",
- "idiom": "ipad"
+ "idiom" : "iphone"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "idiom": "watch"
+ "idiom" : "iphone"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "iphone"
},
{
- "screenWidth": "{130,145}",
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "iphone",
+ "scale" : "1x"
},
{
- "screenWidth": "{146,165}",
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "iphone",
+ "scale" : "1x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "mac"
+ "idiom" : "iphone",
+ "scale" : "1x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "iphone",
+ "scale" : "2x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "iphone",
+ "scale" : "2x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "car"
+ "idiom" : "iphone",
+ "scale" : "2x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "2x",
- "idiom": "car"
+ "idiom" : "iphone",
+ "scale" : "3x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "3x",
- "idiom": "car"
+ "idiom" : "iphone",
+ "scale" : "3x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "universal"
+ "idiom" : "iphone",
+ "scale" : "3x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "scale": "1x",
- "idiom": "universal"
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "universal"
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "3x",
- "idiom": "universal"
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "subtype" : "retina4"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "idiom": "iphone"
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "1x",
- "idiom": "iphone"
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "2x",
- "idiom": "iphone"
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "subtype" : "retina4"
},
{
- "subtype": "retina4",
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "scale": "2x",
- "idiom": "iphone"
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "3x",
- "idiom": "iphone"
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "ipad"
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "subtype" : "retina4"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "scale": "1x",
- "idiom": "ipad"
+ "idiom" : "ipad"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "ipad"
+ "idiom" : "ipad"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "watch"
+ "idiom" : "ipad"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "ipad",
+ "scale" : "1x"
},
{
- "screenWidth": "{130,145}",
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "ipad",
+ "scale" : "1x"
},
{
- "screenWidth": "{146,165}",
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "ipad",
+ "scale" : "1x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "idiom": "mac"
+ "idiom" : "ipad",
+ "scale" : "2x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "ipad",
+ "scale" : "2x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "ipad",
+ "scale" : "2x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "idiom": "car"
+ "idiom" : "car"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "car"
+ "idiom" : "car"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "3x",
- "idiom": "car"
+ "idiom" : "car"
+ },
+ {
+ "idiom" : "car",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "car",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "watch"
+ },
+ {
+ "idiom" : "watch",
+ "screen-width" : "<=145"
+ },
+ {
+ "idiom" : "watch",
+ "screen-width" : ">161"
+ },
+ {
+ "idiom" : "watch",
+ "screen-width" : ">145"
+ },
+ {
+ "idiom" : "watch",
+ "screen-width" : ">183"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : "<=145"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">161"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">145"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">183"
+ },
+ {
+ "idiom" : "mac"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "mac"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "mac"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "mac",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "mac",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "mac",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "mac",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "watch"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "watch"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : "<=145"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : "<=145"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">145"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">145"
}
],
- "info": {
- "version": 1,
- "author": "xcode"
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
}
-}
\ No newline at end of file
+}
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 511589d..cae58df 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -42,7 +42,7 @@
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
- <string>12.2</string>
+ <string>12.0</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
@@ -89,8 +89,6 @@
</dict>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
- <key>XSLaunchImageAssets</key>
- <string>Assets.xcassets/LaunchImage.launchimage</string>
<key>CFBundleName</key>
<string>On Pro</string>
<key>XSAppIconAssets</key>
@@ -100,9 +98,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.6.602303301</string>
+ <string>1.7</string>
<key>CFBundleVersion</key>
- <string>1.6.603301</string>
+ <string>1.7</string>
<key>NSAppleMusicUsageDescription</key>
<string>App needs to access your music library to connect to an external player to play music.</string>
<key>NSLocationAlwaysUsageDescription</key>
@@ -145,6 +143,8 @@
<key>NSLocationWhenInUseUsageDescription</key>
<string>EZ video will be use</string>
<key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
+ <string>Main</string>
+ <key>XSLaunchImageAssets</key>
+ <string>Assets.xcassets/LaunchImage.launchimage</string>
</dict>
</plist>
diff --git a/HDL-ON_iOS/LaunchScreen.storyboard b/HDL-ON_iOS/LaunchScreen.storyboard
index c0e5c52..888a9ea 100644
--- a/HDL-ON_iOS/LaunchScreen.storyboard
+++ b/HDL-ON_iOS/LaunchScreen.storyboard
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<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="15404"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -18,12 +18,18 @@
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gAz-Vf-lRO">
+ <rect key="frame" x="111" y="366" width="176" height="139"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ </imageView>
+ </subviews>
<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"/>
</objects>
- <point key="canvasLocation" x="53" y="375"/>
+ <point key="canvasLocation" x="52.173913043478265" y="375"/>
</scene>
</scenes>
</document>
diff --git a/HDL-ON_iOS/Resources/LaunchScreen.xib b/HDL-ON_iOS/Resources/LaunchScreen.xib
index 9131928..c3ef5db 100644
--- a/HDL-ON_iOS/Resources/LaunchScreen.xib
+++ b/HDL-ON_iOS/Resources/LaunchScreen.xib
@@ -1,43 +1,48 @@
-锘�<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+ <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207" />
- <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1" />
+ <deployment identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
- <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" />
- <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder" />
+ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
- <rect key="frame" x="0.0" y="0.0" width="480" height="480" />
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
+ <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2017 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
- minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
- <rect key="frame" x="20" y="439" width="441" height="21" />
- <fontDescription key="fontDescription" type="system" pointSize="17" />
- <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
- <nil key="highlightedColor" />
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text=" Copyright (c) 2017 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+ <rect key="frame" x="20" y="439" width="441" height="21"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" systemColor="darkTextColor"/>
+ <nil key="highlightedColor"/>
</label>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HDL_ON_iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
- minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
- <rect key="frame" x="20" y="140" width="441" height="43" />
- <fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
- <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
- <nil key="highlightedColor" />
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="HDL_ON_iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+ <rect key="frame" x="20" y="140" width="441" height="43"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+ <color key="textColor" systemColor="darkTextColor"/>
+ <nil key="highlightedColor"/>
</label>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
- <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC" />
- <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk" />
- <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l" />
- <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0" />
- <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9" />
- <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g" />
+ <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
+ <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
+ <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
+ <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
+ <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
+ <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
</constraints>
- <nil key="simulatedStatusBarMetrics" />
- <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics" />
- <point key="canvasLocation" x="548" y="455" />
+ <nil key="simulatedStatusBarMetrics"/>
+ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+ <point key="canvasLocation" x="548" y="455"/>
</view>
</objects>
+ <resources>
+ <systemColor name="darkTextColor">
+ <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </systemColor>
+ </resources>
</document>
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 211486b..62b4b3f 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index aaaf1c7..f7c57bd 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -211,7 +211,14 @@
/// </summary>
public static void GoLoginPage(UserInfo userInfo = null)
{
- BaseView.RemoveAll();
+ try
+ {
+ for (int i = 0; i < BaseView.ChildrenCount; i++)
+ {
+ BaseView.GetChildren(i).RemoveFromParent();
+ }
+ }
+ catch { }
BaseView.BackgroundColor = CSS_Color.BackgroundColor;
var fisrtView = new UI.UI1Login.LoginPage();
fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -226,7 +233,14 @@
/// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
public static void GoUserPage(bool downloadData, bool isFirstOpen = false, Action pageShowEvent = null)
{
- BaseView.RemoveAll();
+ try
+ {
+ for (int i = 0; i < BaseView.ChildrenCount; i++)
+ {
+ BaseView.GetChildren(i).RemoveFromParent();
+ }
+ }
+ catch { }
#region 鍚庨��浜嬩欢
BasePageView = new PageLayout();
BasePageView.ScrollEnabled = false;
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 8d4483c..dc7aca0 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
diff --git a/ys/Jars/hdl_ezvizsdk.aar b/ys/Jars/hdl_ezvizsdk.aar
index 1c6af32..4bf94e5 100644
--- a/ys/Jars/hdl_ezvizsdk.aar
+++ b/ys/Jars/hdl_ezvizsdk.aar
Binary files differ
--
Gitblit v1.8.0