From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json | 56 +++++++++++++++++++++++++++-----------------------------
1 files changed, 27 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..ce96303 100755
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -3,7 +3,6 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1920X1080.png",
"size": "1920x1080",
"scale": "1x",
"idiom": "tv",
@@ -12,7 +11,6 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "3840X2160.png",
"size": "1920x1080",
"scale": "2x",
"idiom": "tv",
@@ -22,7 +20,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1242X2688.png",
+ "filename": "1242*2688_XS Max.png",
"size": "414x896",
"subtype": "1792",
"scale": "3x",
@@ -32,7 +30,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "828X1792.png",
+ "filename": "828*1792_XR.png",
"size": "276x597.3",
"subtype": "2688",
"scale": "3x",
@@ -42,7 +40,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2688X1242.png",
+ "filename": "2688*1242.png",
"size": "896x414",
"subtype": "1792",
"scale": "3x",
@@ -52,7 +50,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1792X828.png",
+ "filename": "1792*828.png",
"size": "597.3x276",
"subtype": "2688",
"scale": "3x",
@@ -62,7 +60,7 @@
"minimum-system-version": "11.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1125X2436.png",
+ "filename": "1125*2436.png",
"size": "375x812",
"subtype": "2436h",
"scale": "3x",
@@ -72,7 +70,7 @@
"minimum-system-version": "11.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2436X1125.png",
+ "filename": "2436*1125.png",
"size": "812x375",
"subtype": "2436h",
"scale": "3x",
@@ -82,7 +80,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1242X2208.png",
+ "filename": "1242*2208-1.png",
"size": "414x736",
"subtype": "736h",
"scale": "3x",
@@ -92,7 +90,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "750X1334.png",
+ "filename": "750*1334.png",
"size": "375x667",
"subtype": "667h",
"scale": "2x",
@@ -102,7 +100,7 @@
"minimum-system-version": "8.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2208X1242.png",
+ "filename": "2208*1242.png",
"size": "736x414",
"subtype": "736h",
"scale": "3x",
@@ -112,7 +110,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "2048X2732.png",
+ "filename": "2048*2732-1.png",
"size": "1024x1366",
"scale": "2x",
"idiom": "ipad"
@@ -121,7 +119,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X960.png",
+ "filename": "640*960.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -130,7 +128,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X1136.png",
+ "filename": "640*1136.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -140,7 +138,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "768X1024.png",
+ "filename": "768*1024.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -149,7 +147,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1536X2048.png",
+ "filename": "1536*2048.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -158,7 +156,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1024X768.png",
+ "filename": "1024*768.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -167,7 +165,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2048X1536.png",
+ "filename": "2048*1536.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
@@ -175,7 +173,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "320X480.png",
+ "filename": "320*480.png",
"size": "320x480",
"scale": "1x",
"idiom": "iphone"
@@ -183,7 +181,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X960.png",
+ "filename": "640*960-1.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -191,7 +189,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X1136.png",
+ "filename": "640*1136-1.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -200,7 +198,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "768X1004.png",
+ "filename": "768*1004.png",
"size": "768x1004",
"scale": "1x",
"idiom": "ipad"
@@ -208,7 +206,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "1536X2008.png",
+ "filename": "1536*2008.png",
"size": "768x1004",
"scale": "2x",
"idiom": "ipad"
@@ -216,7 +214,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "768X1024.png",
+ "filename": "768*1024-1.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -224,7 +222,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1536X2048.png",
+ "filename": "1536*2048-1.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -232,7 +230,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "1024X748.png",
+ "filename": "1024*748.png",
"size": "1024x748",
"scale": "1x",
"idiom": "ipad"
@@ -240,7 +238,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "2048X1496.png",
+ "filename": "2048*1496.png",
"size": "1024x748",
"scale": "2x",
"idiom": "ipad"
@@ -248,7 +246,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1024X768.png",
+ "filename": "1024*768-1.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -256,7 +254,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2048X1536.png",
+ "filename": "2048*1536-1.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
--
Gitblit v1.8.0