From: liangzhenying <867174124@qq.com> Date: Thu, 2 Apr 2026 07:32:00 +0000 (+0800) Subject: 湃萨UI修改 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=14e6a5d1ac930eba31440bf903ea769f972442c1;p=mirrors%2FShenYin.git 湃萨UI修改 --- diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj index 33dac71..6e1efd1 100644 --- a/ShenYin/ShenYin.xcodeproj/project.pbxproj +++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj @@ -1016,7 +1016,7 @@ ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 1.0.0; - PRODUCT_BUNDLE_IDENTIFIER = com.deepchords.paisa; + PRODUCT_BUNDLE_IDENTIFIER = com.deepchordsdemo.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1074,7 +1074,7 @@ ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 1.0.0; - PRODUCT_BUNDLE_IDENTIFIER = com.deepchords.paisa; + PRODUCT_BUNDLE_IDENTIFIER = com.deepchordsdemo.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Contents.json b/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Contents.json deleted file mode 100644 index 4b7bf60..0000000 --- a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "Frame.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Frame.png b/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Frame.png deleted file mode 100644 index b2c2400..0000000 Binary files a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Frame.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Frame@2x.png b/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Frame@2x.png deleted file mode 100644 index b7cf13e..0000000 Binary files a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Frame@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Frame@3x.png b/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Frame@3x.png deleted file mode 100644 index 0f593d5..0000000 Binary files a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_normal.imageset/Frame@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_selected.imageset/Contents.json b/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_selected.imageset/Contents.json deleted file mode 100644 index df1a323..0000000 --- a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_selected.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 1255@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 1255@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_selected.imageset/Group 1255@2x.png b/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_selected.imageset/Group 1255@2x.png deleted file mode 100644 index 955a662..0000000 Binary files a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_selected.imageset/Group 1255@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_selected.imageset/Group 1255@3x.png b/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_selected.imageset/Group 1255@3x.png deleted file mode 100644 index b142b7e..0000000 Binary files a/ShenYin/ShenYin/Channel/DeepChords/DeepChords.xcassets/mine/select_selected.imageset/Group 1255@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Contents.json index b495a0c..d9ba5bc 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame_2273@2x.png", + "filename" : "Slice 301@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame_2273@3x.png", + "filename" : "Slice 301@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Frame_2273@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Frame_2273@2x.png deleted file mode 100644 index beaa181..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Frame_2273@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Frame_2273@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Frame_2273@3x.png deleted file mode 100644 index 7c1df5e..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Frame_2273@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Slice 301@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Slice 301@2x.png new file mode 100644 index 0000000..25eed62 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Slice 301@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Slice 301@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Slice 301@3x.png new file mode 100644 index 0000000..e73c3b6 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/device/device_logo.imageset/Slice 301@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Contents.json index 12d064a..8b3edf4 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2255-5 1.png", + "filename" : "Slice 322@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255-5.png", + "filename" : "Slice 322@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Frame 2255-5 1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Frame 2255-5 1.png deleted file mode 100644 index 810d154..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Frame 2255-5 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Frame 2255-5.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Frame 2255-5.png deleted file mode 100644 index db4131a..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Frame 2255-5.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Slice 322@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Slice 322@2x.png new file mode 100644 index 0000000..aef97bb Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Slice 322@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Slice 322@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Slice 322@3x.png new file mode 100644 index 0000000..792bf9c Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_callRecord.imageset/Slice 322@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Contents.json index 87408f5..727360a 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 2401.png", + "filename" : "Slice 319@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 2400.png", + "filename" : "Slice 319@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Group 2400.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Group 2400.png deleted file mode 100644 index 407a752..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Group 2400.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Group 2401.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Group 2401.png deleted file mode 100644 index a303e99..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Group 2401.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Slice 319@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Slice 319@2x.png new file mode 100644 index 0000000..b62e41f Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Slice 319@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Slice 319@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Slice 319@3x.png new file mode 100644 index 0000000..96c3a7a Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chat.imageset/Slice 319@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Contents.json index faccd17..ad06123 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2255-1 1.png", + "filename" : "Slice 316@2x(1).png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255-1.png", + "filename" : "Slice 316@3x(1).png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Frame 2255-1 1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Frame 2255-1 1.png deleted file mode 100644 index ef717a2..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Frame 2255-1 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Frame 2255-1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Frame 2255-1.png deleted file mode 100644 index 1b78a63..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Frame 2255-1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Slice 316@2x(1).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Slice 316@2x(1).png new file mode 100644 index 0000000..2af597c Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Slice 316@2x(1).png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Slice 316@3x(1).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Slice 316@3x(1).png new file mode 100644 index 0000000..4ec5007 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_chinese2English.imageset/Slice 316@3x(1).png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Contents.json index 3cd4574..f6ab6ea 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2255-2 1.png", + "filename" : "Slice 316@2x(2).png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255-2.png", + "filename" : "Slice 316@3x(2).png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2 1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2 1.png deleted file mode 100644 index d16c6b6..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2.png deleted file mode 100644 index fba1eec..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Frame 2255-2.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Slice 316@2x(2).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Slice 316@2x(2).png new file mode 100644 index 0000000..4c78bd4 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Slice 316@2x(2).png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Slice 316@3x(2).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Slice 316@3x(2).png new file mode 100644 index 0000000..b8e7b47 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_dialogTranslate.imageset/Slice 316@3x(2).png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Contents.json index 12b1907..bd59d22 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2256.png", + "filename" : "Slice 316@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255.png", + "filename" : "Slice 316@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Frame 2255.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Frame 2255.png deleted file mode 100644 index 2eacb70..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Frame 2255.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Frame 2256.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Frame 2256.png deleted file mode 100644 index 708df37..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Frame 2256.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Slice 316@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Slice 316@2x.png new file mode 100644 index 0000000..46cb1fe Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Slice 316@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Slice 316@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Slice 316@3x.png new file mode 100644 index 0000000..03b0fac Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_fileRecord.imageset/Slice 316@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/Contents.json index 65c1f79..bba89d9 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "icon_录音历史 2.png", + "filename" : "Slice 321@2x(1).png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "icon_录音历史 1.png", + "filename" : "Slice 321@3x(1).png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/Slice 321@2x(1).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/Slice 321@2x(1).png new file mode 100644 index 0000000..7baa9bd Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/Slice 321@2x(1).png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/Slice 321@3x(1).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/Slice 321@3x(1).png new file mode 100644 index 0000000..e958658 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/Slice 321@3x(1).png differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/icon_\345\275\225\351\237\263\345\216\206\345\217\262 1.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/icon_\345\275\225\351\237\263\345\216\206\345\217\262 1.png" deleted file mode 100644 index 15793d4..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/icon_\345\275\225\351\237\263\345\216\206\345\217\262 1.png" and /dev/null differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/icon_\345\275\225\351\237\263\345\216\206\345\217\262 2.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/icon_\345\275\225\351\237\263\345\216\206\345\217\262 2.png" deleted file mode 100644 index 18abbd3..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordHistory.imageset/icon_\345\275\225\351\237\263\345\216\206\345\217\262 2.png" and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Contents.json index 31a4f66..df8a4ae 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2255-3 1.png", + "filename" : "Slice 316@2x(4).png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255-3.png", + "filename" : "Slice 316@3x(4).png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Frame 2255-3 1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Frame 2255-3 1.png deleted file mode 100644 index 663451c..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Frame 2255-3 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Frame 2255-3.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Frame 2255-3.png deleted file mode 100644 index 7c8d93c..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Frame 2255-3.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Slice 316@2x(4).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Slice 316@2x(4).png new file mode 100644 index 0000000..59339d5 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Slice 316@2x(4).png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Slice 316@3x(4).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Slice 316@3x(4).png new file mode 100644 index 0000000..d93cff9 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_recordTranslate.imageset/Slice 316@3x(4).png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/Contents.json index 55fecaf..711932a 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "实时双语字幕@2x.png", + "filename" : "Slice 320@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "实时双语字幕@3x.png", + "filename" : "Slice 320@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/Slice 320@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/Slice 320@2x.png new file mode 100644 index 0000000..b7d66bb Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/Slice 320@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/Slice 320@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/Slice 320@3x.png new file mode 100644 index 0000000..0ccaf39 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/Slice 320@3x.png differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/\345\256\236\346\227\266\345\217\214\350\257\255\345\255\227\345\271\225@2x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/\345\256\236\346\227\266\345\217\214\350\257\255\345\255\227\345\271\225@2x.png" deleted file mode 100644 index 73782fe..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/\345\256\236\346\227\266\345\217\214\350\257\255\345\255\227\345\271\225@2x.png" and /dev/null differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/\345\256\236\346\227\266\345\217\214\350\257\255\345\255\227\345\271\225@3x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/\345\256\236\346\227\266\345\217\214\350\257\255\345\255\227\345\271\225@3x.png" deleted file mode 100644 index 2a1bef9..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_subtitle.imageset/\345\256\236\346\227\266\345\217\214\350\257\255\345\255\227\345\271\225@3x.png" and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Contents.json index 3b267a7..528757e 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame 2255-4 1.png", + "filename" : "Slice 316@2x(3).png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame 2255-4.png", + "filename" : "Slice 316@3x(3).png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Frame 2255-4 1.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Frame 2255-4 1.png deleted file mode 100644 index 402036a..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Frame 2255-4 1.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Frame 2255-4.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Frame 2255-4.png deleted file mode 100644 index 8ba3bed..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Frame 2255-4.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Slice 316@2x(3).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Slice 316@2x(3).png new file mode 100644 index 0000000..8e69228 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Slice 316@2x(3).png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Slice 316@3x(3).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Slice 316@3x(3).png new file mode 100644 index 0000000..1757926 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/home_textTranslate.imageset/Slice 316@3x(3).png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_paus_icon.imageset/Frame 2079@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_paus_icon.imageset/Frame 2079@2x.png index 89c70c1..506aaed 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_paus_icon.imageset/Frame 2079@2x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_paus_icon.imageset/Frame 2079@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_paus_icon.imageset/Frame 2079@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_paus_icon.imageset/Frame 2079@3x.png index fd0e9c1..4655ac8 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_paus_icon.imageset/Frame 2079@3x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_paus_icon.imageset/Frame 2079@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_play_icon.imageset/Frame 2079@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_play_icon.imageset/Frame 2079@2x.png index b31ee32..af20db9 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_play_icon.imageset/Frame 2079@2x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_play_icon.imageset/Frame 2079@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_play_icon.imageset/Frame 2079@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_play_icon.imageset/Frame 2079@3x.png index 18fb61c..e423daf 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_play_icon.imageset/Frame 2079@3x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/play_play_icon.imageset/Frame 2079@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Contents.json index 511c377..f0b46de 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame_1938@2x(1).png", + "filename" : "Slice 334@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame_1938@3x(1).png", + "filename" : "Slice 334@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Frame_1938@2x(1).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Frame_1938@2x(1).png deleted file mode 100644 index a2ce407..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Frame_1938@2x(1).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Frame_1938@3x(1).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Frame_1938@3x(1).png deleted file mode 100644 index 12c9728..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Frame_1938@3x(1).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Slice 334@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Slice 334@2x.png new file mode 100644 index 0000000..a29dc01 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Slice 334@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Slice 334@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Slice 334@3x.png new file mode 100644 index 0000000..13f3684 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_more.imageset/Slice 334@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Contents.json index c44f3e2..a9429c9 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame_1938@2x(2).png", + "filename" : "Slice 333@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame_1938@3x(2).png", + "filename" : "Slice 333@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Frame_1938@2x(2).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Frame_1938@2x(2).png deleted file mode 100644 index ee8d50c..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Frame_1938@2x(2).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Frame_1938@3x(2).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Frame_1938@3x(2).png deleted file mode 100644 index caaa2d5..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Frame_1938@3x(2).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Slice 333@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Slice 333@2x.png new file mode 100644 index 0000000..f974430 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Slice 333@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Slice 333@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Slice 333@3x.png new file mode 100644 index 0000000..278c112 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_play 1.imageset/Slice 333@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Contents.json index df5635c..bd7f6ce 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame_1938@2x.png", + "filename" : "Slice 332@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame_1938@3x.png", + "filename" : "Slice 332@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Frame_1938@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Frame_1938@2x.png deleted file mode 100644 index 7e992f3..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Frame_1938@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Frame_1938@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Frame_1938@3x.png deleted file mode 100644 index ed2ca79..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Frame_1938@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Slice 332@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Slice 332@2x.png new file mode 100644 index 0000000..89e573a Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Slice 332@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Slice 332@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Slice 332@3x.png new file mode 100644 index 0000000..35d595f Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_rename.imageset/Slice 332@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Contents.json index f14f62b..8df4e18 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Frame_1938@2x(3).png", + "filename" : "Slice 331@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Frame_1938@3x(3).png", + "filename" : "Slice 331@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Frame_1938@2x(3).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Frame_1938@2x(3).png deleted file mode 100644 index c57ae6e..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Frame_1938@2x(3).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Frame_1938@3x(3).png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Frame_1938@3x(3).png deleted file mode 100644 index a179f3e..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Frame_1938@3x(3).png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Slice 331@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Slice 331@2x.png new file mode 100644 index 0000000..9545e81 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Slice 331@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Slice 331@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Slice 331@3x.png new file mode 100644 index 0000000..1b3bd2a Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/record_translate.imageset/Slice 331@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/upload_did.imageset/Frame@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/upload_did.imageset/Frame@2x.png index b62e198..3698885 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/upload_did.imageset/Frame@2x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/upload_did.imageset/Frame@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/upload_did.imageset/Frame@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/upload_did.imageset/Frame@3x.png index 383fac6..b8f8f06 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/upload_did.imageset/Frame@3x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/home/upload_did.imageset/Frame@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/add_picture.imageset/Frame_2291@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/add_picture.imageset/Frame_2291@2x.png index b4befe4..2f898dc 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/add_picture.imageset/Frame_2291@2x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/add_picture.imageset/Frame_2291@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/add_picture.imageset/Frame_2291@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/add_picture.imageset/Frame_2291@3x.png index de783a7..44875bf 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/add_picture.imageset/Frame_2291@3x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/add_picture.imageset/Frame_2291@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/Contents.json index 3bc4861..c5f89a8 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "上传@2x.png", + "filename" : "Slice 339@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "上传@3x.png", + "filename" : "Slice 339@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/Slice 339@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/Slice 339@2x.png new file mode 100644 index 0000000..aa88ffe Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/Slice 339@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/Slice 339@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/Slice 339@3x.png new file mode 100644 index 0000000..0bc0d4d Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/Slice 339@3x.png differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/\344\270\212\344\274\240@2x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/\344\270\212\344\274\240@2x.png" deleted file mode 100644 index 1f8388b..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/\344\270\212\344\274\240@2x.png" and /dev/null differ diff --git "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/\344\270\212\344\274\240@3x.png" "b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/\344\270\212\344\274\240@3x.png" deleted file mode 100644 index 93d9301..0000000 Binary files "a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/cloud_upload.imageset/\344\270\212\344\274\240@3x.png" and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Contents.json deleted file mode 100644 index 4b7bf60..0000000 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "Frame.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Frame@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Frame@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Frame.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Frame.png deleted file mode 100644 index b2c2400..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Frame.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Frame@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Frame@2x.png deleted file mode 100644 index b7cf13e..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Frame@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Frame@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Frame@3x.png deleted file mode 100644 index 0f593d5..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_normal.imageset/Frame@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_selected.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_selected.imageset/Contents.json deleted file mode 100644 index df1a323..0000000 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_selected.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Group 1255@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Group 1255@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_selected.imageset/Group 1255@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_selected.imageset/Group 1255@2x.png deleted file mode 100644 index 955a662..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_selected.imageset/Group 1255@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_selected.imageset/Group 1255@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_selected.imageset/Group 1255@3x.png deleted file mode 100644 index b142b7e..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/select_selected.imageset/Group 1255@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Contents.json index 5905c9c..52f24fb 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Ellipse_52@2x.png", + "filename" : "Slice 297@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Ellipse_52@3x.png", + "filename" : "Slice 297@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Ellipse_52@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Ellipse_52@2x.png deleted file mode 100644 index 9280587..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Ellipse_52@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Ellipse_52@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Ellipse_52@3x.png deleted file mode 100644 index a1fa2d5..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Ellipse_52@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Slice 297@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Slice 297@2x.png new file mode 100644 index 0000000..7313f74 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Slice 297@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Slice 297@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Slice 297@3x.png new file mode 100644 index 0000000..31b905f Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_normal.imageset/Slice 297@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Contents.json index df1a323..4c76836 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group 1255@2x.png", + "filename" : "Slice 298@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group 1255@3x.png", + "filename" : "Slice 298@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Group 1255@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Group 1255@2x.png deleted file mode 100644 index 955a662..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Group 1255@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Group 1255@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Group 1255@3x.png deleted file mode 100644 index b142b7e..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Group 1255@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Slice 298@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Slice 298@2x.png new file mode 100644 index 0000000..bce19fd Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Slice 298@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Slice 298@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Slice 298@3x.png new file mode 100644 index 0000000..0ee8656 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/tip_selected.imageset/Slice 298@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Contents.json b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Contents.json index fa2d8d5..c5c5269 100644 --- a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Contents.json +++ b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "Group_2440@2x.png", + "filename" : "Slice 377@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Group_2440@3x.png", + "filename" : "Slice 377@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Group_2440@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Group_2440@2x.png deleted file mode 100644 index 2e19cf9..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Group_2440@2x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Group_2440@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Group_2440@3x.png deleted file mode 100644 index ae4a26e..0000000 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Group_2440@3x.png and /dev/null differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Slice 377@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Slice 377@2x.png new file mode 100644 index 0000000..89869cd Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Slice 377@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Slice 377@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Slice 377@3x.png new file mode 100644 index 0000000..c3c34d9 Binary files /dev/null and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mine/update_icon.imageset/Slice 377@3x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/mode_selected.imageset/Group 1390@2x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/mode_selected.imageset/Group 1390@2x.png index a6fe4c9..d8d8414 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/mode_selected.imageset/Group 1390@2x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/mode_selected.imageset/Group 1390@2x.png differ diff --git a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/mode_selected.imageset/Group 1390@3x.png b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/mode_selected.imageset/Group 1390@3x.png index 228eb0b..dd20c10 100644 Binary files a/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/mode_selected.imageset/Group 1390@3x.png and b/ShenYin/ShenYin/Channel/PaXa/PaXa.xcassets/mode/mode_selected.imageset/Group 1390@3x.png differ diff --git a/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift b/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift index cdd36dc..2bde660 100644 --- a/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift +++ b/ShenYin/ShenYin/UI/Home/Scan/BleScanVC.swift @@ -117,20 +117,31 @@ class BleScanHeaderView: BaseView { var radarImageView = UIImageView() override func setupViews() { - if CCConfig.appType == .deepchords { + if CCConfig.appType == .playboy { + addSubviews([radarImageView]) + + radarImageView.do { v in + v.image = UIImage(named: "radar_icon") + // + let animation = CABasicAnimation.init(keyPath: "transform.rotation.z") + animation.beginTime = 0.0 + animation.fromValue = 0.0 + animation.toValue = 2*Double.pi + animation.duration = 2 + animation.repeatCount = MAXFLOAT + v.layer.add(animation, forKey: "radar.transform.rotation.x") + } + radarImageView.snp.makeConstraints { make in + make.size.equalTo(200) + make.center.equalToSuperview() + } + } + else if CCConfig.appType == .deepchords{ addSubviews([rippleView,radarImageView]) rippleView.startAnimating() radarImageView.do { v in v.image = UIImage(named: "device_logo") - // - // let animation = CABasicAnimation.init(keyPath: "transform.rotation.z") - // animation.beginTime = 0.0 - // animation.fromValue = 0.0 - // animation.toValue = 2*Double.pi - // animation.duration = 2.5 - // animation.repeatCount = MAXFLOAT - // v.layer.add(animation, forKey: "radar.transform.rotation.x") } radarImageView.snp.makeConstraints { make in make.width.equalTo(58) @@ -142,22 +153,20 @@ class BleScanHeaderView: BaseView { make.center.equalToSuperview() } } - else{ - addSubviews([radarImageView]) + else if CCConfig.appType == .paxa{ + addSubviews([rippleView,radarImageView]) + rippleView.startAnimating() radarImageView.do { v in - v.image = UIImage(named: "radar_icon") - // - let animation = CABasicAnimation.init(keyPath: "transform.rotation.z") - animation.beginTime = 0.0 - animation.fromValue = 0.0 - animation.toValue = 2*Double.pi - animation.duration = 2 - animation.repeatCount = MAXFLOAT - v.layer.add(animation, forKey: "radar.transform.rotation.x") + v.image = UIImage(named: "device_logo") } radarImageView.snp.makeConstraints { make in - make.size.equalTo(200) + make.width.equalTo(74) + make.height.equalTo(16) + make.center.equalToSuperview() + } + rippleView.snp.makeConstraints { make in + make.size.equalTo(250) make.center.equalToSuperview() } } diff --git a/ShenYin/ShenYin/UI/Launch/AppLaunch.swift b/ShenYin/ShenYin/UI/Launch/AppLaunch.swift index 4ffb9cf..5fb61b5 100644 --- a/ShenYin/ShenYin/UI/Launch/AppLaunch.swift +++ b/ShenYin/ShenYin/UI/Launch/AppLaunch.swift @@ -28,6 +28,9 @@ class AppLaunch:NSObject{ IQKeyboardManager.shared.enableAutoToolbar = false IQKeyboardManager.shared.isEnabled = true IQKeyboardManager.shared.resignOnTouchOutside = true + + UITextField.appearance().tintColor = .color(.theme) + } static func loadCache(){ if CacheManager.shared.user.isLogin { diff --git a/ShenYin/ShenYin/UI/Mine/Update/BleUpdateVC.swift b/ShenYin/ShenYin/UI/Mine/Update/BleUpdateVC.swift index 836f86c..5caa307 100644 --- a/ShenYin/ShenYin/UI/Mine/Update/BleUpdateVC.swift +++ b/ShenYin/ShenYin/UI/Mine/Update/BleUpdateVC.swift @@ -10,7 +10,7 @@ import UIKit class BleUpdateVC:BaseVC{ let icon = UIImageView(image: UIImage(named: "update_icon")) let versionLabel = UILabel() - let btn = UIButton(type: .custom) + let btn = CustomButton() let autoChecked:Bool init(checked:Bool) { self.autoChecked = checked @@ -29,14 +29,15 @@ class BleUpdateVC:BaseVC{ v.textColor = .color(.level1) v.numberOfLines = 0 } - btn.do { v in - v.setTitle("检查更新".l10n, for: .normal) - v.titleLabel?.font = .bold(14) - v.setTitleColor(.black, for: .normal) - v.addTarget(self, action: #selector(tapAction), for: .touchUpInside) - v.backgroundColor = .hexString("#EDEDED") - v.yc.setCornerRadius(12) - } +// btn.do { v in +// v.setTitle("检查更新".l10n, for: .normal) +// v.titleLabel?.font = .bold(14) +// v.setTitleColor(.black, for: .normal) +// v.addTarget(self, action: #selector(tapAction), for: .touchUpInside) +// v.backgroundColor = .hexString("#EDEDED") +// v.yc.setCornerRadius(12) +// } + btn.set(title: "检查更新".l10n,style: .theme1, target: self, action: #selector(tapAction)) icon.do { v in v.contentMode = .center } diff --git a/ShenYin/ShenYin/UI/common/pop/PopTextField.swift b/ShenYin/ShenYin/UI/common/pop/PopTextField.swift index fc00aa3..ca61625 100644 --- a/ShenYin/ShenYin/UI/common/pop/PopTextField.swift +++ b/ShenYin/ShenYin/UI/common/pop/PopTextField.swift @@ -77,12 +77,12 @@ class PopTextField: BasePresentView2 { } textFiledBg.do { v in if CCConfig.appType == .deepchords{ - v.yc.setBorder(width: 2, color: .color(.theme), radius: 10) - } - else{ v.backgroundColor = .rgb(0x3E3E3E) v.yc.setCornerRadius(10) } + else{ + v.yc.setBorder(width: 2, color: .color(.theme), radius: 10) + } } textFiled.do { v in @@ -103,14 +103,14 @@ class PopTextField: BasePresentView2 { okButton.do { (v) in v.setTitle("确定".l10n, for: .normal) v.titleLabel?.font = .bold(16) - if CCConfig.appType == .deepchords{ - v.setTitleColor(.white, for: .normal) - v.backgroundColor = UIColor.color(.theme) - } - else{ + if CCConfig.appType == .playboy{ v.setTitleColor(.rgb(0x121212), for: .normal) v.backgroundColor = UIColor.white } + else{ + v.setTitleColor(.white, for: .normal) + v.backgroundColor = UIColor.color(.theme) + } v.addTarget(self, action: #selector(okButtonAction), for: .touchUpInside) v.yc.setCornerRadius(12)