apple 4 жил өмнө
parent
commit
76a2d9ee61

+ 12 - 0
ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		18056002255BD68C005B04DD /* Push.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = 18055FFE255BD68B005B04DD /* Push.pbobjc.m */; };
+		18056003255BD68C005B04DD /* Push.pbrpc.m in Sources */ = {isa = PBXBuildFile; fileRef = 18055FFF255BD68C005B04DD /* Push.pbrpc.m */; };
 		1810C2B024E4E1D8006B8232 /* ZKFaceVerifyMsgView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1810C2AF24E4E1D8006B8232 /* ZKFaceVerifyMsgView.m */; };
 		182493C1255B8A3100BF4AB2 /* libc.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 18E05CFF22F11D58001E5B44 /* libc.tbd */; };
 		182493C5255BB55F00BF4AB2 /* JYgRPCClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 182493C4255BB55F00BF4AB2 /* JYgRPCClient.m */; };
@@ -95,6 +97,10 @@
 /* Begin PBXFileReference section */
 		0CA962A24EED00910F83394E /* libPods-JianYuIOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JianYuIOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		10D9BC27D00CB4DF3F791728 /* Pods-JianYuIOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JianYuIOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-JianYuIOS/Pods-JianYuIOS.release.xcconfig"; sourceTree = "<group>"; };
+		18055FFE255BD68B005B04DD /* Push.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Push.pbobjc.m; path = Pods/zkprotocol/Pods/zkprotocol/Push.pbobjc.m; sourceTree = SOURCE_ROOT; };
+		18055FFF255BD68C005B04DD /* Push.pbrpc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Push.pbrpc.m; path = Pods/zkprotocol/Pods/zkprotocol/Push.pbrpc.m; sourceTree = SOURCE_ROOT; };
+		18056000255BD68C005B04DD /* Push.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Push.pbobjc.h; path = Pods/zkprotocol/Pods/zkprotocol/Push.pbobjc.h; sourceTree = SOURCE_ROOT; };
+		18056001255BD68C005B04DD /* Push.pbrpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Push.pbrpc.h; path = Pods/zkprotocol/Pods/zkprotocol/Push.pbrpc.h; sourceTree = SOURCE_ROOT; };
 		1810C2AE24E4E1D8006B8232 /* ZKFaceVerifyMsgView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZKFaceVerifyMsgView.h; sourceTree = "<group>"; };
 		1810C2AF24E4E1D8006B8232 /* ZKFaceVerifyMsgView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZKFaceVerifyMsgView.m; sourceTree = "<group>"; };
 		182493C3255BB55F00BF4AB2 /* JYgRPCClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JYgRPCClient.h; sourceTree = "<group>"; };
@@ -254,6 +260,10 @@
 		182493C2255BB53800BF4AB2 /* JYgRPC */ = {
 			isa = PBXGroup;
 			children = (
+				18056000255BD68C005B04DD /* Push.pbobjc.h */,
+				18055FFE255BD68B005B04DD /* Push.pbobjc.m */,
+				18056001255BD68C005B04DD /* Push.pbrpc.h */,
+				18055FFF255BD68C005B04DD /* Push.pbrpc.m */,
 				182493C3255BB55F00BF4AB2 /* JYgRPCClient.h */,
 				182493C4255BB55F00BF4AB2 /* JYgRPCClient.m */,
 			);
@@ -738,9 +748,11 @@
 				182493C5255BB55F00BF4AB2 /* JYgRPCClient.m in Sources */,
 				18BCAEB124F3C2980027921D /* JYWKNewWebController.m in Sources */,
 				18AEC20B249332C500391584 /* JYKeyCustom.m in Sources */,
+				18056003255BD68C005B04DD /* Push.pbrpc.m in Sources */,
 				18C78C1B24E240CE001208F2 /* ZKModal.m in Sources */,
 				C550BEF920180AF000F0BC2A /* AppDelegate.m in Sources */,
 				18C78C1A24E240CE001208F2 /* ZKClipboardView.m in Sources */,
+				18056002255BD68C005B04DD /* Push.pbobjc.m in Sources */,
 				1810C2B024E4E1D8006B8232 /* ZKFaceVerifyMsgView.m in Sources */,
 				18C78C5424E24421001208F2 /* ZKMethod.m in Sources */,
 				187B4EE621EC635700A9368D /* GlobalData.m in Sources */,

BIN
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate


+ 31 - 15
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -35,15 +35,15 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "08EDC44A-EFC0-4926-88FA-31774DFBB466"
+            uuid = "3EA8AEA0-BF37-4F1F-A8D7-93BCAB6CE52C"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewSearchViewController.m"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewSubViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2035"
-            endingLineNumber = "2035"
+            startingLineNumber = "1508"
+            endingLineNumber = "1508"
             landmarkName = "-popWebView"
             landmarkType = "7">
          </BreakpointContent>
@@ -51,11 +51,11 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "3EA8AEA0-BF37-4F1F-A8D7-93BCAB6CE52C"
+            uuid = "F9BC2C41-C736-4081-9BDD-61D58F17A57E"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewSubViewController.m"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewExpViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1508"
@@ -67,15 +67,15 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "F9BC2C41-C736-4081-9BDD-61D58F17A57E"
+            uuid = "D50D11AA-3A8C-411B-AB8F-0105F715E8F5"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewExpViewController.m"
+            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewMineViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1508"
-            endingLineNumber = "1508"
+            startingLineNumber = "1534"
+            endingLineNumber = "1534"
             landmarkName = "-popWebView"
             landmarkType = "7">
          </BreakpointContent>
@@ -83,16 +83,32 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "D50D11AA-3A8C-411B-AB8F-0105F715E8F5"
+            uuid = "A09B4112-6BE4-483E-AF5D-3E276634A49C"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "JianYuIOS/Classes&#xff08;&#x6a21;&#x5757;&#xff09;/JYNewMineViewController.m"
+            filePath = "Pods/zkprotocol/Pods/zkprotocol/Push.pbrpc.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1534"
-            endingLineNumber = "1534"
-            landmarkName = "-popWebView"
+            startingLineNumber = "118"
+            endingLineNumber = "118"
+            landmarkName = "-pushBackWithRequest:handler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "3206EB99-C29F-4523-A982-49B1582DB4BD"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "JianYuIOS/AppDelegate.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "467"
+            endingLineNumber = "467"
+            landmarkName = "-application:didReceiveRemoteNotification:fetchCompletionHandler:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

+ 14 - 9
ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -40,6 +40,7 @@
     JYTabBarController *tabBarVc = [[JYTabBarController alloc] init];
     self.window.rootViewController = tabBarVc;
     [self.window makeKeyAndVisible];
+    
 //    [self initJYBXKey]; //注册协议
     
     NSURLCache *URLCache = [[NSURLCache alloc] initWithMemoryCapacity:1000 * 1024 * 1024 diskCapacity:1000 * 1024 * 1024 diskPath:nil];
@@ -55,12 +56,16 @@
     }
 
     NSLog(@"初始化");
