Merge branch 'release/v1.3.3'

fanyuecheng · Oct 20, 2022 · 97b62e9 · 97b62e9
2 parents a706bcf + 466f64c
commit 97b62e9
Show file tree

Hide file tree

Showing 30 changed files with 3,485 additions and 2,972 deletions.
diff --git a/Pica.xcodeproj/project.pbxproj b/Pica.xcodeproj/project.pbxproj
@@ -1515,7 +1515,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 1.3.2;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yuecheng.pica;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1541,7 +1541,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 1.3.2;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yuecheng.pica;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/Pica/Category/Controller/PCCategoryController.m b/Pica/Category/Controller/PCCategoryController.m
@@ -136,6 +136,7 @@ - (void)requestCategory {
         [categoryArray addObject:[PCCategory recommendCategory]];
         [categoryArray addObject:[PCCategory commentCategory]];
         [categoryArray addObject:[PCCategory sanctuaryCategory]];
+        [categoryArray addObject:[PCCategory webCategory]];
         [categoryArray addObjectsFromArray:responseArray];
         self.categoryArray = categoryArray;
     } failure:^(NSError * _Nonnull error) {

diff --git a/Pica/Category/Model/PCCategory.h b/Pica/Category/Model/PCCategory.h
@@ -45,6 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (PCCategory *)commentCategory;
 + (PCCategory *)recommendCategory;
 + (PCCategory *)nsfwCategory;
++ (PCCategory *)webCategory;
 + (PCCategory *)sanctuaryCategory;
 + (PCCategory *)aiCategory;//iOS 专有
 

diff --git a/Pica/Category/Model/PCCategory.m b/Pica/Category/Model/PCCategory.m
@@ -85,6 +85,27 @@ + (PCCategory *)sanctuaryCategory {
     return category;
 }
 
++ (PCCategory *)webCategory {
+    PCCategory *category = [[PCCategory alloc] init];
+    category.title = @"网页版";
+    category.active = YES;
+    category.isWeb = YES;
+    category.link = @"https://manhuabika.com";
+    CGFloat width = floorf((SCREEN_WIDTH - 40) / 3);
+    UIView *customThumb = [[UIView alloc] initWithFrame:CGRectMake(0, 0, width, width)];
+    customThumb.backgroundColor = UIColorWhite;
+    QMUILabel *label = [[QMUILabel alloc] initWithFrame:CGRectMake(0, 0, 38, 34)];
+    label.layer.borderWidth = 2.5;
+    label.layer.borderColor = PCColorPink.CGColor;
+    label.layer.cornerRadius = 4;
+    label.textAlignment = NSTextAlignmentCenter;
+    label.attributedText = [[NSAttributedString alloc] initWithString:@"Web" attributes:@{NSFontAttributeName : UIFontBoldMake(18), NSForegroundColorAttributeName : PCColorPink}];
+    label.center = customThumb.center;
+    [customThumb addSubview:label];
+    category.customThumb = [UIImage qmui_imageWithView:customThumb];
+    return category;
+}
+
 + (PCCategory *)aiCategory {
     PCCategory *category = [[PCCategory alloc] init];
     category.title = @"嗶咔AI推薦";

diff --git a/Pica/Common/Configuration/QMUIConfigurationTemplateDefault.m b/Pica/Common/Configuration/QMUIConfigurationTemplateDefault.m
@@ -289,7 +289,7 @@ - (void)applyConfigurationTemplate {
 #pragma mark - Others
 
     QMUICMI.automaticCustomNavigationBarTransitionStyle = NO;                   // AutomaticCustomNavigationBarTransitionStyle : 界面 push/pop 时是否要自动根据两个界面的 barTintColor/backgroundImage/shadowImage 的样式差异来决定是否使用自定义的导航栏效果
-    QMUICMI.supportedOrientationMask = UIInterfaceOrientationMaskAll;           // SupportedOrientationMask : 默认支持的横竖屏方向
+    QMUICMI.supportedOrientationMask = UIInterfaceOrientationMaskPortrait;           // SupportedOrientationMask : 默认支持的横竖屏方向
     QMUICMI.automaticallyRotateDeviceOrientation = YES;                         // AutomaticallyRotateDeviceOrientation : 是否在界面切换或 viewController.supportedOrientationMask 发生变化时自动旋转屏幕
     QMUICMI.defaultStatusBarStyle = UIStatusBarStyleDefault; // DefaultStatusBarStyle : 默认的状态栏样式，默认值为 UIStatusBarStyleDefault，也即在 iOS 12 及以前是黑色文字，iOS 13 及以后会自动根据当前 App 是否处于 Dark Mode 切换颜色。如果你希望固定为白色，请设置为 UIStatusBarStyleLightContent，固定黑色则设置为 QMUIStatusBarStyleDarkContent。
     QMUICMI.needsBackBarButtonItemTitle = NO;                                   // NeedsBackBarButtonItemTitle : 全局是否需要返回按钮的 title，不需要则只显示一个返回image

diff --git a/Podfile b/Podfile
@@ -9,7 +9,7 @@ target 'Pica' do
 
     pod 'YTKNetwork', '~> 3.0.6'
     pod 'YYModel', '~> 1.0.4' 
-    pod 'SDWebImage', '~> 5.13.2'
+    pod 'SDWebImage', '~> 5.13.4'
     pod 'QMUIKit', '~> 4.5.1'  
     pod 'MJRefresh', '~> 3.7.5'
     pod 'JXPagingView/Pager', '~> 2.1.2'
@@ -18,6 +18,7 @@ target 'Pica' do
     pod 'FMDB', '~> 2.6.1'
     pod 'UMCommon', '~> 7.3.7'
     pod 'UMDevice', '~> 2.2.1'
+    pod 'UMAPM', '~> 1.7.0' 
     pod 'SDWebImageVideoCoder', '~> 0.2.0' 
     pod 'SSZipArchive', '~> 2.4.3'
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -309,13 +309,14 @@ PODS:
     - QMUIKit/QMUILog
   - QMUIKit/QMUIResources (4.5.1)
   - QMUIKit/QMUIWeakObjectContainer (4.5.1)
-  - SDWebImage (5.13.2):
-    - SDWebImage/Core (= 5.13.2)
-  - SDWebImage/Core (5.13.2)
+  - SDWebImage (5.13.4):
+    - SDWebImage/Core (= 5.13.4)
+  - SDWebImage/Core (5.13.4)
   - SDWebImageVideoCoder (0.2.0):
     - SDWebImage (~> 5.10)
   - SocketRocket (0.6.0)
   - SSZipArchive (2.4.3)
+  - UMAPM (1.7.0)
   - UMCommon (7.3.7):
     - UMDevice
   - UMDevice (2.2.1)
@@ -329,10 +330,11 @@ DEPENDENCIES:
   - JXPagingView/Pager (~> 2.1.2)
   - MJRefresh (~> 3.7.5)
   - QMUIKit (~> 4.5.1)
-  - SDWebImage (~> 5.13.2)
+  - SDWebImage (~> 5.13.4)
   - SDWebImageVideoCoder (~> 0.2.0)
   - SocketRocket (~> 0.6.0)
   - SSZipArchive (~> 2.4.3)
+  - UMAPM (~> 1.7.0)
   - UMCommon (~> 7.3.7)
   - UMDevice (~> 2.2.1)
   - YTKNetwork (~> 3.0.6)
@@ -350,6 +352,7 @@ SPEC REPOS:
     - SDWebImageVideoCoder
     - SocketRocket
     - SSZipArchive
+    - UMAPM
     - UMCommon
     - UMDevice
     - YTKNetwork
@@ -362,15 +365,16 @@ SPEC CHECKSUMS:
   JXPagingView: 90924b364a2ff7e94db534fad1fa50925ff69ee4
   MJRefresh: fdf5e979eb406a0341468932d1dfc8b7f9fce961
   QMUIKit: 3e717c45730ecdf5011ca76751990ad1a23ba7e1
-  SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
+  SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3
   SDWebImageVideoCoder: 977388b65f0f508161ccf17597db147c26076cec
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
+  UMAPM: e7674c15fd583c3d9bf2e469cf40002f61bf2b97
   UMCommon: 37fe35f498e92cf57bbb06a086f02915fc35f211
   UMDevice: 053478c4b4d7292f31f0a275c227d3c4007a5571
   YTKNetwork: c16be90b06be003de9e9cd0d3b187cc8eaf35c04
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
 
-PODFILE CHECKSUM: ec6988b50beb0caf94818613c3f4da053fae331b
+PODFILE CHECKSUM: c5c46a9187df10e6af074dc599f6abb33fe96618
 
 COCOAPODS: 1.11.3
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock