From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
old mode 100755
new mode 100644
index 14e03cd..1be8e68
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -17,10 +17,50 @@
"minimum-system-version": "11.0"
},
{
+ "minimum-system-version": "12.0",
+ "orientation": "portrait",
+ "extent": "full-screen",
+ "filename": "12422688.png",
+ "size": "414x896",
+ "subtype": "1792",
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
+ "minimum-system-version": "12.0",
+ "orientation": "portrait",
+ "extent": "full-screen",
+ "filename": "8281792.png",
+ "size": "276x597.3",
+ "subtype": "2688",
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
+ "minimum-system-version": "12.0",
+ "orientation": "landscape",
+ "extent": "full-screen",
+ "filename": "26881242.png",
+ "size": "896x414",
+ "subtype": "1792",
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
+ "minimum-system-version": "12.0",
+ "orientation": "landscape",
+ "extent": "full-screen",
+ "filename": "1792828.png",
+ "size": "597.3x276",
+ "subtype": "2688",
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
"minimum-system-version": "11.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1125X2436.png",
+ "filename": "11252436.png",
"size": "375x812",
"subtype": "2436h",
"scale": "3x",
@@ -30,7 +70,7 @@
"minimum-system-version": "11.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2436X1125.png",
+ "filename": "24361125.png",
"size": "812x375",
"subtype": "2436h",
"scale": "3x",
@@ -40,7 +80,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1242x2208.png",
+ "filename": "12422208.png",
"size": "414x736",
"subtype": "736h",
"scale": "3x",
@@ -50,7 +90,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "750X1334.png",
+ "filename": "7501334.png",
"size": "375x667",
"subtype": "667h",
"scale": "2x",
@@ -60,7 +100,7 @@
"minimum-system-version": "8.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2208X1242.png",
+ "filename": "22081242.png",
"size": "736x414",
"subtype": "736h",
"scale": "3x",
@@ -70,7 +110,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "2048X2732.png",
+ "filename": "2048x2732.png",
"size": "1024x1366",
"scale": "2x",
"idiom": "ipad"
@@ -79,7 +119,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X960.png",
+ "filename": "640960.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -88,7 +128,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X1136.png",
+ "filename": "6401136.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -98,7 +138,6 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "768X1024.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -107,7 +146,6 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1536X2048.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -116,7 +154,6 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1024X768.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -125,7 +162,6 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2048X1536.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
@@ -133,7 +169,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "320X480.png",
+ "filename": "320480.png",
"size": "320x480",
"scale": "1x",
"idiom": "iphone"
@@ -141,7 +177,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X960.png",
+ "filename": "640960-1.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -149,7 +185,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X1136.png",
+ "filename": "6401136-1.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -158,7 +194,6 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "768X1004.png",
"size": "768x1004",
"scale": "1x",
"idiom": "ipad"
@@ -166,7 +201,6 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "1536X2008.png",
"size": "768x1004",
"scale": "2x",
"idiom": "ipad"
@@ -174,7 +208,6 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "768X1024.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -182,7 +215,6 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1536X2048.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -190,7 +222,6 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "1024X748.png",
"size": "1024x748",
"scale": "1x",
"idiom": "ipad"
@@ -198,7 +229,6 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "2048X1496.png",
"size": "1024x748",
"scale": "2x",
"idiom": "ipad"
@@ -206,7 +236,6 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1024X768.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -214,7 +243,6 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2048X1536.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
--
Gitblit v1.8.0