-    NSLog(@"sdk version:%@",[[WBOCRService sharedService] sdkVersion]);
-//    NSLog(@"%@",[[GlobalData shareInstance] getDocumentPath]);
-//    NSLog(@"%@",[[GlobalData shareInstance] getfsCachedData]);
     [GlobalData shareInstance];
+    [JYgRPCClient shareInstance];
     [LXViewControllerManager shareViewControllerManager];
-//    [self initJPush:launchOptions];
+   
+//    NSLog(@"sdk version:%@",[[WBOCRService sharedService] sdkVersion]);
+//    NSLog(@"%@",[[GlobalData shareInstance] getDocumentPath]);
+//    NSLog(@"%@",[[GlobalData shareInstance] getfsCachedData]);
+   
+    
+
     [self initUM];
     [self registeredPush]; //注册原生推送
 
@@ -70,11 +75,11 @@
         NSDictionary * remoteNotification = [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey]; //这个判断是在程序没有运行的情况下收到通知,点击通知跳转页面
         if ([[UIDevice currentDevice].systemVersion floatValue] < 10.0 && remoteNotification) {
             // iOS 10 不必走此方法
-            if ([remoteNotification objectForKey:@"_j_business"]||[remoteNotification objectForKey:@"_j_msgid"]||[remoteNotification objectForKey:@"_j_uid"]) {
-                [self dealWithReceiveApns:@"jpush" withType:@"receive"];
-            }else {
-                [self dealWithReceiveApns:@"appstore" withType:@"open"];
-            }
+//            if ([remoteNotification objectForKey:@"_j_business"]||[remoteNotification objectForKey:@"_j_msgid"]||[remoteNotification objectForKey:@"_j_uid"]) {
+//                [self dealWithReceiveApns:@"jpush" withType:@"receive"];
+//            }else {
+//                [self dealWithReceiveApns:@"appstore" withType:@"open"];
+//            }
             [self clickNotification:remoteNotification];
         }
     }else {//图标启动

+ 2 - 0
ios/JianYuIOS/JianYuIOS/BaseClass1/GlobalData.h

@@ -21,6 +21,8 @@
 @property (nonatomic,copy)NSString *isSkipPath;//skip图片路径
 
 
+@property (nonatomic,copy)NSString *rpcPushID;//
+
 //Plist 表相关
 
 //获取所有数据

+ 8 - 0
ios/JianYuIOS/JianYuIOS/BaseClass1/GlobalData.m

@@ -63,6 +63,14 @@
     self.isOpen = NO;
     self.isPasteLogin = NO;
     self.isSkipPath = @"";
+
+    NSString *pushID = [[NSUserDefaults standardUserDefaults] objectForKey:GRPCPushID];
+    if (!pushID) {
+        self.rpcPushID = @"";
+    }else {
+        self.rpcPushID = pushID;
+    }
+    
 }
 
 -(NSString *)getPlistPath {

+ 2 - 0
ios/JianYuIOS/JianYuIOS/BaseClass1/LXUserDefaults.h

@@ -42,4 +42,6 @@
 //是否存在设备
 +(NSString *)getDeviceID;
 
+
+
 @end

+ 6 - 2
ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -113,6 +113,8 @@ _Pragma("clang diagnostic pop")\
 #define UpdateClipboard @"UpdateClipboard"
 //通知-打开粘贴板页面
 #define OpenTheClipboard @"OpenTheClipboard"
+//rpcPushID
+#define GRPCPushID @"GRPCPushID"
 
 
 
@@ -134,9 +136,11 @@ _Pragma("clang diagnostic pop")\
 #import <WBOCRService/WBOCRService.h>
 #import <WBCloudReflectionFaceVerify/WBFaceVerifyCustomerService.h>
 
+#import <GRPCClient/GRPCCall+ChannelArg.h>
+#import <GRPCClient/GRPCCall+Tests.h>
 
-
-
+#import "JYgRPCClient.h"
+#import <UserNotifications/UserNotifications.h>
 
 #import "UIView+Extension.h"
 #import "GlobalData.h"

+ 1 - 1
ios/JianYuIOS/JianYuIOS/Classes(模块)/JYNewSearchViewController.m

@@ -699,7 +699,7 @@ NSString *const new_AesKey_1 = @"mGlAgnIBB8bx2nch";
     //定时器
     if([LXUserDefaults isExistToken]) {
         self.notiDict = [[NSMutableDictionary alloc]initWithDictionary:[[NSUserDefaults standardUserDefaults] objectForKey:RemoteNotifications]];
-        NSLog(@"通知数据:%@",self.notiDict);
+//        NSLog(@"通知数据:%@",self.notiDict);
         if(self.notiDict.count) {
             self.timer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(timeFireMethod) userInfo:nil repeats:YES];
         }

+ 10 - 0
ios/JianYuIOS/JianYuIOS/JYgRPC/JYgRPCClient.h

@@ -8,10 +8,20 @@
 
 #import <Foundation/Foundation.h>
 
+#import <UIKit/UIKit.h>
+@class PushService;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface JYgRPCClient : NSObject
 
++(JYgRPCClient *)shareInstance;//单例
+
+
+@property (nonatomic,copy)NSString *pushID;
+
+@property (nonatomic,retain)PushService *service;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 164 - 0
ios/JianYuIOS/JianYuIOS/JYgRPC/JYgRPCClient.m

@@ -8,16 +8,180 @@
 
 #import "JYgRPCClient.h"
 #import <GRPCClient/GRPCCall+Tests.h>
+#import "Push.pbrpc.h"
+#import "Push.pbobjc.h"
 
 
 
+@interface JYgRPCClient()
+
+
+@end
+
+
 @implementation JYgRPCClient
 
 
++(instancetype)shareInstance{
+    static JYgRPCClient *manager = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        manager = [[JYgRPCClient alloc] init];
+    });
+    return manager;
+}
+
+- (instancetype)init
+{
+    if (self = [super init])
+    {
+        [self initData];
+    }
+    return self;
+   
+}
+
+
+-(void)initData {
+    
+    [GRPCCall useInsecureConnectionsForHost:@"192.168.3.207:5565"];
+    
+    self.service =  [PushService serviceWithHost:@"192.168.3.207:5565"];
+    RegReq *req = [[RegReq alloc]init];
+    req.key = @"jy";
+    req.uuid = @"111122223333";
+    [self.service registerWithRequest:req handler:^(RegResp * _Nullable response, NSError * _Nullable error) {
+        NSLog(@"注册接收:%@",response.pushId);
+        [[NSUserDefaults standardUserDefaults] setValue:response.pushId forKey:GRPCPushID];
+        [GlobalData shareInstance].rpcPushID =response.pushId;
+    }];
+    
+    
+    /*
+        
+     */
+    
+    
+    /*
+     rpc Register(RegReq) returns(RegResp){}
+       //服务端单向流 推送
+       rpc PushMsg(MsgReq) returns(stream MsgResp){}
+       //推送回调
+       rpc PushBack(MsgPushReq) returns(MsgPushResp){}
+     */
+    
+    /*
+     {
+         pushId: "jy_1604295672932610"
+         msgId: "5fac8ca2d11968311abebfc3"
+         msgType: 1
+         title: "您有新的招标信息!"
+         body: "1. 云浮市人民医院云浮市人民医院新生儿科医用设备及配套医用器具、辅助设施采购项目采购计划\n...(共251条)"
+         url: "/jyapp/free/sess/QQtGXVJMR19BDVdNTA5FDwQXQw1FWlVGWDAZCklFQl9FX1FHQ15EQg0dBxsfHBwEARwY"
+         pushType: "bid"
+         menuName: "subscribe"
+         redDot: "subscribe"
+         userId: "5d6378301c298a5aac7b5402"
+     }
+     
+     */
+    
+    //监听 第一次注册的时候  延时处理
+    
+    if (![[GlobalData shareInstance].rpcPushID isEqualToString:@""]) {
+//        NSLog(@"测试:%@",[GlobalData shareInstance].rpcPushID );
+        MsgReq *msg = [[MsgReq alloc]init];
+        msg.pushId = [GlobalData shareInstance].rpcPushID;
+        [self.service pushMsgWithRequest:msg eventHandler:^(BOOL done, MsgResp * _Nullable response, NSError * _Nullable error) {
+            NSLog(@"%@--%@",response,error);
+            [self showLocalPushView:nil];
+            
+        }];
+    }
+    
+    
+    
+    
+}
+
+
+-(void)showLocalPushView :(MsgResp *)response {
+    if (response==nil) {
+//        return;
+    }
+    
+    //msgType ==1 普通消息   msgType==2 透传离线
+    
+    if (@available(iOS 10.0, *)) {
+            UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+            UNMutableNotificationContent *content = [[UNMutableNotificationContent alloc] init];
+            // 标题
+            content.title = @"测试标题";
+            content.subtitle = @"测试通知副标题";
+            // 内容
+            content.body = @"测试通知的具体内容";
+            // 声音
+           // 默认声音
+             content.sound = [UNNotificationSound defaultSound];
+         // 添加自定义声音
+//           content.sound = [UNNotificationSound soundNamed:@"Alert_ActivityGoalAttained_Salient_Haptic.caf"];
+            // 角标 (我这里测试的角标无效,暂时没找到原因)
+            content.badge = @1;
+            // 多少秒后发送,可以将固定的日期转化为时间
+            NSTimeInterval time = [[NSDate dateWithTimeIntervalSinceNow:2] timeIntervalSinceNow];
+    //        NSTimeInterval time = 10;
+            // repeats,是否重复,如果重复的话时间必须大于60s,要不会报错
+            UNTimeIntervalNotificationTrigger *trigger = [UNTimeIntervalNotificationTrigger triggerWithTimeInterval:time repeats:NO];
+            
+            /*
+            //如果想重复可以使用这个,按日期
+            // 周一早上 8:00 上班
+            NSDateComponents *components = [[NSDateComponents alloc] init];
+            // 注意,weekday默认是从周日开始
+            components.weekday = 2;
+            components.hour = 8;
+            UNCalendarNotificationTrigger *calendarTrigger = [UNCalendarNotificationTrigger triggerWithDateMatchingComponents:components repeats:YES];
+            */
+            // 添加通知的标识符,可以用于移除,更新等操作
+            NSString *identifier = @"noticeId";
+            UNNotificationRequest *request = [UNNotificationRequest requestWithIdentifier:identifier content:content trigger:trigger];
+            
+            [center addNotificationRequest:request withCompletionHandler:^(NSError *_Nullable error) {
+                NSLog(@"成功添加推送");
+            }];
+    }else {
+        UILocalNotification *notif = [[UILocalNotification alloc] init];
+        // 发出推送的日期
+        notif.fireDate = [NSDate dateWithTimeIntervalSinceNow:2];
+        // 推送的内容
+        notif.alertBody = @"你已经10秒没出现了";
+        // 可以添加特定信息
+        notif.userInfo = @{@"noticeId":@"00001"};
+        // 角标
+        notif.applicationIconBadgeNumber = 1;
+        // 提示音
+        notif.soundName = UILocalNotificationDefaultSoundName;
+        // 每周循环提醒
+        notif.repeatInterval = NSCalendarUnitWeekOfYear;
+        
+        [[UIApplication sharedApplication] scheduleLocalNotification:notif];
+    }
+}
 
 
 
 
+-(void)grpcCallbackServer:(NSString *)str {
+    MsgPushReq *req = [[MsgPushReq alloc]init];
+   
+    req.msgId = @"";
+    req.action = 1;
+    req.userId = @"";
+    
+    [self.service pushBackWithRequest:req handler:^(MsgPushResp * _Nullable response, NSError * _Nullable error) {
+            
+    }];
+}
 
 
 @end

