Commit d1b76bdae3533bd2d9c58cca2f0c69dea83d1e50

Authored by daojian
1 parent a3389ea0

0.3.8版本 添加 1023 社区订单消息

CNLiveNewIMAManagerKit.podspec
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveNewIMAManagerKit' 10 s.name = 'CNLiveNewIMAManagerKit'
11 - s.version = '0.3.7' 11 + s.version = '0.3.8'
12 s.summary = 'A short description of CNLiveNewIMAManagerKit.' 12 s.summary = 'A short description of CNLiveNewIMAManagerKit.'
13 13
14 #s.description = <<-DESC 14 #s.description = <<-DESC
CNLiveNewIMAManagerKit/Classes/TIMCategory/TIMElem+ShowAPIs.m
@@ -560,6 +560,10 @@ @@ -560,6 +560,10 @@
560 { 560 {
561 return [NSClassFromString(@"CNOrderRemindCell") class]; 561 return [NSClassFromString(@"CNOrderRemindCell") class];
562 } 562 }
  563 + else if (msg.type == EIMAMSG_CommuntyOrder)
  564 + {
  565 + return [NSClassFromString(@"CNCommuntyMessageCell") class];
  566 + }
563 else 567 else
564 { 568 {
565 return [NSClassFromString(@"CNUnknownMsgCell") class]; 569 return [NSClassFromString(@"CNUnknownMsgCell") class];
@@ -830,6 +834,10 @@ @@ -830,6 +834,10 @@
830 return CGSizeMake(width, (180+10)*RATIO); 834 return CGSizeMake(width, (180+10)*RATIO);
831 } 835 }
832 break; 836 break;
  837 + case EIMAMSG_CommuntyOrder:
  838 + {
  839 + return CGSizeMake(width, (260+10)*RATIO);
  840 + }
833 default: 841 default:
834 break; 842 break;
835 } 843 }
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.h
@@ -104,6 +104,7 @@ typedef NS_ENUM(NSInteger, IMAMSGType) { @@ -104,6 +104,7 @@ typedef NS_ENUM(NSInteger, IMAMSGType) {
104 EIMAMSG_HaveCoupon , //有代领优惠券 104 EIMAMSG_HaveCoupon , //有代领优惠券
105 #pragma mark 社区 105 #pragma mark 社区
106 EIMAMSG_CommunityPaySuccess , //社区支付成功 106 EIMAMSG_CommunityPaySuccess , //社区支付成功
  107 + EIMAMSG_CommuntyOrder , //社区订单消息
107 108
108 #pragma mark 电商原生商品详情,电商原生订单详情 109 #pragma mark 电商原生商品详情,电商原生订单详情
109 EIMAMSG_ShopGoodsInfo , //电商原生商品详情 110 EIMAMSG_ShopGoodsInfo , //电商原生商品详情
@@ -146,6 +147,9 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) { @@ -146,6 +147,9 @@ typedef NS_ENUM(NSUInteger, CustomMsgType) {
146 CustomMsgTypeReceiveE_BusinessOrder = 1021, //接收到电商订单消息(弃用) 147 CustomMsgTypeReceiveE_BusinessOrder = 1021, //接收到电商订单消息(弃用)
147 CustomMsgTypeE_BusinessOrderPaySuceess = 1022, //电商订单支付成功消息提醒 148 CustomMsgTypeE_BusinessOrderPaySuceess = 1022, //电商订单支付成功消息提醒
148 149
  150 + ///社区订单消息
  151 + CustomMsgTypCommuntyOrder = 1023,
  152 +
149 CustomMsgTypeShareGoods = 1030, //分享电商商品 153 CustomMsgTypeShareGoods = 1030, //分享电商商品
150 154
151 CustomMsgTypeShopGoodsInfo = 11005, //电商原生商品详情 155 CustomMsgTypeShopGoodsInfo = 11005, //电商原生商品详情
CNLiveNewIMAManagerKit/Classes/TIMModel/MSG/IMAMsg.m
@@ -634,6 +634,10 @@ @@ -634,6 +634,10 @@
634 { 634 {
635 type = EIMAMSG_NewOrderRemind; 635 type = EIMAMSG_NewOrderRemind;
636 } 636 }
  637 + else if ([dic[@"type"] integerValue] == CustomMsgTypCommuntyOrder)
  638 + {
  639 + type = EIMAMSG_CommuntyOrder;
  640 + }
637 else { 641 else {
638 type = EIMAMSG_Unknown; 642 type = EIMAMSG_Unknown;
639 } 643 }
Example/CNLiveNewIMAManagerKit.xcodeproj/project.pbxproj
@@ -245,7 +245,7 @@ @@ -245,7 +245,7 @@
245 isa = PBXProject; 245 isa = PBXProject;
246 attributes = { 246 attributes = {
247 CLASSPREFIX = CNLIVE; 247 CLASSPREFIX = CNLIVE;
248 - LastUpgradeCheck = 0720; 248 + LastUpgradeCheck = 1320;
249 ORGANIZATIONNAME = iOSniuniu; 249 ORGANIZATIONNAME = iOSniuniu;
250 TargetAttributes = { 250 TargetAttributes = {
251 6003F589195388D20070C39A = { 251 6003F589195388D20070C39A = {
@@ -490,23 +490,38 @@ @@ -490,23 +490,38 @@
490 isa = XCBuildConfiguration; 490 isa = XCBuildConfiguration;
491 buildSettings = { 491 buildSettings = {
492 ALWAYS_SEARCH_USER_PATHS = NO; 492 ALWAYS_SEARCH_USER_PATHS = NO;
  493 + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
493 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; 494 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
494 CLANG_CXX_LIBRARY = "libc++"; 495 CLANG_CXX_LIBRARY = "libc++";
495 CLANG_ENABLE_MODULES = YES; 496 CLANG_ENABLE_MODULES = YES;
496 CLANG_ENABLE_OBJC_ARC = YES; 497 CLANG_ENABLE_OBJC_ARC = YES;
  498 + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
497 CLANG_WARN_BOOL_CONVERSION = YES; 499 CLANG_WARN_BOOL_CONVERSION = YES;
  500 + CLANG_WARN_COMMA = YES;
498 CLANG_WARN_CONSTANT_CONVERSION = YES; 501 CLANG_WARN_CONSTANT_CONVERSION = YES;
  502 + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
499 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; 503 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
500 CLANG_WARN_EMPTY_BODY = YES; 504 CLANG_WARN_EMPTY_BODY = YES;
501 CLANG_WARN_ENUM_CONVERSION = YES; 505 CLANG_WARN_ENUM_CONVERSION = YES;
  506 + CLANG_WARN_INFINITE_RECURSION = YES;
502 CLANG_WARN_INT_CONVERSION = YES; 507 CLANG_WARN_INT_CONVERSION = YES;
  508 + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
  509 + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
  510 + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
503 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; 511 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
  512 + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
  513 + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
  514 + CLANG_WARN_STRICT_PROTOTYPES = YES;
  515 + CLANG_WARN_SUSPICIOUS_MOVE = YES;
  516 + CLANG_WARN_UNREACHABLE_CODE = YES;
504 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 517 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
505 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 518 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
506 COPY_PHASE_STRIP = NO; 519 COPY_PHASE_STRIP = NO;
  520 + ENABLE_STRICT_OBJC_MSGSEND = YES;
507 ENABLE_TESTABILITY = YES; 521 ENABLE_TESTABILITY = YES;
508 GCC_C_LANGUAGE_STANDARD = gnu99; 522 GCC_C_LANGUAGE_STANDARD = gnu99;
509 GCC_DYNAMIC_NO_PIC = NO; 523 GCC_DYNAMIC_NO_PIC = NO;
  524 + GCC_NO_COMMON_BLOCKS = YES;
510 GCC_OPTIMIZATION_LEVEL = 0; 525 GCC_OPTIMIZATION_LEVEL = 0;
511 GCC_PREPROCESSOR_DEFINITIONS = ( 526 GCC_PREPROCESSOR_DEFINITIONS = (
512 "DEBUG=1", 527 "DEBUG=1",
@@ -519,7 +534,7 @@ @@ -519,7 +534,7 @@
519 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 534 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
520 GCC_WARN_UNUSED_FUNCTION = YES; 535 GCC_WARN_UNUSED_FUNCTION = YES;
521 GCC_WARN_UNUSED_VARIABLE = YES; 536 GCC_WARN_UNUSED_VARIABLE = YES;
522 - IPHONEOS_DEPLOYMENT_TARGET = 9.3; 537 + IPHONEOS_DEPLOYMENT_TARGET = 12.0;
523 ONLY_ACTIVE_ARCH = YES; 538 ONLY_ACTIVE_ARCH = YES;
524 SDKROOT = iphoneos; 539 SDKROOT = iphoneos;
525 TARGETED_DEVICE_FAMILY = "1,2"; 540 TARGETED_DEVICE_FAMILY = "1,2";
@@ -530,29 +545,44 @@ @@ -530,29 +545,44 @@
530 isa = XCBuildConfiguration; 545 isa = XCBuildConfiguration;
531 buildSettings = { 546 buildSettings = {
532 ALWAYS_SEARCH_USER_PATHS = NO; 547 ALWAYS_SEARCH_USER_PATHS = NO;
  548 + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
533 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; 549 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
534 CLANG_CXX_LIBRARY = "libc++"; 550 CLANG_CXX_LIBRARY = "libc++";
535 CLANG_ENABLE_MODULES = YES; 551 CLANG_ENABLE_MODULES = YES;
536 CLANG_ENABLE_OBJC_ARC = YES; 552 CLANG_ENABLE_OBJC_ARC = YES;
  553 + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
537 CLANG_WARN_BOOL_CONVERSION = YES; 554 CLANG_WARN_BOOL_CONVERSION = YES;
  555 + CLANG_WARN_COMMA = YES;
538 CLANG_WARN_CONSTANT_CONVERSION = YES; 556 CLANG_WARN_CONSTANT_CONVERSION = YES;
  557 + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
539 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; 558 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
540 CLANG_WARN_EMPTY_BODY = YES; 559 CLANG_WARN_EMPTY_BODY = YES;
541 CLANG_WARN_ENUM_CONVERSION = YES; 560 CLANG_WARN_ENUM_CONVERSION = YES;
  561 + CLANG_WARN_INFINITE_RECURSION = YES;
542 CLANG_WARN_INT_CONVERSION = YES; 562 CLANG_WARN_INT_CONVERSION = YES;
  563 + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
  564 + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
  565 + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
543 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; 566 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
  567 + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
  568 + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
  569 + CLANG_WARN_STRICT_PROTOTYPES = YES;
  570 + CLANG_WARN_SUSPICIOUS_MOVE = YES;
  571 + CLANG_WARN_UNREACHABLE_CODE = YES;
544 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 572 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
545 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 573 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
546 COPY_PHASE_STRIP = YES; 574 COPY_PHASE_STRIP = YES;
547 ENABLE_NS_ASSERTIONS = NO; 575 ENABLE_NS_ASSERTIONS = NO;
  576 + ENABLE_STRICT_OBJC_MSGSEND = YES;
548 GCC_C_LANGUAGE_STANDARD = gnu99; 577 GCC_C_LANGUAGE_STANDARD = gnu99;
  578 + GCC_NO_COMMON_BLOCKS = YES;
549 GCC_WARN_64_TO_32_BIT_CONVERSION = YES; 579 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
550 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; 580 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
551 GCC_WARN_UNDECLARED_SELECTOR = YES; 581 GCC_WARN_UNDECLARED_SELECTOR = YES;
552 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 582 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
553 GCC_WARN_UNUSED_FUNCTION = YES; 583 GCC_WARN_UNUSED_FUNCTION = YES;
554 GCC_WARN_UNUSED_VARIABLE = YES; 584 GCC_WARN_UNUSED_VARIABLE = YES;
555 - IPHONEOS_DEPLOYMENT_TARGET = 9.3; 585 + IPHONEOS_DEPLOYMENT_TARGET = 12.0;
556 SDKROOT = iphoneos; 586 SDKROOT = iphoneos;
557 TARGETED_DEVICE_FAMILY = "1,2"; 587 TARGETED_DEVICE_FAMILY = "1,2";
558 VALIDATE_PRODUCT = YES; 588 VALIDATE_PRODUCT = YES;
Example/CNLiveNewIMAManagerKit.xcodeproj/xcshareddata/xcschemes/CNLiveNewIMAManagerKit-Example.xcscheme
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <Scheme 2 <Scheme
3 - LastUpgradeVersion = "0720" 3 + LastUpgradeVersion = "1320"
4 version = "1.3"> 4 version = "1.3">
5 <BuildAction 5 <BuildAction
6 parallelizeBuildables = "YES" 6 parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@ @@ -27,6 +27,15 @@
27 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" 27 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" 28 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29 shouldUseLaunchSchemeArgsEnv = "YES"> 29 shouldUseLaunchSchemeArgsEnv = "YES">
  30 + <MacroExpansion>
  31 + <BuildableReference
  32 + BuildableIdentifier = "primary"
  33 + BlueprintIdentifier = "6003F589195388D20070C39A"
  34 + BuildableName = "CNLiveNewIMAManagerKit_Example.app"
  35 + BlueprintName = "CNLiveNewIMAManagerKit_Example"
  36 + ReferencedContainer = "container:CNLiveNewIMAManagerKit.xcodeproj">
  37 + </BuildableReference>
  38 + </MacroExpansion>
30 <Testables> 39 <Testables>
31 <TestableReference 40 <TestableReference
32 skipped = "NO"> 41 skipped = "NO">
@@ -39,17 +48,6 @@ @@ -39,17 +48,6 @@
39 </BuildableReference> 48 </BuildableReference>
40 </TestableReference> 49 </TestableReference>
41 </Testables> 50 </Testables>
42 - <MacroExpansion>  
43 - <BuildableReference  
44 - BuildableIdentifier = "primary"  
45 - BlueprintIdentifier = "6003F589195388D20070C39A"  
46 - BuildableName = "CNLiveNewIMAManagerKit_Example.app"  
47 - BlueprintName = "CNLiveNewIMAManagerKit_Example"  
48 - ReferencedContainer = "container:CNLiveNewIMAManagerKit.xcodeproj">  
49 - </BuildableReference>  
50 - </MacroExpansion>  
51 - <AdditionalOptions>  
52 - </AdditionalOptions>  
53 </TestAction> 51 </TestAction>
54 <LaunchAction 52 <LaunchAction
55 buildConfiguration = "Debug" 53 buildConfiguration = "Debug"
@@ -71,8 +69,6 @@ @@ -71,8 +69,6 @@
71 ReferencedContainer = "container:CNLiveNewIMAManagerKit.xcodeproj"> 69 ReferencedContainer = "container:CNLiveNewIMAManagerKit.xcodeproj">
72 </BuildableReference> 70 </BuildableReference>
73 </BuildableProductRunnable> 71 </BuildableProductRunnable>
74 - <AdditionalOptions>  
75 - </AdditionalOptions>  
76 </LaunchAction> 72 </LaunchAction>
77 <ProfileAction 73 <ProfileAction
78 buildConfiguration = "Release" 74 buildConfiguration = "Release"