Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2.0 #9

Merged
merged 2 commits into from
Feb 15, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
13 changes: 1 addition & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -9,20 +9,9 @@ UserInterfaceState.xcuserstate
Untitled.xcworkspace/
xcuserdata/
UserInterface.xcuserstate
QIMUIVendorKit/QIMUIVendorKit.xcworkspace/
QIMDataBase/QIMDataBase.xcworkspace/


QIMCommon/Podfile.lock
QIMCommonCategories/Podfile.lock
QIMDataBase/Podfile.lock
QIMGeneralModule/Podfile.lock
QIMIPadKit/Podfile.lock
QIMKitVendor/Podfile.lock
QIMNoteUI/Podfile.lock
package-lock.json
QIMSDK/Podfile.lock
QIMUIKit/Podfile.lock
QIMUIVendorKit/Podfile.lock

QIMPublicRedefineHeader/QIMPublicRedefineHeader.xcodeproj
*/.idea/
178 changes: 98 additions & 80 deletions IMSDK-iOS.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Binary file not shown.
1 change: 0 additions & 1 deletion IMSDK-iOS/AppDelegate.m
Original file line number Diff line number Diff line change
@@ -289,7 +289,6 @@ - (void)applicationDidEnterBackground:(UIApplication *)application
NSLog(@"Supported background:%@", [UIDevice currentDevice].multitaskingSupported ? @"YES" : @"NO");
[[QIMKit sharedInstance] setWillCancelLogin:YES];
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
[[QIMWatchDog sharedInstance] start];
[[QIMKit sharedInstance] saveUserDefault];
[QIMKit updateSessionListToKeyChain];
[QIMKit updateGroupListToKeyChain];
2 changes: 2 additions & 0 deletions IMSDK-iOS/Info.plist
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>IMSDK-iOSDemo</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
14 changes: 5 additions & 9 deletions Podfile
Original file line number Diff line number Diff line change
@@ -13,17 +13,13 @@ target 'IMSDK-iOS' do

# Pods for IMSDK-iOS
pod 'QIMSDK', path: './QIMSDK'
pod 'QIMUIKit', path: './QIMUIKit'
pod 'QIMRNKit', path: './QIMRNKit'
pod 'QIMPublicRedefineHeader', path: './QIMPublicRedefineHeader'

pod 'QIMKitVendor', path: './QIMKitVendor'
pod 'QIMGeneralModule', path: './QIMGeneralModule'
pod 'QIMCommon', path: './QIMCommon'
pod 'QIMUIKit', '~> 2.0'
pod 'QIMRNKit', path: './QIMRNKit'
pod 'QIMKitVendor'
pod 'QIMGeneralModule'
pod 'QIMCommonCategories'
pod 'QIMDataBase'



project 'IMSDK-iOS.project'
# 取决于你的工程如何组织,你的node_modules文件夹可能会在别的地方。
# 请将:path后面的内容修改为正确的路径。
Binary file removed QIMCommon/.DS_Store
Binary file not shown.
65 changes: 0 additions & 65 deletions QIMCommon/QIMCommon.podspec

This file was deleted.

Loading