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/LaunchImage.launchimage/Contents.json | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
index 0348d45..89d8507 100755
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -3,7 +3,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1920X1080.png",
+ "filename": "1920_1080-1.png",
"size": "1920x1080",
"scale": "1x",
"idiom": "tv",
@@ -12,7 +12,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "3840X2160.png",
+ "filename": "3840_2160-1.png",
"size": "1920x1080",
"scale": "2x",
"idiom": "tv",
@@ -22,7 +22,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1242X2688.png",
+ "filename": "1242_2688_XS Max-1.png",
"size": "414x896",
"subtype": "1792",
"scale": "3x",
@@ -32,7 +32,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "828X1792.png",
+ "filename": "828_1792_XR-1.png",
"size": "276x597.3",
"subtype": "2688",
"scale": "3x",
@@ -42,7 +42,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2688X1242.png",
+ "filename": "2688_1242-1.png",
"size": "896x414",
"subtype": "1792",
"scale": "3x",
@@ -52,7 +52,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1792X828.png",
+ "filename": "1792_828-1.png",
"size": "597.3x276",
"subtype": "2688",
"scale": "3x",
@@ -62,7 +62,7 @@
"minimum-system-version": "11.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1125X2436.png",
+ "filename": "1125_2436-1.png",
"size": "375x812",
"subtype": "2436h",
"scale": "3x",
@@ -72,7 +72,7 @@
"minimum-system-version": "11.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2436X1125.png",
+ "filename": "2436_1125-1.png",
"size": "812x375",
"subtype": "2436h",
"scale": "3x",
@@ -82,7 +82,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1242X2208.png",
+ "filename": "1242_2208.png",
"size": "414x736",
"subtype": "736h",
"scale": "3x",
@@ -92,7 +92,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "750X1334.png",
+ "filename": "750_1334-1.png",
"size": "375x667",
"subtype": "667h",
"scale": "2x",
@@ -102,7 +102,7 @@
"minimum-system-version": "8.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2208X1242.png",
+ "filename": "2208_1242-1.png",
"size": "736x414",
"subtype": "736h",
"scale": "3x",
@@ -112,7 +112,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "2048X2732.png",
+ "filename": "2048_2732.png",
"size": "1024x1366",
"scale": "2x",
"idiom": "ipad"
@@ -121,7 +121,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X960.png",
+ "filename": "640_960-2.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -130,7 +130,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X1136.png",
+ "filename": "640_1136-2.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -140,7 +140,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "768X1024.png",
+ "filename": "768_1024-2.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -149,7 +149,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1536X2048.png",
+ "filename": "1536_2048-2.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -158,7 +158,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1024X768.png",
+ "filename": "1024_768-2.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -167,7 +167,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2048X1536.png",
+ "filename": "2048_1536-2.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
@@ -175,7 +175,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "320X480.png",
+ "filename": "320_480-1.png",
"size": "320x480",
"scale": "1x",
"idiom": "iphone"
@@ -183,7 +183,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X960.png",
+ "filename": "640_960-3.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -191,7 +191,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X1136.png",
+ "filename": "640_1136-3.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -200,7 +200,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "768X1004.png",
+ "filename": "768_1004-1.png",
"size": "768x1004",
"scale": "1x",
"idiom": "ipad"
@@ -208,7 +208,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "1536X2008.png",
+ "filename": "1536_2008-1.png",
"size": "768x1004",
"scale": "2x",
"idiom": "ipad"
@@ -216,7 +216,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "768X1024.png",
+ "filename": "768_1024-3.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -224,7 +224,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1536X2048.png",
+ "filename": "1536_2048-3.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -232,7 +232,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "1024X748.png",
+ "filename": "1024_748-1.png",
"size": "1024x748",
"scale": "1x",
"idiom": "ipad"
@@ -240,7 +240,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "2048X1496.png",
+ "filename": "2048_1496-1.png",
"size": "1024x748",
"scale": "2x",
"idiom": "ipad"
@@ -248,7 +248,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1024X768.png",
+ "filename": "1024_768-3.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -256,7 +256,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2048X1536.png",
+ "filename": "2048_1536-3.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
--
Gitblit v1.8.0