From a19e58425e44c8a83c3d1b23de292659c38a6b1e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 六月 2023 14:09:20 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json | 364 +++++++++++++++++++++++++++++-----------------------
1 files changed, 203 insertions(+), 161 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..4332296 100644
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,246 +1,288 @@
{
- "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"
+ "idiom" : "car",
+ "scale" : "2x",
+ "size" : "60x60"
},
{
- "size": "60x60",
- "scale": "2x",
- "idiom": "car"
+ "idiom" : "car",
+ "scale" : "3x",
+ "size" : "60x60"
},
{
- "size": "60x60",
- "scale": "3x",
- "idiom": "car"
+ "filename" : "1024.png",
+ "idiom" : "ios-marketing",
+ "scale" : "1x",
+ "size" : "1024x1024"
},
{
- "role": "notificationCenter",
- "size": "24x24",
- "subtype": "38mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "16x16"
},
{
- "role": "notificationCenter",
- "size": "27.5x27.5",
- "subtype": "42mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "16x16"
},
{
- "role": "companionSettings",
- "size": "29x29",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "32x32"
},
{
- "role": "companionSettings",
- "size": "29x29",
- "scale": "3x",
- "idiom": "watch"
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "32x32"
},
{
- "role": "appLauncher",
- "size": "40x40",
- "subtype": "38mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "128x128"
},
{
- "role": "appLauncher",
- "size": "44x44",
- "subtype": "40mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "128x128"
},
{
- "role": "appLauncher",
- "size": "50x50",
- "subtype": "44mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "256x256"
},
{
- "role": "quickLook",
- "size": "86x86",
- "subtype": "38mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "256x256"
},
{
- "role": "quickLook",
- "size": "98x98",
- "subtype": "42mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "512x512"
},
{
- "role": "quickLook",
- "size": "108x108",
- "subtype": "44mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "512x512"
},
{
- "size": "1024x1024",
- "scale": "1x",
- "idiom": "watch-marketing"
+ "idiom" : "watch",
+ "role" : "notificationCenter",
+ "scale" : "2x",
+ "size" : "24x24",
+ "subtype" : "38mm"
},
{
- "size": "16x16",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "notificationCenter",
+ "scale" : "2x",
+ "size" : "27.5x27.5",
+ "subtype" : "42mm"
},
{
- "size": "16x16",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "companionSettings",
+ "scale" : "2x",
+ "size" : "29x29"
},
{
- "size": "32x32",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "companionSettings",
+ "scale" : "3x",
+ "size" : "29x29"
},
{
- "size": "32x32",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "notificationCenter",
+ "scale" : "2x",
+ "size" : "33x33",
+ "subtype" : "45mm"
},
{
- "size": "128x128",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "40x40",
+ "subtype" : "38mm"
},
{
- "size": "128x128",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "44x44",
+ "subtype" : "40mm"
},
{
- "size": "256x256",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "46x46",
+ "subtype" : "41mm"
},
{
- "size": "256x256",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "50x50",
+ "subtype" : "44mm"
},
{
- "size": "512x512",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "51x51",
+ "subtype" : "45mm"
},
{
- "size": "512x512",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "54x54",
+ "subtype" : "49mm"
+ },
+ {
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "86x86",
+ "subtype" : "38mm"
+ },
+ {
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "98x98",
+ "subtype" : "42mm"
+ },
+ {
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "108x108",
+ "subtype" : "44mm"
+ },
+ {
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "117x117",
+ "subtype" : "45mm"
+ },
+ {
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "129x129",
+ "subtype" : "49mm"
+ },
+ {
+ "idiom" : "watch-marketing",
+ "scale" : "1x",
+ "size" : "1024x1024"
}
],
- "info": {
- "version": 1,
- "author": "xcode"
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0