Commit 74026d4d authored by 刘俊宏's avatar 刘俊宏

完成极光对接(缺业务)

parent d008d2f5
...@@ -326,6 +326,10 @@ ...@@ -326,6 +326,10 @@
F933F6D22452DAE100189561 /* TabBarContentClassView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F933F6D12452DAE000189561 /* TabBarContentClassView.swift */; }; F933F6D22452DAE100189561 /* TabBarContentClassView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F933F6D12452DAE000189561 /* TabBarContentClassView.swift */; };
F93E31F724721C4200524DFC /* EditOGPAdModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F93E31F624721C4200524DFC /* EditOGPAdModel.swift */; }; F93E31F724721C4200524DFC /* EditOGPAdModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F93E31F624721C4200524DFC /* EditOGPAdModel.swift */; };
F93E31FD24727A2D00524DFC /* ShowTimeSelectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F93E31FC24727A2D00524DFC /* ShowTimeSelectView.swift */; }; F93E31FD24727A2D00524DFC /* ShowTimeSelectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F93E31FC24727A2D00524DFC /* ShowTimeSelectView.swift */; };
F93E32052473C9C200524DFC /* jpush-extension-ios-1.1.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F93E32002473C9C200524DFC /* jpush-extension-ios-1.1.2.a */; };
F93E32062473C9C200524DFC /* jcore-ios-2.2.5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F93E32032473C9C200524DFC /* jcore-ios-2.2.5.a */; };
F93E32072473C9C200524DFC /* jpush-ios-3.3.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F93E32042473C9C200524DFC /* jpush-ios-3.3.3.a */; };
F93E32092473CD6500524DFC /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F93E32082473CD6500524DFC /* libresolv.tbd */; };
F94A314724624E9500FEC38E /* GetGelipayInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314624624E9500FEC38E /* GetGelipayInfoModel.swift */; }; F94A314724624E9500FEC38E /* GetGelipayInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314624624E9500FEC38E /* GetGelipayInfoModel.swift */; };
F94A314924624FA400FEC38E /* ShopAdministratorInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314824624FA400FEC38E /* ShopAdministratorInfoModel.swift */; }; F94A314924624FA400FEC38E /* ShopAdministratorInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314824624FA400FEC38E /* ShopAdministratorInfoModel.swift */; };
F94A314B246250DB00FEC38E /* GoodsDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314A246250DB00FEC38E /* GoodsDetailModel.swift */; }; F94A314B246250DB00FEC38E /* GoodsDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314A246250DB00FEC38E /* GoodsDetailModel.swift */; };
...@@ -814,6 +818,12 @@ ...@@ -814,6 +818,12 @@
F933F6D12452DAE000189561 /* TabBarContentClassView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabBarContentClassView.swift; sourceTree = "<group>"; }; F933F6D12452DAE000189561 /* TabBarContentClassView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabBarContentClassView.swift; sourceTree = "<group>"; };
F93E31F624721C4200524DFC /* EditOGPAdModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditOGPAdModel.swift; sourceTree = "<group>"; }; F93E31F624721C4200524DFC /* EditOGPAdModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditOGPAdModel.swift; sourceTree = "<group>"; };
F93E31FC24727A2D00524DFC /* ShowTimeSelectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowTimeSelectView.swift; sourceTree = "<group>"; }; F93E31FC24727A2D00524DFC /* ShowTimeSelectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowTimeSelectView.swift; sourceTree = "<group>"; };
F93E32002473C9C200524DFC /* jpush-extension-ios-1.1.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jpush-extension-ios-1.1.2.a"; sourceTree = "<group>"; };
F93E32012473C9C200524DFC /* JPushNotificationExtensionService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPushNotificationExtensionService.h; sourceTree = "<group>"; };
F93E32022473C9C200524DFC /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = "<group>"; };
F93E32032473C9C200524DFC /* jcore-ios-2.2.5.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jcore-ios-2.2.5.a"; sourceTree = "<group>"; };
F93E32042473C9C200524DFC /* jpush-ios-3.3.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jpush-ios-3.3.3.a"; sourceTree = "<group>"; };
F93E32082473CD6500524DFC /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
F94A314624624E9500FEC38E /* GetGelipayInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetGelipayInfoModel.swift; sourceTree = "<group>"; }; F94A314624624E9500FEC38E /* GetGelipayInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetGelipayInfoModel.swift; sourceTree = "<group>"; };
F94A314824624FA400FEC38E /* ShopAdministratorInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopAdministratorInfoModel.swift; sourceTree = "<group>"; }; F94A314824624FA400FEC38E /* ShopAdministratorInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopAdministratorInfoModel.swift; sourceTree = "<group>"; };
F94A314A246250DB00FEC38E /* GoodsDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsDetailModel.swift; sourceTree = "<group>"; }; F94A314A246250DB00FEC38E /* GoodsDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsDetailModel.swift; sourceTree = "<group>"; };
...@@ -995,6 +1005,8 @@ ...@@ -995,6 +1005,8 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
E0707DC72462457200E039A8 /* libz.tbd in Frameworks */,
F93E32092473CD6500524DFC /* libresolv.tbd in Frameworks */,
E03984982468F2DA00DFA56F /* SafariServices.framework in Frameworks */, E03984982468F2DA00DFA56F /* SafariServices.framework in Frameworks */,
E03984962468F2D100DFA56F /* Photos.framework in Frameworks */, E03984962468F2D100DFA56F /* Photos.framework in Frameworks */,
E03984942468F2CA00DFA56F /* UIKit.framework in Frameworks */, E03984942468F2CA00DFA56F /* UIKit.framework in Frameworks */,
...@@ -1007,6 +1019,7 @@ ...@@ -1007,6 +1019,7 @@
E0F1BE402469220D003015B2 /* libopencore-amrwb.a in Frameworks */, E0F1BE402469220D003015B2 /* libopencore-amrwb.a in Frameworks */,
E03984862468F25000DFA56F /* CoreVideo.framework in Frameworks */, E03984862468F25000DFA56F /* CoreVideo.framework in Frameworks */,
E0F1BE3C2469220D003015B2 /* RongIMLib.framework in Frameworks */, E0F1BE3C2469220D003015B2 /* RongIMLib.framework in Frameworks */,
F93E32072473C9C200524DFC /* jpush-ios-3.3.3.a in Frameworks */,
E03984842468F24300DFA56F /* CoreMedia.framework in Frameworks */, E03984842468F24300DFA56F /* CoreMedia.framework in Frameworks */,
E03984822468F23A00DFA56F /* CoreGraphics.framework in Frameworks */, E03984822468F23A00DFA56F /* CoreGraphics.framework in Frameworks */,
E03984802468F22E00DFA56F /* CoreAudio.framework in Frameworks */, E03984802468F22E00DFA56F /* CoreAudio.framework in Frameworks */,
...@@ -1017,11 +1030,12 @@ ...@@ -1017,11 +1030,12 @@
E03984782468F20800DFA56F /* AssetsLibrary.framework in Frameworks */, E03984782468F20800DFA56F /* AssetsLibrary.framework in Frameworks */,
E0707DD424624A6800E039A8 /* CoreLocation.framework in Frameworks */, E0707DD424624A6800E039A8 /* CoreLocation.framework in Frameworks */,
F905A7D5246CF57700E3A74D /* Parchment in Frameworks */, F905A7D5246CF57700E3A74D /* Parchment in Frameworks */,
E0707DC72462457200E039A8 /* libz.tbd in Frameworks */,
E0F1BE452469220D003015B2 /* libopencore-amrnb.a in Frameworks */, E0F1BE452469220D003015B2 /* libopencore-amrnb.a in Frameworks */,
E0707DC52462456C00E039A8 /* libc++.tbd in Frameworks */, E0707DC52462456C00E039A8 /* libc++.tbd in Frameworks */,
F93E32062473C9C200524DFC /* jcore-ios-2.2.5.a in Frameworks */,
F905A7D8246CF82400E3A74D /* SwipeCellKit in Frameworks */, F905A7D8246CF82400E3A74D /* SwipeCellKit in Frameworks */,
E0707DC32462456100E039A8 /* SystemConfiguration.framework in Frameworks */, E0707DC32462456100E039A8 /* SystemConfiguration.framework in Frameworks */,
F93E32052473C9C200524DFC /* jpush-extension-ios-1.1.2.a in Frameworks */,
E0707DC12462455B00E039A8 /* CoreTelephony.framework in Frameworks */, E0707DC12462455B00E039A8 /* CoreTelephony.framework in Frameworks */,
E0F1BE3D2469220D003015B2 /* RongSight.framework in Frameworks */, E0F1BE3D2469220D003015B2 /* RongSight.framework in Frameworks */,
E0707DBF2462455200E039A8 /* Security.framework in Frameworks */, E0707DBF2462455200E039A8 /* Security.framework in Frameworks */,
...@@ -1057,6 +1071,7 @@ ...@@ -1057,6 +1071,7 @@
824621C23DA37CD28A2F345F /* Frameworks */ = { 824621C23DA37CD28A2F345F /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
F93E32082473CD6500524DFC /* libresolv.tbd */,
E03984972468F2DA00DFA56F /* SafariServices.framework */, E03984972468F2DA00DFA56F /* SafariServices.framework */,
E03984952468F2D100DFA56F /* Photos.framework */, E03984952468F2D100DFA56F /* Photos.framework */,
E03984932468F2CA00DFA56F /* UIKit.framework */, E03984932468F2CA00DFA56F /* UIKit.framework */,
...@@ -1406,6 +1421,7 @@ ...@@ -1406,6 +1421,7 @@
E088CC882446FFA1000DAA8A /* Other */ = { E088CC882446FFA1000DAA8A /* Other */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
F93E31FE2473C9C200524DFC /* JPush */,
F956D560246A2D9C003FF510 /* LMNote */, F956D560246A2D9C003FF510 /* LMNote */,
F96E9D53246656A700B5B94A /* HGImage */, F96E9D53246656A700B5B94A /* HGImage */,
F9531F2A2465108800724BEE /* JXPhotoBrowser */, F9531F2A2465108800724BEE /* JXPhotoBrowser */,
...@@ -1942,6 +1958,26 @@ ...@@ -1942,6 +1958,26 @@
path = TabBarVc; path = TabBarVc;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
F93E31FE2473C9C200524DFC /* JPush */ = {
isa = PBXGroup;
children = (
F93E31FF2473C9C200524DFC /* Lib */,
);
path = JPush;
sourceTree = "<group>";
};
F93E31FF2473C9C200524DFC /* Lib */ = {
isa = PBXGroup;
children = (
F93E32002473C9C200524DFC /* jpush-extension-ios-1.1.2.a */,
F93E32012473C9C200524DFC /* JPushNotificationExtensionService.h */,
F93E32022473C9C200524DFC /* JPUSHService.h */,
F93E32032473C9C200524DFC /* jcore-ios-2.2.5.a */,
F93E32042473C9C200524DFC /* jpush-ios-3.3.3.a */,
);
path = Lib;
sourceTree = "<group>";
};
F94A315024626D4000FEC38E /* 工作中心 */ = { F94A315024626D4000FEC38E /* 工作中心 */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -3098,6 +3134,7 @@ ...@@ -3098,6 +3134,7 @@
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云", "$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
); );
PRODUCT_BUNDLE_IDENTIFIER = GeliBusinessPlatform.GeliBusinessPlatform; PRODUCT_BUNDLE_IDENTIFIER = GeliBusinessPlatform.GeliBusinessPlatform;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
...@@ -3133,6 +3170,7 @@ ...@@ -3133,6 +3170,7 @@
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云", "$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
); );
PRODUCT_BUNDLE_IDENTIFIER = GeliBusinessPlatform.GeliBusinessPlatform; PRODUCT_BUNDLE_IDENTIFIER = GeliBusinessPlatform.GeliBusinessPlatform;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
......
This diff is collapsed.
...@@ -14,5 +14,6 @@ ...@@ -14,5 +14,6 @@
#import "WYHead.h" #import "WYHead.h"
#import "FSCalendar.h" #import "FSCalendar.h"
#import "BabyBluetooth.h" #import "BabyBluetooth.h"
#import "JPUSHService.h"
#endif /* Bridge_Header_h */ #endif /* Bridge_Header_h */
This diff is collapsed.
/*
* | | | | \ \ / / | | | | / _______|
* | |____| | \ \/ / | |____| | / /
* | |____| | \ / | |____| | | | _____
* | | | | / \ | | | | | | |____ |
* | | | | / /\ \ | | | | \ \______| |
* | | | | /_/ \_\ | | | | \_________|
*
* Copyright (c) 2017 Shenzhen HXHG. All rights reserved.
*/
#import <Foundation/Foundation.h>
#define JPUSH_EXTENSION_VERSION_NUMBER 1.1.2
@class UNNotificationRequest;
@interface JPushNotificationExtensionService : NSObject
/**
设置appkey(需要与main target中的appkey相同)
*/
+ (void)jpushSetAppkey:(NSString *)appkey;
/**
apns送达
@param request apns请求
@param completion 回调
*/
+ (void)jpushReceiveNotificationRequest:(UNNotificationRequest *)request with:(void (^)(void))completion;
/**
关闭日志
默认为开启
建议发布时关闭以减少不必要的IO
*/
+ (void)setLogOff;
@end
...@@ -43,15 +43,15 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg ...@@ -43,15 +43,15 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
//MARK:--loginVC //MARK:--loginVC
func addLoginVc (isAgain:Bool){ func addLoginVc (isAgain:Bool){
// let vc = LoginViewController() let vc = LoginViewController()
// vc.delegate = self vc.delegate = self
// let contentView = vc let contentView = vc
let vc = ProductDetailViewController() // let vc = ProductDetailViewController()
// // //
let contentView = vc // let contentView = vc
if let windowScene = sceneC as? UIWindowScene { if let windowScene = sceneC as? UIWindowScene {
......
...@@ -99,6 +99,10 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel ...@@ -99,6 +99,10 @@ class LoginViewController: BaseViewController, CodeViewDelegate,GeliAlertViewDel
UserDefaults.standard.synchronize() UserDefaults.standard.synchronize()
self.loginBtn.isLoading = false self.loginBtn.isLoading = false
self.delegate?.successLogin() self.delegate?.successLogin()
JPUSHService.setAlias(self.phoneTF.text, completion: { (resCode, alias, num) in
}, seq: 1433223)
}) { (error) in }) { (error) in
self.loginBtn.isLoading = false self.loginBtn.isLoading = false
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment