diff --git a/MoviaBox/Class/Home/Controller/SPHomeViewController.swift b/MoviaBox/Class/Home/Controller/SPHomeViewController.swift
index 864c47a..1f7140f 100644
--- a/MoviaBox/Class/Home/Controller/SPHomeViewController.swift
+++ b/MoviaBox/Class/Home/Controller/SPHomeViewController.swift
@@ -93,17 +93,18 @@ class SPHomeViewController: SPHomeChildController {
extension SPHomeViewController {
private func _setupUI() {
- view.addSubview(logoImageView)
+// view.addSubview(logoImageView)
view.addSubview(searchButton)
view.addSubview(self.collectionView)
- logoImageView.snp.makeConstraints { make in
- make.left.equalToSuperview().offset(16)
- make.centerY.equalTo(searchButton)
- }
+// logoImageView.snp.makeConstraints { make in
+// make.left.equalToSuperview().offset(16)
+// make.centerY.equalTo(searchButton)
+// }
searchButton.snp.makeConstraints { make in
- make.left.equalTo(logoImageView.snp.right).offset(6)
+// make.left.equalTo(logoImageView.snp.right).offset(6)
+ make.left.equalToSuperview().offset(16)
make.right.equalToSuperview().offset(-16)
make.top.equalToSuperview().offset(kSPStatusbarHeight + 10)
}
diff --git a/MoviaBox/Source/Assets.xcassets/AppIcon.appiconset/APP图标 (1).jpg b/MoviaBox/Source/Assets.xcassets/AppIcon.appiconset/APP图标 (1).jpg
deleted file mode 100644
index 3470a23..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/AppIcon.appiconset/APP图标 (1).jpg and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/AppIcon.appiconset/Contents.json b/MoviaBox/Source/Assets.xcassets/AppIcon.appiconset/Contents.json
index 0efd27a..361ae0b 100644
--- a/MoviaBox/Source/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/MoviaBox/Source/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "APP图标 (1).jpg",
+ "filename" : "LOGO(MoviaBox).jpg",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
diff --git a/MoviaBox/Source/Assets.xcassets/AppIcon.appiconset/LOGO(MoviaBox).jpg b/MoviaBox/Source/Assets.xcassets/AppIcon.appiconset/LOGO(MoviaBox).jpg
new file mode 100644
index 0000000..99582a1
Binary files /dev/null and b/MoviaBox/Source/Assets.xcassets/AppIcon.appiconset/LOGO(MoviaBox).jpg differ
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Contents.json b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Contents.json
index 575adc4..7d75700 100644
--- a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Contents.json
+++ b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Contents.json
@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
- "filename" : "Frame 1@2x.png",
+ "filename" : "启动页(MoviaBox 1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
- "filename" : "Frame 1@3x.png",
+ "filename" : "启动页(MoviaBox.png",
"idiom" : "universal",
"scale" : "3x"
}
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@2x.png b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@2x.png
deleted file mode 100644
index 7f38b11..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@2x.png and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@3x.png b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@3x.png
deleted file mode 100644
index abbe58c..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/Frame 1@3x.png and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/启动页(MoviaBox 1.png b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/启动页(MoviaBox 1.png
new file mode 100644
index 0000000..44d0a0f
Binary files /dev/null and b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/启动页(MoviaBox 1.png differ
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/启动页(MoviaBox.png b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/启动页(MoviaBox.png
new file mode 100644
index 0000000..fff4ceb
Binary files /dev/null and b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_bg_image.imageset/启动页(MoviaBox.png differ
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Contents.json b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Contents.json
deleted file mode 100644
index d8d4737..0000000
--- a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "Frame 3@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "Frame 3@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@2x.png b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@2x.png
deleted file mode 100644
index 0e66982..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@2x.png and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@3x.png b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@3x.png
deleted file mode 100644
index 6ebd314..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_01.imageset/Frame 3@3x.png and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Contents.json b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Contents.json
deleted file mode 100644
index 77c7666..0000000
--- a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "Frame 2@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "Frame 2@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@2x.png b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@2x.png
deleted file mode 100644
index ebfc142..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@2x.png and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@3x.png b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@3x.png
deleted file mode 100644
index 6a0cbfd..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_02.imageset/Frame 2@3x.png and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Contents.json b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Contents.json
deleted file mode 100644
index d28576e..0000000
--- a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "Frame 4@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "Frame 4@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@2x.png b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@2x.png
deleted file mode 100644
index 5c3a11f..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@2x.png and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@3x.png b/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@3x.png
deleted file mode 100644
index 7569b9a..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/LaunchScreen/launch_screen_logo_03.imageset/Frame 4@3x.png and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/icon/about_us_logo_icon.imageset/APP图标 (1).jpg b/MoviaBox/Source/Assets.xcassets/icon/about_us_logo_icon.imageset/APP图标 (1).jpg
deleted file mode 100644
index 34ac40b..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/icon/about_us_logo_icon.imageset/APP图标 (1).jpg and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/icon/about_us_logo_icon.imageset/Contents.json b/MoviaBox/Source/Assets.xcassets/icon/about_us_logo_icon.imageset/Contents.json
index d41a3b7..f8a079e 100644
--- a/MoviaBox/Source/Assets.xcassets/icon/about_us_logo_icon.imageset/Contents.json
+++ b/MoviaBox/Source/Assets.xcassets/icon/about_us_logo_icon.imageset/Contents.json
@@ -5,7 +5,7 @@
"scale" : "1x"
},
{
- "filename" : "APP图标 (1).jpg",
+ "filename" : "LOGO(MoviaBox).jpg",
"idiom" : "universal",
"scale" : "2x"
},
diff --git a/MoviaBox/Source/Assets.xcassets/icon/about_us_logo_icon.imageset/LOGO(MoviaBox).jpg b/MoviaBox/Source/Assets.xcassets/icon/about_us_logo_icon.imageset/LOGO(MoviaBox).jpg
new file mode 100644
index 0000000..1b91032
Binary files /dev/null and b/MoviaBox/Source/Assets.xcassets/icon/about_us_logo_icon.imageset/LOGO(MoviaBox).jpg differ
diff --git a/MoviaBox/Source/Assets.xcassets/icon/logo_icon_01.imageset/Contents.json b/MoviaBox/Source/Assets.xcassets/icon/logo_icon_01.imageset/Contents.json
deleted file mode 100644
index 84c5f03..0000000
--- a/MoviaBox/Source/Assets.xcassets/icon/logo_icon_01.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "Frame 155@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "Frame 155@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/MoviaBox/Source/Assets.xcassets/icon/logo_icon_01.imageset/Frame 155@2x.png b/MoviaBox/Source/Assets.xcassets/icon/logo_icon_01.imageset/Frame 155@2x.png
deleted file mode 100644
index c2abab3..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/icon/logo_icon_01.imageset/Frame 155@2x.png and /dev/null differ
diff --git a/MoviaBox/Source/Assets.xcassets/icon/logo_icon_01.imageset/Frame 155@3x.png b/MoviaBox/Source/Assets.xcassets/icon/logo_icon_01.imageset/Frame 155@3x.png
deleted file mode 100644
index f97ff8c..0000000
Binary files a/MoviaBox/Source/Assets.xcassets/icon/logo_icon_01.imageset/Frame 155@3x.png and /dev/null differ
diff --git a/MoviaBox/Source/Base.lproj/LaunchScreen.storyboard b/MoviaBox/Source/Base.lproj/LaunchScreen.storyboard
index d319f91..65ac740 100644
--- a/MoviaBox/Source/Base.lproj/LaunchScreen.storyboard
+++ b/MoviaBox/Source/Base.lproj/LaunchScreen.storyboard
@@ -20,29 +20,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -53,9 +38,6 @@
-
-
-