From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码

---
 ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json |  371 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 252 insertions(+), 119 deletions(-)

diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
index 728e6c3..6e65bd0 100755
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,255 @@
 {
-    "images": [
-        {
-            "size": "20x20",
-            "idiom": "iphone",
-            "filename": "icon-20@2x.png",
-            "scale": "2x"
-        },
-        {
-            "size": "20x20",
-            "idiom": "iphone",
-            "filename": "icon-20@3x.png",
-            "scale": "3x"
-        },
-        {
-            "size": "29x29",
-            "idiom": "iphone",
-            "filename": "icon-29.png",
-            "scale": "1x"
-        },
-        {
-            "size": "29x29",
-            "idiom": "iphone",
-            "filename": "icon-29@2x.png",
-            "scale": "2x"
-        },
-        {
-            "size": "29x29",
-            "idiom": "iphone",
-            "filename": "icon-29@3x.png",
-            "scale": "3x"
-        },
-        {
-            "size": "40x40",
-            "idiom": "iphone",
-            "filename": "icon-40@2x.png",
-            "scale": "2x"
-        },
-        {
-            "size": "40x40",
-            "idiom": "iphone",
-            "filename": "icon-40@3x.png",
-            "scale": "3x"
-        },
-        {
-            "size": "60x60",
-            "idiom": "iphone",
-            "filename": "icon-60@2x.png",
-            "scale": "2x"
-        },
-        {
-            "size": "60x60",
-            "idiom": "iphone",
-            "filename": "icon-60@3x.png",
-            "scale": "3x"
-        },
-        {
-            "size": "20x20",
-            "idiom": "ipad",
-            "filename": "icon-20-ipad.png",
-            "scale": "1x"
-        },
-        {
-            "size": "20x20",
-            "idiom": "ipad",
-            "filename": "icon-20@2x-ipad.png",
-            "scale": "2x"
-        },
-        {
-            "size": "29x29",
-            "idiom": "ipad",
-            "filename": "icon-29-ipad.png",
-            "scale": "1x"
-        },
-        {
-            "size": "29x29",
-            "idiom": "ipad",
-            "filename": "icon-29@2x-ipad.png",
-            "scale": "2x"
-        },
-        {
-            "size": "40x40",
-            "idiom": "ipad",
-            "filename": "icon-40.png",
-            "scale": "1x"
-        },
-        {
-            "size": "40x40",
-            "idiom": "ipad",
-            "filename": "icon-40@2x.png",
-            "scale": "2x"
-        },
-        {
-            "size": "76x76",
-            "idiom": "ipad",
-            "filename": "icon-76.png",
-            "scale": "1x"
-        },
-        {
-            "size": "76x76",
-            "idiom": "ipad",
-            "filename": "icon-76@2x.png",
-            "scale": "2x"
-        },
-        {
-            "size": "83.5x83.5",
-            "idiom": "ipad",
-            "filename": "icon-83.5@2x.png",
-            "scale": "2x"
-        },
-        {
-            "size": "1024x1024",
-            "idiom": "ios-marketing",
-            "filename": "icon-1024.png",
-            "scale": "1x"
-        }
-    ],
-    "info": {
-        "version": 1,
-        "author": "icon.wuruihong.com"
+  "images": [
+    {
+      "filename": "40_40-3.png",
+      "size": "20x20",
+      "scale": "2x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "60_60-1.png",
+      "size": "20x20",
+      "scale": "3x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "58_58-2.png",
+      "size": "29x29",
+      "scale": "2x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "87_87-1.png",
+      "size": "29x29",
+      "scale": "3x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "80_80-2.png",
+      "size": "40x40",
+      "scale": "2x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "120_120-2.png",
+      "size": "40x40",
+      "scale": "3x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "120_120-3.png",
+      "size": "60x60",
+      "scale": "2x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "180_180-1.png",
+      "size": "60x60",
+      "scale": "3x",
+      "idiom": "iphone"
+    },
+    {
+      "filename": "20_20-1.png",
+      "size": "20x20",
+      "scale": "1x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "40_40-4.png",
+      "size": "20x20",
+      "scale": "2x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "29_29-1.png",
+      "size": "29x29",
+      "scale": "1x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "58_58-3.png",
+      "size": "29x29",
+      "scale": "2x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "40_40-2-1.png",
+      "size": "40x40",
+      "scale": "1x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "80_80-3.png",
+      "size": "40x40",
+      "scale": "2x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "167_167-1.png",
+      "size": "83.5x83.5",
+      "scale": "2x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "76_76-1.png",
+      "size": "76x76",
+      "scale": "1x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "152_152-1.png",
+      "size": "76x76",
+      "scale": "2x",
+      "idiom": "ipad"
+    },
+    {
+      "filename": "1024_1024-1.png",
+      "size": "1024x1024",
+      "scale": "1x",
+      "idiom": "ios-marketing"
+    },
+    {
+      "filename": "120_120-4.png",
+      "size": "60x60",
+      "scale": "2x",
+      "idiom": "car"
+    },
+    {
+      "filename": "180_180-2.png",
+      "size": "60x60",
+      "scale": "3x",
+      "idiom": "car"
+    },
+    {
+      "role": "notificationCenter",
+      "size": "24x24",
+      "subtype": "38mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "notificationCenter",
+      "size": "27.5x27.5",
+      "subtype": "42mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "companionSettings",
+      "filename": "58_58-4.png",
+      "size": "29x29",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "companionSettings",
+      "filename": "87_87-2.png",
+      "size": "29x29",
+      "scale": "3x",
+      "idiom": "watch"
+    },
+    {
+      "role": "appLauncher",
+      "filename": "80_80-4.png",
+      "size": "40x40",
+      "subtype": "38mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "appLauncher",
+      "size": "44x44",
+      "subtype": "40mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "appLauncher",
+      "size": "50x50",
+      "subtype": "44mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "quickLook",
+      "size": "86x86",
+      "subtype": "38mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "quickLook",
+      "size": "98x98",
+      "subtype": "42mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "role": "quickLook",
+      "size": "108x108",
+      "subtype": "44mm",
+      "scale": "2x",
+      "idiom": "watch"
+    },
+    {
+      "filename": "1024_1024-2.png",
+      "size": "1024x1024",
+      "scale": "1x",
+      "idiom": "watch-marketing"
+    },
+    {
+      "size": "16x16",
+      "scale": "1x",
+      "idiom": "mac"
+    },
+    {
+      "size": "16x16",
+      "scale": "2x",
+      "idiom": "mac"
+    },
+    {
+      "size": "32x32",
+      "scale": "1x",
+      "idiom": "mac"
+    },
+    {
+      "size": "32x32",
+      "scale": "2x",
+      "idiom": "mac"
+    },
+    {
+      "size": "128x128",
+      "scale": "1x",
+      "idiom": "mac"
+    },
+    {
+      "size": "128x128",
+      "scale": "2x",
+      "idiom": "mac"
+    },
+    {
+      "size": "256x256",
+      "scale": "1x",
+      "idiom": "mac"
+    },
+    {
+      "size": "256x256",
+      "scale": "2x",
+      "idiom": "mac"
+    },
+    {
+      "size": "512x512",
+      "scale": "1x",
+      "idiom": "mac"
+    },
+    {
+      "size": "512x512",
+      "scale": "2x",
+      "idiom": "mac"
     }
+  ],
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
 }
\ No newline at end of file

--
Gitblit v1.8.0