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 |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
index 9b94864..6e65bd0 100755
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,119 +1,121 @@
 {
   "images": [
     {
-      "filename": "40*40.png",
+      "filename": "40_40-3.png",
       "size": "20x20",
       "scale": "2x",
       "idiom": "iphone"
     },
     {
-      "filename": "60*60.png",
+      "filename": "60_60-1.png",
       "size": "20x20",
       "scale": "3x",
       "idiom": "iphone"
     },
     {
-      "filename": "58*58.png",
+      "filename": "58_58-2.png",
       "size": "29x29",
       "scale": "2x",
       "idiom": "iphone"
     },
     {
-      "filename": "87*87.png",
+      "filename": "87_87-1.png",
       "size": "29x29",
       "scale": "3x",
       "idiom": "iphone"
     },
     {
-      "filename": "80*80-1.png",
+      "filename": "80_80-2.png",
       "size": "40x40",
       "scale": "2x",
       "idiom": "iphone"
     },
     {
-      "filename": "120*120.png",
+      "filename": "120_120-2.png",
       "size": "40x40",
       "scale": "3x",
       "idiom": "iphone"
     },
     {
-      "filename": "120*120-1.png",
+      "filename": "120_120-3.png",
       "size": "60x60",
       "scale": "2x",
       "idiom": "iphone"
     },
     {
-      "filename": "180*180.png",
+      "filename": "180_180-1.png",
       "size": "60x60",
       "scale": "3x",
       "idiom": "iphone"
     },
     {
-      "filename": "20*20.png",
+      "filename": "20_20-1.png",
       "size": "20x20",
       "scale": "1x",
       "idiom": "ipad"
     },
     {
-      "filename": "40*40-1.png",
+      "filename": "40_40-4.png",
       "size": "20x20",
       "scale": "2x",
       "idiom": "ipad"
     },
     {
-      "filename": "29*29.png",
+      "filename": "29_29-1.png",
       "size": "29x29",
       "scale": "1x",
       "idiom": "ipad"
     },
     {
-      "filename": "58*58-1.png",
+      "filename": "58_58-3.png",
       "size": "29x29",
       "scale": "2x",
       "idiom": "ipad"
     },
     {
-      "filename": "40*40-2.png",
+      "filename": "40_40-2-1.png",
       "size": "40x40",
       "scale": "1x",
       "idiom": "ipad"
     },
     {
-      "filename": "80*80.png",
+      "filename": "80_80-3.png",
       "size": "40x40",
       "scale": "2x",
       "idiom": "ipad"
     },
     {
-      "filename": "167*167.png",
+      "filename": "167_167-1.png",
       "size": "83.5x83.5",
       "scale": "2x",
       "idiom": "ipad"
     },
     {
-      "filename": "76*76.png",
+      "filename": "76_76-1.png",
       "size": "76x76",
       "scale": "1x",
       "idiom": "ipad"
     },
     {
-      "filename": "152*152.png",
+      "filename": "152_152-1.png",
       "size": "76x76",
       "scale": "2x",
       "idiom": "ipad"
     },
     {
-      "filename": "1024*1024.png",
+      "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"
@@ -134,18 +136,21 @@
     },
     {
       "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",
@@ -187,6 +192,7 @@
       "idiom": "watch"
     },
     {
+      "filename": "1024_1024-2.png",
       "size": "1024x1024",
       "scale": "1x",
       "idiom": "watch-marketing"

--
Gitblit v1.8.0