+ 1 - 1
ios/JianYuIOS/Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h

@@ -31,7 +31,7 @@
     #import "AFImageDownloader.h"
     #import "AFNetworkActivityIndicatorManager.h"
     #import "UIRefreshControl+AFNetworking.h"
-    #import "UIWebView+AFNetworking.h"
+
 #endif
 
     #import "UIActivityIndicatorView+AFNetworking.h"

+ 0 - 80
ios/JianYuIOS/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h

@@ -1,80 +0,0 @@
-// UIWebView+AFNetworking.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-
-#import <TargetConditionals.h>
-
-#if TARGET_OS_IOS
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class AFHTTPSessionManager;
-
-/**
- This category adds methods to the UIKit framework's `UIWebView` class. The methods in this category provide increased control over the request cycle, including progress monitoring and success / failure handling.
-
- @discussion When using these category methods, make sure to assign `delegate` for the web view, which implements `–webView:shouldStartLoadWithRequest:navigationType:` appropriately. This allows for tapped links to be loaded through AFNetworking, and can ensure that `canGoBack` & `canGoForward` update their values correctly.
- */
-@interface UIWebView (AFNetworking)
-
-/**
- The session manager used to download all requests.
- */
-@property (nonatomic, strong) AFHTTPSessionManager *sessionManager;
-
-/**
- Asynchronously loads the specified request.
-
- @param request A URL request identifying the location of the content to load. This must not be `nil`.
- @param progress A progress object monitoring the current download progress.
- @param success A block object to be executed when the request finishes loading successfully. This block returns the HTML string to be loaded by the web view, and takes two arguments: the response, and the response string.
- @param failure A block object to be executed when the data task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a single argument: the error that occurred.
- */
-- (void)loadRequest:(NSURLRequest *)request
-           progress:(NSProgress * _Nullable __autoreleasing * _Nullable)progress
-            success:(nullable NSString * (^)(NSHTTPURLResponse *response, NSString *HTML))success
-            failure:(nullable void (^)(NSError *error))failure;
-
-/**
- Asynchronously loads the data associated with a particular request with a specified MIME type and text encoding.
-
- @param request A URL request identifying the location of the content to load. This must not be `nil`.
- @param MIMEType The MIME type of the content. Defaults to the content type of the response if not specified.
- @param textEncodingName The IANA encoding name, as in `utf-8` or `utf-16`. Defaults to the response text encoding if not specified.
-@param progress A progress object monitoring the current download progress.
- @param success A block object to be executed when the request finishes loading successfully. This block returns the data to be loaded by the web view and takes two arguments: the response, and the downloaded data.
- @param failure A block object to be executed when the data task finishes unsuccessfully, or that finishes successfully, but encountered an error while parsing the response data. This block has no return value and takes a single argument: the error that occurred.
- */
-- (void)loadRequest:(NSURLRequest *)request
-           MIMEType:(nullable NSString *)MIMEType
-   textEncodingName:(nullable NSString *)textEncodingName
-           progress:(NSProgress * _Nullable __autoreleasing * _Nullable)progress
-            success:(nullable NSData * (^)(NSHTTPURLResponse *response, NSData *data))success
-            failure:(nullable void (^)(NSError *error))failure;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif

