diff --git a/xplan-ios/Appdelegate/1234.png b/xplan-ios/Appdelegate/1234.png deleted file mode 100644 index 9420a7a4..00000000 Binary files a/xplan-ios/Appdelegate/1234.png and /dev/null differ diff --git a/xplan-ios/Appdelegate/123456789.png b/xplan-ios/Appdelegate/123456789.png new file mode 100644 index 00000000..9ee6a18b Binary files /dev/null and b/xplan-ios/Appdelegate/123456789.png differ diff --git a/xplan-ios/Assets.xcassets/57.imageset/57.png b/xplan-ios/Assets.xcassets/57.imageset/57.png deleted file mode 100644 index 6eaf18aa..00000000 Binary files a/xplan-ios/Assets.xcassets/57.imageset/57.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/57.imageset/Contents.json b/xplan-ios/Assets.xcassets/57.imageset/Contents.json deleted file mode 100644 index 249690c3..00000000 --- a/xplan-ios/Assets.xcassets/57.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "57.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024.png index 23dfddfb..a70fefc5 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/114.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/114.png index 95f3724f..965e3960 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/114.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/120.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/120.png index a6f33694..6373e148 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/120.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/180.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/180.png index 3c0b0a82..3cb149fe 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/180.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/29.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/29.png index e2c58e95..744de34b 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/29.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/40.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/40.png index fc6bbd8b..d5d51de0 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/40.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/57.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/57.png index 6eaf18aa..8a7754b5 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/57.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/58.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/58.png index 2fba088c..05304e83 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/58.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/60.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/60.png index 901e9abc..17d4880b 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/60.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/80.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/80.png index a41cbb43..28ff2049 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/80.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/xplan-ios/Assets.xcassets/AppIcon.appiconset/87.png b/xplan-ios/Assets.xcassets/AppIcon.appiconset/87.png index e35e88e9..544b8256 100644 Binary files a/xplan-ios/Assets.xcassets/AppIcon.appiconset/87.png and b/xplan-ios/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/Contents.json b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/Contents.json index ad5e1a97..3dee53c7 100644 --- a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/Contents.json +++ b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/Contents.json @@ -5,11 +5,12 @@ "scale" : "1x" }, { - "filename" : "common_avatar.png", + "filename" : "common_avatar@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "common_avatar@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar.png b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar.png deleted file mode 100644 index 6eaf18aa..00000000 Binary files a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar.png and /dev/null differ diff --git a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@2x.png b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@2x.png new file mode 100644 index 00000000..b5028a4f Binary files /dev/null and b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@3x.png b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@3x.png new file mode 100644 index 00000000..49f25890 Binary files /dev/null and b/xplan-ios/Assets.xcassets/Common/common_avatar.imageset/common_avatar@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@2x.png b/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@2x.png index 7edea0a2..baecbe1f 100644 Binary files a/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@2x.png and b/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@3x.png b/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@3x.png index a085ebb3..51a15548 100644 Binary files a/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@3x.png and b/xplan-ios/Assets.xcassets/Common/common_empty_avatar.imageset/common_empty_avatar@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Login/login_top_bg.imageset/login_top_bg@2x.png b/xplan-ios/Assets.xcassets/Login/login_top_bg.imageset/login_top_bg@2x.png index ea069acd..7fa3612d 100644 Binary files a/xplan-ios/Assets.xcassets/Login/login_top_bg.imageset/login_top_bg@2x.png and b/xplan-ios/Assets.xcassets/Login/login_top_bg.imageset/login_top_bg@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Login/login_top_bg.imageset/login_top_bg@3x.png b/xplan-ios/Assets.xcassets/Login/login_top_bg.imageset/login_top_bg@3x.png index e36c4340..5d7be092 100644 Binary files a/xplan-ios/Assets.xcassets/Login/login_top_bg.imageset/login_top_bg@3x.png and b/xplan-ios/Assets.xcassets/Login/login_top_bg.imageset/login_top_bg@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/180.png b/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/180.png new file mode 100644 index 00000000..3cb149fe Binary files /dev/null and b/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/180.png differ diff --git a/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/Contents.json b/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/Contents.json index 8dc8d10d..6d9214b5 100644 --- a/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/Contents.json +++ b/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "ming_setting_about_us@2x.png", + "filename" : "180.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/ming_setting_about_us@2x.png b/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/ming_setting_about_us@2x.png deleted file mode 100644 index a3f704b0..00000000 Binary files a/xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/ming_setting_about_us@2x.png and /dev/null differ