Merge branch 'release/v1.2.4'

Pica.xcodeproj/project.pbxproj

@@ -1515,10 +1515,10 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yuecheng.pica;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -1541,10 +1541,10 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.yuecheng.pica;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};

Pica/Category/Controller/PCComicPictureController.m

@@ -149,6 +149,12 @@ - (void)exportAction:(UIBarButtonItem *)sender {
             [activityItems addObject:[NSURL fileURLWithPath:localPath]];
 
             UIActivityViewController *activity = [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:nil];
+            if (IS_IPAD) {
+                activity.popoverPresentationController.sourceView = self.view;
+                activity.popoverPresentationController.sourceRect = CGRectMake(self.view.qmui_width * 0.5, self.view.qmui_height * 0.5, 1, 1);
+                activity.popoverPresentationController.permittedArrowDirections = UIPopoverArrowDirectionUp;
+            }
+
             [[QMUIHelper visibleViewController] presentViewController:activity animated:YES completion:nil];
         }
     };

Pica/Category/View/PCCommentCell.m

@@ -119,9 +119,7 @@ - (void)likeAction:(QMUIButton *)sender {
 }
 
 - (void)moreAction:(QMUIButton *)sender {
-    [UIViewController pc_actionSheetWithTitle:nil message:nil confirmTitle:@"举报" confirm:^{
-        [self report];
-    } cancelTitle:@"取消" cancel:nil];
+    [self report];
 }
 
 - (void)childAction:(QMUIButton *)sender {

Pica/Chat/Controller/PCChatListController.m

@@ -37,7 +37,7 @@ - (void)initTableView {
 - (void)setupNavigationItems {
     [super setupNavigationItems];
 
-    self.title = @"聊天室";
+    self.title = @"聊天";
 }
 
 #pragma mark - Net

Pica/Chat/Controller/PCChatViewController.m

@@ -722,7 +722,7 @@ - (UITableView *)tableView {
             if (self.localMessageArray.count) {
                 NSArray *msgArray = nil;
                 if (self.localMessageArray.count > 20) {
-                    msgArray = [self.localMessageArray subarrayWithRange:NSMakeRange(self.localMessageArray.count - 21, 20)];
+                    msgArray = [self.localMessageArray subarrayWithRange:NSMakeRange(self.localMessageArray.count - 20, 20)];
                     [self.localMessageArray removeObjectsInArray:msgArray];
                 } else {
                     msgArray = self.localMessageArray.copy;

Pica/Common/Configuration/QMUIConfigurationTemplateDefault.m

@@ -127,7 +127,8 @@ - (void)applyConfigurationTemplate {
     QMUICMI.tabBarBarTintColor = nil;                                           // TabBarBarTintColor : UITabBar 的 barTintColor，如果需要看到磨砂效果则应该提供半透明的色值
     QMUICMI.tabBarShadowImageColor = UIColorSeparator;                          // TabBarShadowImageColor : UITabBar 的 shadowImage 的颜色，会自动创建一张 1px 高的图片
     QMUICMI.tabBarStyle = UIBarStyleDefault;                                    // TabBarStyle : UITabBar 的 barStyle
-    QMUICMI.tabBarItemTitleFont = nil;                                          // TabBarItemTitleFont : UITabBarItem 的标题字体
+    QMUICMI.tabBarItemTitleFont = UIFontMake(13);                                          // TabBarItemTitleFont : UITabBarItem 的标题字体
+    QMUICMI.tabBarItemTitleFontSelected = UIFontMake(13); // TabBarItemTitleFontSelected : 选中的 UITabBarItem 的标题字体
     QMUICMI.tabBarItemTitleColor = UIColor.pc_descriptionTextColor;             // TabBarItemTitleColor : 未选中的 UITabBarItem 的标题颜色
     QMUICMI.tabBarItemTitleColorSelected = UIColor.pc_tintColor;                // TabBarItemTitleColorSelected : 选中的 UITabBarItem 的标题颜色
     QMUICMI.tabBarItemImageColor = TabBarItemTitleColor;                        // TabBarItemImageColor : UITabBarItem 未选中时的图片颜色
@@ -303,7 +304,6 @@ - (void)applyConfigurationTemplate {
     QMUICMI.navBarContainerClasses = nil; // NavBarContainerClasses : NavigationBar 系列开关被用于 UIAppearance 时的生效范围（默认情况下除了用于 UIAppearance 外，还用于实现了 QMUINavigationControllerAppearanceDelegate 的 UIViewController），默认为 nil。当赋值为 nil 或者空数组时等效于 @[UINavigationController.class]，也即对所有 UINavigationBar 生效，包括系统的通讯录（ContactsUI.framework)、打印等。当值不为空时，获取 UINavigationBar 的 appearance 请使用 UINavigationBar.qmui_appearanceConfigured 方法代替系统的 UINavigationBar.appearance。请保证这个配置项先于其他任意 NavBar 配置项执行。
     QMUICMI.tabBarContainerClasses = nil; // TabBarContainerClasses : TabBar 系列开关的生效范围，默认为 nil，当赋值为 nil 或者空数组时等效于 @[UITabBarController.class]，也即对所有 UITabBar 生效。当值不为空时，获取 UITabBar 的 appearance 请使用 UITabBar.qmui_appearanceConfigured 方法代替系统的 UITabBar.appearance。请保证这个配置项先于其他任意 TabBar 配置项执行。
     QMUICMI.toolBarContainerClasses = nil; // ToolBarContainerClasses : ToolBar 系列开关的生效范围，默认为 nil，当赋值为 nil 或者空数组时等效于 @[UINavigationController.class]，也即对所有 UIToolbar 生效。当值不为空时，获取 UIToolbar 的 appearance 请使用 UIToolbar.qmui_appearanceConfigured 方法代替系统的 UIToolbar.appearance。请保证这个配置项先于其他任意 ToolBar 配置项执行。
-    QMUICMI.tabBarItemTitleFontSelected = nil; // TabBarItemTitleFontSelected : 选中的 UITabBarItem 的标题字体
     if (@available(iOS 13.0, *)) {
         QMUICMI.ignoreKVCAccessProhibited = NO;                                     // IgnoreKVCAccessProhibited : 是否全局忽略 iOS 13 对 KVC 访问 UIKit 私有属性的限制
         QMUICMI.adjustScrollIndicatorInsetsByContentInsetAdjustment = YES;          // AdjustScrollIndicatorInsetsByContentInsetAdjustment : 当将 UIScrollView.contentInsetAdjustmentBehavior 设为 UIScrollViewContentInsetAdjustmentNever 时，是否自动将 UIScrollView.automaticallyAdjustsScrollIndicatorInsets 设为 NO，以保证原本在 iOS 12 下的代码不用修改就能在 iOS 13 下正常控制滚动条的位置。

Pica/Game/Controller/PCGameListController.m

@@ -31,7 +31,7 @@ - (void)viewDidLoad {
 - (void)setupNavigationItems {
     [super setupNavigationItems];
 
-    self.title = @"游戏区";
+    self.title = @"游戏";
 }
 
 - (void)initSubviews {

Podfile

@@ -9,7 +9,7 @@ target 'Pica' do
 
     pod 'YTKNetwork', '~> 3.0.6'
     pod 'YYModel', '~> 1.0.4' 
-    pod 'SDWebImage', '~> 5.12.2'
+    pod 'SDWebImage', '~> 5.12.4'
     pod 'QMUIKit', '~> 4.4.3'  
     pod 'MJRefresh', '~> 3.7.5'
     pod 'JXPagingView/Pager', '~> 2.1.2'

Podfile.lock

@@ -309,9 +309,9 @@ PODS:
     - QMUIKit/QMUILog
   - QMUIKit/QMUIResources (4.4.3)
   - QMUIKit/QMUIWeakObjectContainer (4.4.3)
-  - SDWebImage (5.12.2):
-    - SDWebImage/Core (= 5.12.2)
-  - SDWebImage/Core (5.12.2)
+  - SDWebImage (5.12.4):
+    - SDWebImage/Core (= 5.12.4)
+  - SDWebImage/Core (5.12.4)
   - SDWebImageVideoCoder (0.2.0):
     - SDWebImage (~> 5.10)
   - SocketRocket (0.6.0)
@@ -329,7 +329,7 @@ DEPENDENCIES:
   - JXPagingView/Pager (~> 2.1.2)
   - MJRefresh (~> 3.7.5)
   - QMUIKit (~> 4.4.3)
-  - SDWebImage (~> 5.12.2)
+  - SDWebImage (~> 5.12.4)
   - SDWebImageVideoCoder (~> 0.2.0)
   - SocketRocket (~> 0.6.0)
   - SSZipArchive (~> 2.4.2)
@@ -362,7 +362,7 @@ SPEC CHECKSUMS:
   JXPagingView: 90924b364a2ff7e94db534fad1fa50925ff69ee4
   MJRefresh: fdf5e979eb406a0341468932d1dfc8b7f9fce961
   QMUIKit: 5da6e59d5d312681ee45706af42fd3af7b4f55eb
-  SDWebImage: 240e5c12b592fb1268c1d03b8c90d90e8c2ffe82
+  SDWebImage: 631cf572cc93dfdfe54162e556410a61f1141928
   SDWebImageVideoCoder: 977388b65f0f508161ccf17597db147c26076cec
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
@@ -371,6 +371,6 @@ SPEC CHECKSUMS:
   YTKNetwork: c16be90b06be003de9e9cd0d3b187cc8eaf35c04
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
 
-PODFILE CHECKSUM: 9e18b44c732114a2d61b80af2e1900454487145a
+PODFILE CHECKSUM: 3705a8e0f7dce5c7f140efa62c640ca298049870
 
 COCOAPODS: 1.11.2