From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
old mode 100755
new mode 100644
index 17aefa3..adff739
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -3,6 +3,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
+ "filename": "1920_1080-1.png",
"size": "1920x1080",
"scale": "1x",
"idiom": "tv",
@@ -11,6 +12,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
+ "filename": "3840_2160-1.png",
"size": "1920x1080",
"scale": "2x",
"idiom": "tv",
@@ -20,7 +22,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴1242*2688.png",
+ "filename": "1242_2688.png",
"size": "414x896",
"subtype": "1792",
"scale": "3x",
@@ -30,7 +32,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴828*1792.png",
+ "filename": "828_1792.png",
"size": "276x597.3",
"subtype": "2688",
"scale": "3x",
@@ -40,7 +42,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴2688*1242.png",
+ "filename": "2688_1242.png",
"size": "896x414",
"subtype": "1792",
"scale": "3x",
@@ -50,7 +52,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴1792*828.png",
+ "filename": "1792_828.png",
"size": "597.3x276",
"subtype": "2688",
"scale": "3x",
@@ -60,7 +62,7 @@
"minimum-system-version": "11.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴1125*2436.png",
+ "filename": "1125_2436.png",
"size": "375x812",
"subtype": "2436h",
"scale": "3x",
@@ -70,7 +72,7 @@
"minimum-system-version": "11.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴2436*1125.png",
+ "filename": "2436_1125.png",
"size": "812x375",
"subtype": "2436h",
"scale": "3x",
@@ -80,7 +82,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴1242*2208.png",
+ "filename": "1242_2208.png",
"size": "414x736",
"subtype": "736h",
"scale": "3x",
@@ -90,7 +92,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴750_1334澶囦唤.png",
+ "filename": "750_1334.png",
"size": "375x667",
"subtype": "667h",
"scale": "2x",
@@ -100,7 +102,7 @@
"minimum-system-version": "8.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴2208*1242.png",
+ "filename": "2208_1242.png",
"size": "736x414",
"subtype": "736h",
"scale": "3x",
@@ -110,7 +112,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴2048*2732.png",
+ "filename": "2048_2732.png",
"size": "1024x1366",
"scale": "2x",
"idiom": "ipad"
@@ -119,7 +121,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴640_960澶囦唤.png",
+ "filename": "640_960.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -128,7 +130,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴640_1136澶囦唤.png",
+ "filename": "640_1136.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -138,7 +140,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴768*1024.png",
+ "filename": "768_1024.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -147,7 +149,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴1536*2048.png",
+ "filename": "1536_2048.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -156,7 +158,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴1024*768.png",
+ "filename": "1024_768.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -165,7 +167,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴2048*1536.png",
+ "filename": "2048_1536.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
@@ -173,7 +175,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴320_480澶囦唤.png",
+ "filename": "320_480.png",
"size": "320x480",
"scale": "1x",
"idiom": "iphone"
@@ -181,7 +183,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴640_960澶囦唤-1.png",
+ "filename": "640_960-1.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -189,7 +191,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴640_1136澶囦唤-1.png",
+ "filename": "640_1136-1.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -198,7 +200,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "鏄撴768_1004澶囦唤.png",
+ "filename": "768_1004.png",
"size": "768x1004",
"scale": "1x",
"idiom": "ipad"
@@ -206,7 +208,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "鏄撴1536_2008澶囦唤.png",
+ "filename": "1536_2008.png",
"size": "768x1004",
"scale": "2x",
"idiom": "ipad"
@@ -214,7 +216,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴768_1024澶囦唤.png",
+ "filename": "768_1024-1.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -222,7 +224,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴1536_2048澶囦唤.png",
+ "filename": "1536_2048-1.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -230,7 +232,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "鏄撴1024_748澶囦唤.png",
+ "filename": "1024_748.png",
"size": "1024x748",
"scale": "1x",
"idiom": "ipad"
@@ -238,7 +240,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "鏄撴2048_1496澶囦唤.png",
+ "filename": "2048_1496.png",
"size": "1024x748",
"scale": "2x",
"idiom": "ipad"
@@ -246,7 +248,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴1024_768澶囦唤.png",
+ "filename": "1024_768-1.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -254,7 +256,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴2048_1536澶囦唤.png",
+ "filename": "2048_1536-1.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
--
Gitblit v1.8.0