+ 0 - 157
ios/JianYuIOS/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m

@@ -1,157 +0,0 @@
-// UIWebView+AFNetworking.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import "UIWebView+AFNetworking.h"
-
-#import <objc/runtime.h>
-
-#if TARGET_OS_IOS
-
-#import "AFHTTPSessionManager.h"
-#import "AFURLResponseSerialization.h"
-#import "AFURLRequestSerialization.h"
-
-@interface UIWebView (_AFNetworking)
-@property (readwrite, nonatomic, strong, setter = af_setURLSessionTask:) NSURLSessionDataTask *af_URLSessionTask;
-@end
-
-@implementation UIWebView (_AFNetworking)
-
-- (NSURLSessionDataTask *)af_URLSessionTask {
-    return (NSURLSessionDataTask *)objc_getAssociatedObject(self, @selector(af_URLSessionTask));
-}
-
-- (void)af_setURLSessionTask:(NSURLSessionDataTask *)af_URLSessionTask {
-    objc_setAssociatedObject(self, @selector(af_URLSessionTask), af_URLSessionTask, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-@end
-
-#pragma mark -
-
-@implementation UIWebView (AFNetworking)
-
-- (AFHTTPSessionManager  *)sessionManager {
-    static AFHTTPSessionManager *_af_defaultHTTPSessionManager = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        _af_defaultHTTPSessionManager = [[AFHTTPSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
-        _af_defaultHTTPSessionManager.requestSerializer = [AFHTTPRequestSerializer serializer];
-        _af_defaultHTTPSessionManager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    });
-
-    return objc_getAssociatedObject(self, @selector(sessionManager)) ?: _af_defaultHTTPSessionManager;
-}
-
-- (void)setSessionManager:(AFHTTPSessionManager *)sessionManager {
-    objc_setAssociatedObject(self, @selector(sessionManager), sessionManager, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (AFHTTPResponseSerializer <AFURLResponseSerialization> *)responseSerializer {
-    static AFHTTPResponseSerializer <AFURLResponseSerialization> *_af_defaultResponseSerializer = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        _af_defaultResponseSerializer = [AFHTTPResponseSerializer serializer];
-    });
-
-    return objc_getAssociatedObject(self, @selector(responseSerializer)) ?: _af_defaultResponseSerializer;
-}
-
-- (void)setResponseSerializer:(AFHTTPResponseSerializer<AFURLResponseSerialization> *)responseSerializer {
-    objc_setAssociatedObject(self, @selector(responseSerializer), responseSerializer, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-#pragma mark -
-
-- (void)loadRequest:(NSURLRequest *)request
-           progress:(NSProgress * _Nullable __autoreleasing * _Nullable)progress
-            success:(NSString * (^)(NSHTTPURLResponse *response, NSString *HTML))success
-            failure:(void (^)(NSError *error))failure
-{
-    [self loadRequest:request MIMEType:nil textEncodingName:nil progress:progress success:^NSData *(NSHTTPURLResponse *response, NSData *data) {
-        NSStringEncoding stringEncoding = NSUTF8StringEncoding;
-        if (response.textEncodingName) {
-            CFStringEncoding encoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)response.textEncodingName);
-            if (encoding != kCFStringEncodingInvalidId) {
-                stringEncoding = CFStringConvertEncodingToNSStringEncoding(encoding);
-            }
-        }
-
-        NSString *string = [[NSString alloc] initWithData:data encoding:stringEncoding];
-        if (success) {
-            string = success(response, string);
-        }
-
-        return [string dataUsingEncoding:stringEncoding];
-    } failure:failure];
-}
-
-- (void)loadRequest:(NSURLRequest *)request
-           MIMEType:(NSString *)MIMEType
-   textEncodingName:(NSString *)textEncodingName
-           progress:(NSProgress * _Nullable __autoreleasing * _Nullable)progress
-            success:(NSData * (^)(NSHTTPURLResponse *response, NSData *data))success
-            failure:(void (^)(NSError *error))failure
-{
-    NSParameterAssert(request);
-
-    if (self.af_URLSessionTask.state == NSURLSessionTaskStateRunning || self.af_URLSessionTask.state == NSURLSessionTaskStateSuspended) {
-        [self.af_URLSessionTask cancel];
-    }
-    self.af_URLSessionTask = nil;
-
-    __weak __typeof(self)weakSelf = self;
-    __block NSURLSessionDataTask *dataTask;
-    dataTask = [self.sessionManager
-                dataTaskWithRequest:request
-                uploadProgress:nil
-                downloadProgress:nil
-                completionHandler:^(NSURLResponse * _Nonnull response, id  _Nonnull responseObject, NSError * _Nullable error) {
-                    __strong __typeof(weakSelf) strongSelf = weakSelf;
-                    if (error) {
-                        if (failure) {
-                            failure(error);
-                        }
-                    } else {
-                        if (success) {
-                            success((NSHTTPURLResponse *)response, responseObject);
-                        }
-                        [strongSelf loadData:responseObject MIMEType:MIMEType textEncodingName:textEncodingName baseURL:[dataTask.currentRequest URL]];
-
-                        if ([strongSelf.delegate respondsToSelector:@selector(webViewDidFinishLoad:)]) {
-                            [strongSelf.delegate webViewDidFinishLoad:strongSelf];
-                        }
-                    }
-                }];
-    self.af_URLSessionTask = dataTask;
-    if (progress != nil) {
-        *progress = [self.sessionManager downloadProgressForTask:dataTask];
-    }
-    [self.af_URLSessionTask resume];
-
-    if ([self.delegate respondsToSelector:@selector(webViewDidStartLoad:)]) {
-        [self.delegate webViewDidStartLoad:self];
-    }
-}
-
-@end
-
-#endif

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 341 - 336
ios/JianYuIOS/Pods/Pods.xcodeproj/project.pbxproj


+ 1 - 1
ios/JianYuIOS/Pods/zkprotocol/Pods/zkprotocol/Push.pbobjc.m

@@ -13,7 +13,7 @@
  #import "GPBProtocolBuffers_RuntimeSupport.h"
 #endif
 
-#import "Pods/zkprotocol/Push.pbobjc.h"
+#import "Push.pbobjc.h"
 // @@protoc_insertion_point(imports)
 
 #pragma clang diagnostic push

+ 1 - 1
ios/JianYuIOS/Pods/zkprotocol/Pods/zkprotocol/Push.pbrpc.h

@@ -4,7 +4,7 @@
 #import <Foundation/Foundation.h>
 
 #if !defined(GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO) || !GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO
-#import "Pods/zkprotocol/Push.pbobjc.h"
+#import "Push.pbobjc.h"
 #endif
 
 #if !defined(GPB_GRPC_PROTOCOL_ONLY) || !GPB_GRPC_PROTOCOL_ONLY

+ 2 - 2
ios/JianYuIOS/Pods/zkprotocol/Pods/zkprotocol/Push.pbrpc.m

@@ -2,8 +2,8 @@
 // source: Pods/zkprotocol/push.proto
 
 #if !defined(GPB_GRPC_PROTOCOL_ONLY) || !GPB_GRPC_PROTOCOL_ONLY
-#import "Pods/zkprotocol/Push.pbrpc.h"
-#import "Pods/zkprotocol/Push.pbobjc.h"
+#import "Push.pbrpc.h"
+#import "Push.pbobjc.h"
 #import <ProtoRPC/ProtoRPCLegacy.h>
 #import <RxLibrary/GRXWriter+Immediate.h>
 

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно