diff --git a/Podfile b/Podfile index 449af00..3c46d77 100644 --- a/Podfile +++ b/Podfile @@ -1,7 +1,7 @@ source 'https://github.com/CocoaPods/Specs.git' #source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' #inhibit_all_warnings! -platform :ios, '8.0' +platform :ios, '9.0' #use_frameworks! target:tongxin do diff --git a/Podfile.lock b/Podfile.lock index 81f8507..28bd3cb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -185,6 +185,6 @@ SPEC CHECKSUMS: YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30 ZXNavigationBar: a8ceb13fe37f9ca894cf6ae22d805cbdbb9ad6b1 -PODFILE CHECKSUM: cd88adffda787ab946cd74a1f75120552b9feba8 +PODFILE CHECKSUM: 84c82f7dbea6eaeaec0ddfd11a5e5ac73a0f5999 COCOAPODS: 1.12.1 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 81f8507..28bd3cb 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -185,6 +185,6 @@ SPEC CHECKSUMS: YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30 ZXNavigationBar: a8ceb13fe37f9ca894cf6ae22d805cbdbb9ad6b1 -PODFILE CHECKSUM: cd88adffda787ab946cd74a1f75120552b9feba8 +PODFILE CHECKSUM: 84c82f7dbea6eaeaec0ddfd11a5e5ac73a0f5999 COCOAPODS: 1.12.1 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 65c1a4c..b1fcad3 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -5136,8 +5136,8 @@ BFDFE7DC352907FC980B868725387E98 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1240; - LastUpgradeCheck = 1240; + LastSwiftUpdateCheck = 1300; + LastUpgradeCheck = 1300; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -6181,26 +6181,6 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 0213CE76377C5E59001F202DEF282C78 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D42DF6ABB6ABB476BF4DA7274A86666D /* Pods-tongxin.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACH_O_TYPE = staticlib; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; 0E80DEFEEE248B25BF309BF212D79225 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = DF873C879C88CD26931FFE114BCD107B /* AMapSearch.release.xcconfig */; @@ -6238,27 +6218,6 @@ }; name = Debug; }; - 1669236E7D1148A9E37A3C2D32D26749 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 0FD120E9277EAC87F3CB484E5A2937E3 /* Pods-tongxin.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACH_O_TYPE = staticlib; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; 174B2F06A5CAF81D89A2B844EAFD815C /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 8D2086BD1AF9C58754FC45507EDEA2FF /* AMap3DMap.release.xcconfig */; @@ -6320,6 +6279,27 @@ }; name = Release; }; + 24E21C8AD36EACC104074446C72316D3 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 592C398B062BEA627DB76106D425D632 /* Pods-tongxin-tongxinUITests.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; 2567B82DE7449969244AFB7D7DAF1E07 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = BA7A5B276461B11D208C12155FE2AFB1 /* LSTCategory.release.xcconfig */; @@ -6344,6 +6324,72 @@ }; name = Release; }; + 25AD9454612BF454A1E3DC4CD4FA8C6D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRIP_INSTALLED_PRODUCT = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + SYMROOT = "${SRCROOT}/../build"; + }; + name = Debug; + }; 26DCD40252F6ACF255B384A72D87FE13 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 6B417523AA90107C5C024A6807C00415 /* LSTTimer.debug.xcconfig */; @@ -6488,27 +6534,6 @@ }; name = Release; }; - 4BF2FE974E250B25C56A837DE485C2E4 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 592C398B062BEA627DB76106D425D632 /* Pods-tongxin-tongxinUITests.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACH_O_TYPE = staticlib; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; 54E036C78DA9FBA4E4457D3D64C20617 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7CE1B5A25E84CB1135DC36FBDF545DD5 /* DZNEmptyDataSet.debug.xcconfig */; @@ -6732,68 +6757,6 @@ }; name = Debug; }; - 6D42DC62C4F2E194221DF89C48496C98 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_RELEASE=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - STRIP_INSTALLED_PRODUCT = NO; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; - SYMROOT = "${SRCROOT}/../build"; - }; - name = Release; - }; 6E5C51C95CDCA26CD0B9FADC5A64F33D /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = E1C83C43FB994CDAB98BD7426E58CAA1 /* JLAuthorizationManager.debug.xcconfig */; @@ -6924,6 +6887,27 @@ }; name = Debug; }; + 81FDEA46AA0A599BCF62C78A4529ACB8 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 0FD120E9277EAC87F3CB484E5A2937E3 /* Pods-tongxin.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; 850BFDC6EA2046BF95E03C33C61967A5 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 8674333B3CE90F312BE830AC64C66FCF /* ZXNavigationBar.release.xcconfig */; @@ -7155,7 +7139,7 @@ }; name = Release; }; - B2A411C58CDF34406D85BBF6D6CADD20 /* Debug */ = { + AE3A68F1F3AA3E8704BE676613C2953B /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = F041E5816A7D4CF2214711A5A2F415A4 /* Pods-tongxin-tongxinUITests.debug.xcconfig */; buildSettings = { @@ -7163,7 +7147,7 @@ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACH_O_TYPE = staticlib; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; @@ -7175,6 +7159,27 @@ }; name = Debug; }; + BB0F7E2C003F0DC26B6DA470B04AB55C /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C94E65CC96AC032767544854A96D8015 /* Pods-tongxinTests.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; BEC3560717BDF5B1A74C117A85C1431C /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 94D2395414D85FBCB5FD93B736361909 /* AMapLocation.release.xcconfig */; @@ -7250,6 +7255,68 @@ }; name = Release; }; + CA547D2C7E9A8A153DC2B27FBE00B112 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "POD_CONFIGURATION_RELEASE=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + STRIP_INSTALLED_PRODUCT = NO; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + SYMROOT = "${SRCROOT}/../build"; + }; + name = Release; + }; CE8BF9B3B01D511FFE1BCE4CF9568FB0 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 07CFB6373BCAC4147581593BCA9CB66D /* FSCalendar.release.xcconfig */; @@ -7298,27 +7365,6 @@ }; name = Release; }; - D471ACED6E12C55AD1B50EF5A87AB04B /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = C94E65CC96AC032767544854A96D8015 /* Pods-tongxinTests.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACH_O_TYPE = staticlib; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; D47B02C232C84B5375F3383BCC7562AD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 43C869D3D3FF0B221D3E437A1F5A3A0C /* IQKeyboardManager.debug.xcconfig */; @@ -7402,92 +7448,6 @@ }; name = Debug; }; - E4D0D44B090D4284607EBBC4E71A96C1 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_DEBUG=1", - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - STRIP_INSTALLED_PRODUCT = NO; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - SYMROOT = "${SRCROOT}/../build"; - }; - name = Debug; - }; - E5188B42646A370DAC4C2336F56A5654 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9BD20ECD6D09FCBB41A83BDD8E3B779E /* Pods-tongxinTests.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACH_O_TYPE = staticlib; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; E541C8EDE38B55B1548A2D43C090499C /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = DBF700CDAF5D42CD71DDA9FE2ACE9A3C /* YYModel.release.xcconfig */; @@ -7585,6 +7545,26 @@ }; name = Debug; }; + F5C1D3E4247CCD4646AA9447ED00D8CA /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9BD20ECD6D09FCBB41A83BDD8E3B779E /* Pods-tongxinTests.debug.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; FA7FA85A33E0791B786488053856DCE2 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 1D0926CA012FDF2F28E5B60CEDAD704D /* AMap3DMap.debug.xcconfig */; @@ -7622,6 +7602,26 @@ }; name = Release; }; + FE77742A884D3D75406265D947289AE6 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D42DF6ABB6ABB476BF4DA7274A86666D /* Pods-tongxin.debug.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; FEDD379B1C62C3D77AC205D41D5667CA /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 384903D94BF421C03A8E6BF3EFD24B3E /* MOBFoundation.debug.xcconfig */; @@ -7668,8 +7668,8 @@ 1AF011325B1B6BE94A5152411E308B14 /* Build configuration list for PBXNativeTarget "Pods-tongxinTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - E5188B42646A370DAC4C2336F56A5654 /* Debug */, - D471ACED6E12C55AD1B50EF5A87AB04B /* Release */, + F5C1D3E4247CCD4646AA9447ED00D8CA /* Debug */, + BB0F7E2C003F0DC26B6DA470B04AB55C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -7713,8 +7713,8 @@ 3A61EA049F8E810B9BEB21528C9D08B7 /* Build configuration list for PBXNativeTarget "Pods-tongxin-tongxinUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( - B2A411C58CDF34406D85BBF6D6CADD20 /* Debug */, - 4BF2FE974E250B25C56A837DE485C2E4 /* Release */, + AE3A68F1F3AA3E8704BE676613C2953B /* Debug */, + 24E21C8AD36EACC104074446C72316D3 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -7731,8 +7731,8 @@ 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - E4D0D44B090D4284607EBBC4E71A96C1 /* Debug */, - 6D42DC62C4F2E194221DF89C48496C98 /* Release */, + 25AD9454612BF454A1E3DC4CD4FA8C6D /* Debug */, + CA547D2C7E9A8A153DC2B27FBE00B112 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -7812,8 +7812,8 @@ 8C3BDF7A40B3E76D1D34A70BCBAA737C /* Build configuration list for PBXNativeTarget "Pods-tongxin" */ = { isa = XCConfigurationList; buildConfigurations = ( - 0213CE76377C5E59001F202DEF282C78 /* Debug */, - 1669236E7D1148A9E37A3C2D32D26749 /* Release */, + FE77742A884D3D75406265D947289AE6 /* Debug */, + 81FDEA46AA0A599BCF62C78A4529ACB8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Pods/Pods.xcodeproj/xcuserdata/ecell.xcuserdatad/xcschemes/AFNetworking.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/ecell.xcuserdatad/xcschemes/AFNetworking.xcscheme index ca161f7..1c2859c 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/ecell.xcuserdatad/xcschemes/AFNetworking.xcscheme +++ b/Pods/Pods.xcodeproj/xcuserdata/ecell.xcuserdatad/xcschemes/AFNetworking.xcscheme @@ -1,6 +1,6 @@ - - - - @@ -782,8 +766,8 @@ filePath = "tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageInputView/XHMessageInputView.m" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "489" - endingLineNumber = "489" + startingLineNumber = "490" + endingLineNumber = "490" landmarkName = "-setupMessageInputViewBarWithStyle:" landmarkType = "7"> @@ -944,7 +928,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "454" endingLineNumber = "454" - landmarkName = "-quitThisVC" + landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "7"> diff --git a/tongxin/Assets.xcassets/通用/comm_report_select_no.imageset/Contents.json b/tongxin/Assets.xcassets/通用/comm_report_select_no.imageset/Contents.json new file mode 100644 index 0000000..730d086 --- /dev/null +++ b/tongxin/Assets.xcassets/通用/comm_report_select_no.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "comm_report_select_no@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/tongxin/Assets.xcassets/通用/comm_report_select_no.imageset/comm_report_select_no@2x.png b/tongxin/Assets.xcassets/通用/comm_report_select_no.imageset/comm_report_select_no@2x.png new file mode 100644 index 0000000..74b0803 Binary files /dev/null and b/tongxin/Assets.xcassets/通用/comm_report_select_no.imageset/comm_report_select_no@2x.png differ diff --git a/tongxin/Assets.xcassets/通用/comm_report_select_yes.imageset/Contents.json b/tongxin/Assets.xcassets/通用/comm_report_select_yes.imageset/Contents.json new file mode 100644 index 0000000..4093809 --- /dev/null +++ b/tongxin/Assets.xcassets/通用/comm_report_select_yes.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "comm_report_select_yes@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/tongxin/Assets.xcassets/通用/comm_report_select_yes.imageset/comm_report_select_yes@2x.png b/tongxin/Assets.xcassets/通用/comm_report_select_yes.imageset/comm_report_select_yes@2x.png new file mode 100644 index 0000000..5edd496 Binary files /dev/null and b/tongxin/Assets.xcassets/通用/comm_report_select_yes.imageset/comm_report_select_yes@2x.png differ diff --git a/tongxin/Helpers/myHelper.h b/tongxin/Helpers/myHelper.h index 1c82908..468d48e 100644 --- a/tongxin/Helpers/myHelper.h +++ b/tongxin/Helpers/myHelper.h @@ -58,10 +58,10 @@ // 39.108.227.227 api.ecellsz.com //#ifdef DEBUG //测试环境 -#define xBaseUrl @"http://api.test.ecellsz.com" +//#define xBaseUrl @"http://api.test.ecellsz.com" //#else //正式环境 -//#define xBaseUrl @"http://39.108.227.227" +#define xBaseUrl @"http://39.108.227.227" //#endif //#define xBaseUrl @"http://39.108.227.227" //#define xBaseUrl @"http://api.test.ecellsz.com" diff --git a/tongxin/Helpers/myHttp/NetHeader.h b/tongxin/Helpers/myHttp/NetHeader.h index 59f5d64..462562b 100644 --- a/tongxin/Helpers/myHttp/NetHeader.h +++ b/tongxin/Helpers/myHttp/NetHeader.h @@ -83,7 +83,7 @@ typedef NS_ENUM(NSInteger, HTTP_CODE) #define HTTP_SINGLEDELETE_MESSAGE @"getway/single/[imei]/message" /// 删除单聊信息 -#define HTTP_REPORT__MESSAGE @"getway/accounts/[openid]/report" +#define HTTP_REPORT__MESSAGE @"getway/accounts/[openid]/report2" #define HTTP_POST_ACCOUNTS_LOGIN @"getway/accounts/login"//用户登录 diff --git a/tongxin/Info.plist b/tongxin/Info.plist index 73db093..2b549a6 100644 --- a/tongxin/Info.plist +++ b/tongxin/Info.plist @@ -27,7 +27,7 @@ CFBundleURLSchemes - tongxin + zuoyebang diff --git a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Common/XHConfigurationHelper.m b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Common/XHConfigurationHelper.m index c5f8404..43fdc81 100755 --- a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Common/XHConfigurationHelper.m +++ b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Common/XHConfigurationHelper.m @@ -64,8 +64,8 @@ NSString *kXHMessageTableCustomLoadAvatarNetworImageKey = @"com.HUAJIE.MDK.XHMes self = [super init]; if (self) { self.popMenuTitles = @[NSLocalizedStringFromTable(@"copy", @"MessageDisplayKitString", @"复制文本消息"), - NSLocalizedStringFromTable(@"transpond", @"MessageDisplayKitString", @"转发"), - NSLocalizedStringFromTable(@"favorites", @"MessageDisplayKitString", @"收藏"), +// NSLocalizedStringFromTable(@"transpond", @"MessageDisplayKitString", @"转发"), +// NSLocalizedStringFromTable(@"favorites", @"MessageDisplayKitString", @"收藏"), NSLocalizedStringFromTable(@"report", @"MessageDisplayKitString", @"举报"),]; } return self; diff --git a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m index 623efe7..8de9eda 100755 --- a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m +++ b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m @@ -519,7 +519,7 @@ static CGPoint delayOffset = {0.0}; _allowsSendText = YES; _allowsSendVoice = YES; _allowsSendMultiMedia = YES; - _allowsSendFace = YES; + _allowsSendFace = NO;/// 是否支持发送表情 _inputViewStyle = XHMessageInputViewStyleFlat; self.delegate = self; diff --git a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Models/XHMessage.h b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Models/XHMessage.h index 9bda7c0..066a500 100755 --- a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Models/XHMessage.h +++ b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Models/XHMessage.h @@ -55,6 +55,7 @@ @property (nonatomic, copy) NSNumber *senderType; @property (nonatomic, copy) NSNumber *type; @property (nonatomic, copy) NSString *online; +@property (nonatomic, copy) NSString *Id; @property (nonatomic, assign) BOOL hide; diff --git a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Models/XHMessage.m b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Models/XHMessage.m index 50aa63a..6d5faca 100755 --- a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Models/XHMessage.m +++ b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Models/XHMessage.m @@ -15,6 +15,13 @@ @synthesize timestamp = _timestamp; @synthesize avator = _avator; ++ (NSDictionary *)modelCustomPropertyMapper +{ + return @{ + @"Id":@"id", + }; +} + - (void)setType:(NSNumber *)type{ _type = type; if ([type isEqualToNumber:@(10005)]) { @@ -251,6 +258,7 @@ _avator = [aDecoder decodeObjectForKey:@"avator"]; _senderID = [aDecoder decodeObjectForKey:@"senderID"]; + _Id = [aDecoder decodeObjectForKey:@"id"]; _timestamp = [aDecoder decodeObjectForKey:@"timestamp"]; _messageMediaType = [[aDecoder decodeObjectForKey:@"messageMediaType"] integerValue]; @@ -286,6 +294,7 @@ [aCoder encodeObject:self.senderID forKey:@"senderID"]; + [aCoder encodeObject:self.Id forKey:@"Id"]; [aCoder encodeObject:self.timestamp forKey:@"timestamp"]; [aCoder encodeObject:[NSNumber numberWithInteger:self.messageMediaType] forKey:@"messageMediaType"]; diff --git a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageTableViewCell.m b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageTableViewCell.m index 172bc0f..c460f4a 100644 --- a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageTableViewCell.m +++ b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageContentViews/XHMessageTableViewCell.m @@ -11,6 +11,7 @@ #import "JSToastDialogs.h" #import "User.h" #import "UIViewExt.h" +#import "CommonPopView.h" static const CGFloat kXHLabelPadding = 5.0f; static const CGFloat kXHTimeStampLabelHeight = 20.0f; @@ -132,6 +133,13 @@ static const CGFloat kXHUserNameLabelHeight = 12; - (void)transpond:(id)sender { DLog(@"Cell was transpond"); + NSLog(@"消息id--%@",self.messageBubbleView.message.Id); + if (self.messageBubbleView.message.content && self.messageBubbleView.message.senderID) { + + CommonPopView *popview = [CommonPopView new]; + [popview reportPopView:self.messageBubbleView.message.senderID]; + + } } - (void)favorites:(id)sender { @@ -141,21 +149,13 @@ static const CGFloat kXHUserNameLabelHeight = 12; - (void)more:(id)sender { DLog(@"Cell was more"); - if (self.messageBubbleView.message.content && self.messageBubbleView.message.senderID) { - - NSMutableDictionary *parameters = [[NSMutableDictionary alloc] init]; - [parameters setObject:self.messageBubbleView.message.content forKey:@"content"]; - [parameters setObject:self.messageBubbleView.message.senderID forKey:@"reportID"]; - - Circle *circle = [[Circle alloc] init]; - [circle reportCircleMessageWithParameters:parameters - success:^(id responseObject) { - DLog(@"Report success"); - [[JSToastDialogs shareInstance] makeToast:@"举报发送成功" duration:3]; - } failure:^{ - DLog(@"Report failure"); - }]; - } +// NSLog(@"消息id--%@",self.messageBubbleView.message.Id); +// if (self.messageBubbleView.message.content && self.messageBubbleView.message.senderID) { +// +// CommonPopView *popview = [CommonPopView new]; +// [popview reportPopView:self.messageBubbleView.message.senderID]; +// +// } } diff --git a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageInputView/XHMessageInputView.m b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageInputView/XHMessageInputView.m index be4af41..1f8960a 100755 --- a/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageInputView/XHMessageInputView.m +++ b/tongxin/ThirdPartyLib/MessageDisplayKit/Classes/Views/MessageInputView/XHMessageInputView.m @@ -391,7 +391,8 @@ } // 输入框的高度和宽度 update by lsz 2020-12-10 把按钮的长度去掉 - CGFloat width = CGRectGetWidth(self.bounds) - (allButtonWidth ? allButtonWidth : (textViewLeftMargin * 2)); + //CGFloat width = CGRectGetWidth(self.bounds) - (allButtonWidth ? allButtonWidth : (textViewLeftMargin * 2)); 如果支持表情发送需要使用此宽度 + CGFloat width = CGRectGetWidth(self.bounds) - (allButtonWidth ? allButtonWidth : (textViewLeftMargin * 2)) - (self.allowsSendMultiMedia ? 10 : 20); CGFloat height = [XHMessageInputView textViewLineHeight]; if (self.allowsSendText) { diff --git a/tongxin/VC/HomeMeg/Chat/ChatViewController.m b/tongxin/VC/HomeMeg/Chat/ChatViewController.m index 43513e1..e42610d 100644 --- a/tongxin/VC/HomeMeg/Chat/ChatViewController.m +++ b/tongxin/VC/HomeMeg/Chat/ChatViewController.m @@ -632,7 +632,7 @@ [self.infoCircle sendCircleMessageWithParameters:parameters success:^(id responseObject) { [weakSelf setLastShowTimetampWithMessage:message]; - message.id = responseObject[@"id"]; + message.Id = responseObject[@"id"]; [weakSelf addMessage:message]; self->presenter.isSended = YES; } failure:^{ @@ -648,7 +648,7 @@ [parameters setValue:cUser.accesstoken forKey:@"token"]; [self.infoCircle sendCircleMessageWithImei:self.imei Parameters:parameters success:^(id responseObject) { [weakSelf setLastShowTimetampWithMessage:message]; - message.id = responseObject[@"id"]; + message.Id = responseObject[@"id"]; [weakSelf addMessage:message]; self->presenter.isSended = YES; } failure:^{ @@ -683,7 +683,7 @@ @"content":UIImageJPEGRepresentation(photo, 0.1)}]; [self.infoCircle sendCircleMessageWithParameters:parameters success:^(id responseObject) { - message.id = responseObject[@"id"]; + message.Id = responseObject[@"id"]; [weakSelf setLastShowTimetampWithMessage:message]; [weakSelf addMessage:message]; [weakSelf finishSendMessageWithBubbleMessageType:XHBubbleMessageMediaTypePhoto]; @@ -697,7 +697,7 @@ [parameters setValue:cUser.openid forKey:@"openid"]; [parameters setValue:cUser.accesstoken forKey:@"token"]; [self.infoCircle sendCircleMessageWithImei:self.imei Parameters:parameters success:^(id responseObject) { - message.id = responseObject[@"id"]; + message.Id = responseObject[@"id"]; [weakSelf setLastShowTimetampWithMessage:message]; [weakSelf addMessage:message]; [weakSelf finishSendMessageWithBubbleMessageType:XHBubbleMessageMediaTypePhoto]; @@ -764,7 +764,7 @@ NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithDictionary:@{@"type":@(3), @"content":data,@"duration":voiceDuration}]; [self.infoCircle sendCircleMessageWithParameters:parameters success:^(id responseObject) { - message.id = responseObject[@"id"]; + message.Id = responseObject[@"id"]; [weakSelf setLastShowTimetampWithMessage:message]; NSString *fileName = [NSString stringWithFormat:@"%@.wav",responseObject[@"id"]]; NSString *wavPath = [CJFileUtility documentsPathSubDir:@"msg_audio" andFile:fileName]; @@ -787,7 +787,7 @@ [parameters setValue:cUser.accesstoken forKey:@"token"]; [self.infoCircle sendCircleMessageWithImei:self.imei Parameters:parameters success:^(id responseObject) { - message.id = responseObject[@"id"]; + message.Id = responseObject[@"id"]; [weakSelf setLastShowTimetampWithMessage:message]; NSString *fileName = [NSString stringWithFormat:@"%@.wav",responseObject[@"id"]]; NSString *wavPath = [CJFileUtility documentsPathSubDir:@"msg_audio" andFile:fileName]; @@ -826,7 +826,7 @@ [self.infoCircle sendCircleMessageWithParameters:parameters success:^(id responseObject) { [weakSelf setLastShowTimetampWithMessage:emotionMessage]; - emotionMessage.id = responseObject[@"id"]; + emotionMessage.Id = responseObject[@"id"]; [weakSelf addMessage:emotionMessage]; self->presenter.isSended = YES; [weakSelf finishSendMessageWithBubbleMessageType:XHBubbleMessageMediaTypeEmotion]; @@ -843,7 +843,7 @@ [parameters setValue:cUser.accesstoken forKey:@"token"]; [self.infoCircle sendCircleMessageWithImei:self.imei Parameters:parameters success:^(id responseObject) { [weakSelf setLastShowTimetampWithMessage:emotionMessage]; - emotionMessage.id = responseObject[@"id"]; + emotionMessage.Id = responseObject[@"id"]; [weakSelf addMessage:emotionMessage]; self->presenter.isSended = YES; [weakSelf finishSendMessageWithBubbleMessageType:XHBubbleMessageMediaTypeEmotion]; diff --git a/tongxin/VC/HomeMeg/CommonPopView.h b/tongxin/VC/HomeMeg/CommonPopView.h index de54363..48f162c 100644 --- a/tongxin/VC/HomeMeg/CommonPopView.h +++ b/tongxin/VC/HomeMeg/CommonPopView.h @@ -35,6 +35,10 @@ typedef void(^okTouch)(void); /// 绑定手机号弹窗 - (void)bangdinPhone; +#pragma mark 举报弹窗 +/// 举报弹窗 +- (void)reportPopView:(NSString *)reportID; + @end NS_ASSUME_NONNULL_END diff --git a/tongxin/VC/HomeMeg/CommonPopView.m b/tongxin/VC/HomeMeg/CommonPopView.m index 201d30d..692db35 100644 --- a/tongxin/VC/HomeMeg/CommonPopView.m +++ b/tongxin/VC/HomeMeg/CommonPopView.m @@ -9,12 +9,17 @@ #import "CommonPopView.h" #import #import "User.h" +#import "ReportTableViewCell.h" +#import "Circle.h" -@interface CommonPopView () +@interface CommonPopView () /// 背景 @property (nonatomic ,weak) UIView *bgView; +@property (nonatomic ,strong) NSArray *titleArr; + +@property (nonatomic ,strong) NSMutableArray *selectTitleArr; @property (nonatomic ,weak) UITextField *phoneField; @@ -272,6 +277,137 @@ [self showPopView]; } +#pragma mark 举报弹窗 +/// 举报弹窗 +- (void)reportPopView:(NSString *)reportID +{ + WEAKSELF + UIView *bgView = [UICommon ui_view:CGRectZero backgroundColor:KKWhiteColorColor cornerRadius:18 borderWidth:0 borderColor:KKWhiteColorColor]; + self.bgView = bgView; + [self addSubview:bgView]; + [bgView mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerX.equalTo(self); + make.centerY.equalTo(self); + make.size.mas_equalTo(CGSizeMake(331, 520)); + }]; + + UILabel *titleLabel = [UICommon ui_label:CGRectZero lines:0 align:NSTextAlignmentCenter font:FontBold_(20) textColor:KKBlack20 text:@"举报" Radius:0]; + [bgView addSubview:titleLabel]; + [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerX.equalTo(bgView); + make.top.equalTo(bgView).offset(24); + }]; + + UILabel *textsLabel = [UICommon ui_label:CGRectZero lines:0 align:NSTextAlignmentCenter font:FontBold_(16) textColor:KKBlack20 text:@"举报原因" Radius:0]; + [bgView addSubview:textsLabel]; + [textsLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(bgView).offset(20); + make.top.equalTo(titleLabel.mas_bottom).offset(18); + }]; + + + + UIButton *escBtn = [UICommon ui_buttonSimple:CGRectZero font:Font_(16) normalColor:KKBlack20 normalText:@"取消" click:^(id x) { + [self dismiss]; + }]; + escBtn.layer.borderWidth = 1; + escBtn.layer.borderColor = RGB(240, 239, 237).CGColor; + escBtn.layer.cornerRadius = 24; + //view.layer.masksToBounds = YES; + [bgView addSubview:escBtn]; + [escBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(bgView.mas_bottom).inset(28); + make.left.equalTo(bgView).offset(24); + make.size.mas_equalTo(CGSizeMake(125, 48)); + }]; + + UIButton *okBtn = [UICommon ui_buttonSimple:CGRectZero font:Font_(16) normalColor:KKWhiteColorColor normalText:@"确定" click:^(id x) { + if (self.selectTitleArr.count <= 0) + { + [UICommon MessageErrorText:@"请选择举报原因"]; + return; + } + [self setReport:reportID]; + }]; + okBtn.backgroundColor = mainColor; + okBtn.layer.cornerRadius = 24; + okBtn.layer.masksToBounds = YES; + [bgView addSubview:okBtn]; + [okBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerY.equalTo(escBtn); + make.right.equalTo(bgView.mas_right).inset(24); + make.size.mas_equalTo(CGSizeMake(125, 48)); + }]; + + self.titleArr = @[@"谣言",@"有害信息",@"违法信息",@"色情低俗",@"人身攻击",@"垃圾营销",@"政治敏感",@"其他"]; + + UITableView *tableView = [UITableView new]; + tableView.delegate = self; + tableView.dataSource = self; + tableView.rowHeight = 40; + tableView.separatorStyle = UITableViewCellSeparatorStyleNone; + [tableView registerClass:ReportTableViewCell.class forCellReuseIdentifier:NSStringFromClass(ReportTableViewCell.class)]; + tableView.showsVerticalScrollIndicator = NO; + tableView.allowsMultipleSelection = YES; //让CollectionView支持多选 + tableView.scrollEnabled = NO; + [bgView addSubview:tableView]; + [tableView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(bgView).inset(20); + make.top.equalTo(textsLabel.mas_bottom).offset(5); + make.bottom.equalTo(escBtn.mas_top).inset(15); + }]; + + + [self showPopView]; +} + + +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + ReportTableViewCell *cell = [ReportTableViewCell cellWithTableView:tableView indexPath:indexPath]; + cell.cellText = self.titleArr[indexPath.row]; + return cell; +} + +-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + NSLog(@"选择-%@",self.titleArr[indexPath.row]); + NSString *title = self.titleArr[indexPath.row]; + [self.selectTitleArr addObject:title]; +} + +-(void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath +{ + NSLog(@"取消选择-%@",self.titleArr[indexPath.row]); + NSString *title = self.titleArr[indexPath.row]; + [self.selectTitleArr removeObject:title]; +} + +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return self.titleArr.count; +} + + +- (void)setReport:(NSString *)reportID +{ + [UICommon MessageUpload:@"举报中"]; + NSMutableDictionary *parameters = [[NSMutableDictionary alloc] init]; + [parameters setObject:[self.selectTitleArr componentsJoinedByString:@"@"] forKey:@"content"]; + [parameters setObject:reportID forKey:@"reportID"]; + [parameters setValue:cUser.accesstoken forKey:@"accesstoken"]; + Circle *circle = [[Circle alloc] init]; + [circle reportCircleMessageWithParameters:parameters + success:^(id responseObject) { + [self dismiss]; + [UICommon HidenLoading]; + [UICommon MessageSuccessText:@"举报发送成功" isImg:YES]; + } failure:^{ + [UICommon MessageErrorText:@"举报失败"]; + }]; +} + + - (void)showPopView { @@ -365,6 +501,12 @@ static dispatch_source_t _timer; [self resetTimer]; } +- (NSMutableArray *)selectTitleArr +{ + if (!_selectTitleArr) _selectTitleArr = [NSMutableArray new]; + return _selectTitleArr; +} + /* // Only override drawRect: if you perform custom drawing. // An empty implementation adversely affects performance during animation. diff --git a/tongxin/VC/HomeMeg/ReportTableViewCell.h b/tongxin/VC/HomeMeg/ReportTableViewCell.h new file mode 100644 index 0000000..7fe6b11 --- /dev/null +++ b/tongxin/VC/HomeMeg/ReportTableViewCell.h @@ -0,0 +1,19 @@ +// +// ReportTableViewCell.h +// tongxin +// +// Created by ecell on 2023/9/7. +// Copyright © 2023 xTT. All rights reserved. +// + +#import "ZZTableViewCell.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface ReportTableViewCell : ZZTableViewCell + +@property (nonatomic ,strong) NSString *cellText; + +@end + +NS_ASSUME_NONNULL_END diff --git a/tongxin/VC/HomeMeg/ReportTableViewCell.m b/tongxin/VC/HomeMeg/ReportTableViewCell.m new file mode 100644 index 0000000..c2ccea3 --- /dev/null +++ b/tongxin/VC/HomeMeg/ReportTableViewCell.m @@ -0,0 +1,72 @@ +// +// ReportTableViewCell.m +// tongxin +// +// Created by ecell on 2023/9/7. +// Copyright © 2023 xTT. All rights reserved. +// + +#import "ReportTableViewCell.h" + +@interface ReportTableViewCell () + +@property (nonatomic ,weak) UIImageView *leftImg; + +@property (nonatomic ,weak) UILabel *textsLabel; + +@end + +@implementation ReportTableViewCell + +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; + if (self) + { + self.selectionStyle = UITableViewCellSelectionStyleNone; + self.backgroundColor = KKClearColor; + [self subCellView]; + } + + return self; +} + +- (void)setCellText:(NSString *)cellText +{ + _cellText = cellText; + self.textsLabel.text = cellText; +} + +- (void)subCellView +{ + UIImageView *leftImg = [UICommon ui_imageView:CGRectZero fileName:@"comm_report_select_no"]; + self.leftImg = leftImg; + [self.contentView addSubview:leftImg]; + [leftImg mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(self.contentView); + make.centerY.equalTo(self.contentView); + make.size.mas_equalTo(leftImg.image.size); + }]; + + UILabel *textsLabel = [UICommon ui_label:CGRectZero lines:0 align:NSTextAlignmentCenter font:FontBold_(16) textColor:KKBlack20 text:@"" Radius:0]; + self.textsLabel = textsLabel; + [self.contentView addSubview:textsLabel]; + [textsLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(leftImg.mas_right).offset(15); + make.centerY.equalTo(self.contentView); + }]; +} + +- (void)awakeFromNib { + [super awakeFromNib]; + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + self.leftImg.image = selected ? ImageName_(@"comm_report_select_yes") : ImageName_(@"comm_report_select_no"); + // Configure the view for the selected state +} + +@end diff --git a/tongxin/VC/WatchHome/DeviceInfo/QRcodeViewController.m b/tongxin/VC/WatchHome/DeviceInfo/QRcodeViewController.m index 21dd081..ce97a08 100644 --- a/tongxin/VC/WatchHome/DeviceInfo/QRcodeViewController.m +++ b/tongxin/VC/WatchHome/DeviceInfo/QRcodeViewController.m @@ -40,11 +40,17 @@ WEAKSELF Circle *circle = [cUser getCircleWithImei:cUser.cDevice.imei]; [circle getCircleInviteTokenSuccess:^(id responseObject){ +// NSString *codeStr = [weakSelf getUriWithDic:@{ +//// @"inviteToken":responseObject[@"inviteToken"], +// @"groupid":circle.groupid, +// @"imei":cUser.cDevice.imei} +// Url:responseObject[@"baseURL"]]; + NSString *codeStr = [weakSelf getUriWithDic:@{ // @"inviteToken":responseObject[@"inviteToken"], @"groupid":circle.groupid, @"imei":cUser.cDevice.imei} - Url:responseObject[@"baseURL"]]; + Url:@"https://smart.zuoyebang.com/watchdownload/"]; [weakSelf setImageViewWithCodeStr:codeStr]; // weakSelf.label_InviteToken.text = [NSString stringWithFormat:@"邀请码:%@",responseObject[@"inviteToken"]]; } failure:^{