diff --git a/LIKE/LIKE.xcodeproj/project.pbxproj b/LIKE/LIKE.xcodeproj/project.pbxproj index 68decf3..21a9937 100755 --- a/LIKE/LIKE.xcodeproj/project.pbxproj +++ b/LIKE/LIKE.xcodeproj/project.pbxproj @@ -15,6 +15,13 @@ 131915671B8C26C400EC0F42 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 131915661B8C26C400EC0F42 /* MessageUI.framework */; }; 131915691B8C625A00EC0F42 /* 二维码.png in Resources */ = {isa = PBXBuildFile; fileRef = 131915681B8C625A00EC0F42 /* 二维码.png */; }; 1319156B1B8C863100EC0F42 /* 旅行.png in Resources */ = {isa = PBXBuildFile; fileRef = 1319156A1B8C863100EC0F42 /* 旅行.png */; }; + 132622881B8EC5290074C589 /* libMobClickLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 132622851B8EC5290074C589 /* libMobClickLibrary.a */; }; + 1326228D1B8EE1150074C589 /* 变形金刚.png in Resources */ = {isa = PBXBuildFile; fileRef = 132622891B8EE1150074C589 /* 变形金刚.png */; }; + 1326228E1B8EE1150074C589 /* 钢铁侠.png in Resources */ = {isa = PBXBuildFile; fileRef = 1326228A1B8EE1150074C589 /* 钢铁侠.png */; }; + 1326228F1B8EE1150074C589 /* 手办.png in Resources */ = {isa = PBXBuildFile; fileRef = 1326228B1B8EE1150074C589 /* 手办.png */; }; + 132622901B8EE1150074C589 /* 星球大战.png in Resources */ = {isa = PBXBuildFile; fileRef = 1326228C1B8EE1150074C589 /* 星球大战.png */; }; + 1326229B1B8EF5850074C589 /* Wasted.png in Resources */ = {isa = PBXBuildFile; fileRef = 132622991B8EF5850074C589 /* Wasted.png */; }; + 1326229C1B8EF5850074C589 /* Wasted2.png in Resources */ = {isa = PBXBuildFile; fileRef = 1326229A1B8EF5850074C589 /* Wasted2.png */; }; 133A31831B5D09C500AB74A4 /* CollectionIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 133A31821B5D09C500AB74A4 /* CollectionIcon@3x.png */; }; 133A31851B5D0D3400AB74A4 /* SearchPlaceholderIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 133A31841B5D0D3400AB74A4 /* SearchPlaceholderIcon@3x.png */; }; 133D3C7D1AE78DC9008F303D /* LKAssistiveTouchButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 133D3C7C1AE78DC9008F303D /* LKAssistiveTouchButton.m */; }; @@ -66,7 +73,6 @@ 134D92F41B8DA8A0004CFAC8 /* 喷漆.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92ED1B8DA8A0004CFAC8 /* 喷漆.png */; }; 134D92F51B8DA8A0004CFAC8 /* 摄影.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92EE1B8DA8A0004CFAC8 /* 摄影.png */; }; 134D92F61B8DA8A0004CFAC8 /* 游戏.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92EF1B8DA8A0004CFAC8 /* 游戏.png */; }; - 134D92F81B8DB18E004CFAC8 /* 手办.png in Resources */ = {isa = PBXBuildFile; fileRef = 134D92F71B8DB18E004CFAC8 /* 手办.png */; }; 134F929F1AFCB77400784185 /* LikesPage@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 134F929E1AFCB77400784185 /* LikesPage@3x.png */; }; 134F92A21AFCB84B00784185 /* LKLikesPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 134F92A11AFCB84B00784185 /* LKLikesPage.m */; }; 135735191B2EC6FC0032515C /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 135735181B2EC6FC0032515C /* libicucore.dylib */; }; @@ -653,7 +659,6 @@ 13D9BF2C1AEB997E0020C94F /* Pro.png in Resources */ = {isa = PBXBuildFile; fileRef = 13D9BF231AEB997E0020C94F /* Pro.png */; }; 13D9BF2D1AEB997E0020C94F /* Vivid.png in Resources */ = {isa = PBXBuildFile; fileRef = 13D9BF241AEB997E0020C94F /* Vivid.png */; }; 13DA0FC61AEB8AFE005B9476 /* CameraFocus@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 13DA0FC51AEB8AFE005B9476 /* CameraFocus@3x.png */; }; - 13DA0FCB1AEB8D8E005B9476 /* libMobClickLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13DA0FC81AEB8D8E005B9476 /* libMobClickLibrary.a */; }; 13DEEBF91AE75585005E01A6 /* AlreadyFocusWrite@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 13DEEBF61AE75585005E01A6 /* AlreadyFocusWrite@3x.png */; }; 13DEEBFA1AE75585005E01A6 /* EachOtherFocusWrite@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 13DEEBF71AE75585005E01A6 /* EachOtherFocusWrite@3x.png */; }; 13DEEBFB1AE75585005E01A6 /* FocusWirte@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 13DEEBF81AE75585005E01A6 /* FocusWirte@3x.png */; }; @@ -782,6 +787,15 @@ 131915661B8C26C400EC0F42 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; 131915681B8C625A00EC0F42 /* 二维码.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "二维码.png"; sourceTree = ""; }; 1319156A1B8C863100EC0F42 /* 旅行.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "旅行.png"; sourceTree = ""; }; + 132622851B8EC5290074C589 /* libMobClickLibrary.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMobClickLibrary.a; sourceTree = ""; }; + 132622861B8EC5290074C589 /* MobClick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClick.h; sourceTree = ""; }; + 132622871B8EC5290074C589 /* MobClickSocialAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClickSocialAnalytics.h; sourceTree = ""; }; + 132622891B8EE1150074C589 /* 变形金刚.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "变形金刚.png"; sourceTree = ""; }; + 1326228A1B8EE1150074C589 /* 钢铁侠.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "钢铁侠.png"; sourceTree = ""; }; + 1326228B1B8EE1150074C589 /* 手办.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "手办.png"; sourceTree = ""; }; + 1326228C1B8EE1150074C589 /* 星球大战.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "星球大战.png"; sourceTree = ""; }; + 132622991B8EF5850074C589 /* Wasted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Wasted.png; sourceTree = ""; }; + 1326229A1B8EF5850074C589 /* Wasted2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Wasted2.png; sourceTree = ""; }; 133A31821B5D09C500AB74A4 /* CollectionIcon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "CollectionIcon@3x.png"; sourceTree = ""; }; 133A31841B5D0D3400AB74A4 /* SearchPlaceholderIcon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "SearchPlaceholderIcon@3x.png"; sourceTree = ""; }; 133D3C7B1AE78DC9008F303D /* LKAssistiveTouchButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LKAssistiveTouchButton.h; sourceTree = ""; }; @@ -876,7 +890,6 @@ 134D92ED1B8DA8A0004CFAC8 /* 喷漆.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "喷漆.png"; sourceTree = ""; }; 134D92EE1B8DA8A0004CFAC8 /* 摄影.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "摄影.png"; sourceTree = ""; }; 134D92EF1B8DA8A0004CFAC8 /* 游戏.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "游戏.png"; sourceTree = ""; }; - 134D92F71B8DB18E004CFAC8 /* 手办.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "手办.png"; sourceTree = ""; }; 134F929E1AFCB77400784185 /* LikesPage@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LikesPage@3x.png"; sourceTree = ""; }; 134F92A01AFCB84B00784185 /* LKLikesPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LKLikesPage.h; sourceTree = ""; }; 134F92A11AFCB84B00784185 /* LKLikesPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LKLikesPage.m; sourceTree = ""; }; @@ -2022,9 +2035,6 @@ 13D9BF231AEB997E0020C94F /* Pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Pro.png; sourceTree = ""; }; 13D9BF241AEB997E0020C94F /* Vivid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Vivid.png; sourceTree = ""; }; 13DA0FC51AEB8AFE005B9476 /* CameraFocus@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "CameraFocus@3x.png"; sourceTree = ""; }; - 13DA0FC81AEB8D8E005B9476 /* libMobClickLibrary.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMobClickLibrary.a; sourceTree = ""; }; - 13DA0FC91AEB8D8E005B9476 /* MobClick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClick.h; sourceTree = ""; }; - 13DA0FCA1AEB8D8E005B9476 /* MobClickSocialAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClickSocialAnalytics.h; sourceTree = ""; }; 13DEEBF61AE75585005E01A6 /* AlreadyFocusWrite@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AlreadyFocusWrite@3x.png"; sourceTree = ""; }; 13DEEBF71AE75585005E01A6 /* EachOtherFocusWrite@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EachOtherFocusWrite@3x.png"; sourceTree = ""; }; 13DEEBF81AE75585005E01A6 /* FocusWirte@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "FocusWirte@3x.png"; sourceTree = ""; }; @@ -2201,6 +2211,7 @@ 135735191B2EC6FC0032515C /* libicucore.dylib in Frameworks */, 138EDEC71AD7B1DA0020957C /* libxml2.dylib in Frameworks */, 1387C33F1B313B5300B065A7 /* FBSDKLoginKit.framework in Frameworks */, + 132622881B8EC5290074C589 /* libMobClickLibrary.a in Frameworks */, 138EDEC51AD7B1D20020957C /* libz.dylib in Frameworks */, 1387C33D1B3139B700B065A7 /* FBSDKCoreKit.framework in Frameworks */, 13F504EF1B0AF4EA00D8D484 /* libWeChatSDK.a in Frameworks */, @@ -2210,7 +2221,6 @@ 138EDE8D1AD7B0A30020957C /* libleveldb.a in Frameworks */, 13F5051C1B0CA05600D8D484 /* TencentOpenAPI.framework in Frameworks */, 135E8A9A1B450DA200C2270C /* MAMapKit.framework in Frameworks */, - 13DA0FCB1AEB8D8E005B9476 /* libMobClickLibrary.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2405,6 +2415,8 @@ 13D9BF241AEB997E0020C94F /* Vivid.png */, 1359F49D1B6A237400A0ABE9 /* GtaTrevor.png */, 1359F49E1B6A237400A0ABE9 /* GtaFranklin.png */, + 132622991B8EF5850074C589 /* Wasted.png */, + 1326229A1B8EF5850074C589 /* Wasted2.png */, ); path = FilterImage; sourceTree = ""; @@ -4110,9 +4122,9 @@ 13DA0FC71AEB8D8E005B9476 /* UMAnalytics */ = { isa = PBXGroup; children = ( - 13DA0FC81AEB8D8E005B9476 /* libMobClickLibrary.a */, - 13DA0FC91AEB8D8E005B9476 /* MobClick.h */, - 13DA0FCA1AEB8D8E005B9476 /* MobClickSocialAnalytics.h */, + 132622851B8EC5290074C589 /* libMobClickLibrary.a */, + 132622861B8EC5290074C589 /* MobClick.h */, + 132622871B8EC5290074C589 /* MobClickSocialAnalytics.h */, ); path = UMAnalytics; sourceTree = ""; @@ -4637,7 +4649,10 @@ 13F505091B0C5EA100D8D484 /* Share */ = { isa = PBXGroup; children = ( - 134D92F71B8DB18E004CFAC8 /* 手办.png */, + 132622891B8EE1150074C589 /* 变形金刚.png */, + 1326228A1B8EE1150074C589 /* 钢铁侠.png */, + 1326228B1B8EE1150074C589 /* 手办.png */, + 1326228C1B8EE1150074C589 /* 星球大战.png */, 134D92E91B8DA8A0004CFAC8 /* 高达.png */, 134D92EA1B8DA8A0004CFAC8 /* 狗.png */, 134D92EB1B8DA8A0004CFAC8 /* 猫.png */, @@ -4850,6 +4865,8 @@ 1369D0D21B82E7EE00498950 /* more.png in Resources */, 135D5C041ADFD21E00811B06 /* CameraCut@3x.png in Resources */, 138EDF0C1AD7E19D0020957C /* LoginBackground@3x.jpg in Resources */, + 132622901B8EE1150074C589 /* 星球大战.png in Resources */, + 1326229B1B8EF5850074C589 /* Wasted.png in Resources */, 13925A911B1477D2004D0656 /* NavBarIconSearch_blue@2x.png in Resources */, 13F21F3C1B0F1D6200124291 /* WeiboSDK.bundle in Resources */, 13E3EE021B60955400A48E76 /* zh2TW.txt in Resources */, @@ -4876,6 +4893,7 @@ 13925A921B1477D2004D0656 /* NavBarIconSearch_white@2x.png in Resources */, 13478CB71B6636770012EDA2 /* LittleSP@3x.png in Resources */, 1359F4A31B6A24B800A0ABE9 /* Gta-driving@3x.png in Resources */, + 1326228D1B8EE1150074C589 /* 变形金刚.png in Resources */, 135D5C061ADFD21E00811B06 /* CameraFlash@3x.png in Resources */, 138EDEFB1AD7DBA00020957C /* TabBarNotification@3x.png in Resources */, 135D5C281AE0E37800811B06 /* CameraFilter@3x.png in Resources */, @@ -4918,12 +4936,12 @@ 13E1A2C81AE63BAB00E24C3C /* NavigationBarSet@3x.png in Resources */, 13DEEC1C1AE789E6005E01A6 /* LC_WebStop@2x.png in Resources */, 135735221B2EE7D10032515C /* country.plist in Resources */, - 134D92F81B8DB18E004CFAC8 /* 手办.png in Resources */, 13E1A2D11AE644C200E24C3C /* EachOtherFocusGray@3x.png in Resources */, 13B6C1961AE8E8EA008912C0 /* NotificationIcon@3x.png in Resources */, 134D92F51B8DA8A0004CFAC8 /* 摄影.png in Resources */, 134D92F31B8DA8A0004CFAC8 /* 美食.png in Resources */, 13D9BF271AEB997E0020C94F /* Diana.png in Resources */, + 1326228E1B8EE1150074C589 /* 钢铁侠.png in Resources */, 135DBAF71AE60577004AD150 /* NavigationBarMore@3x.png in Resources */, 1319156B1B8C863100EC0F42 /* 旅行.png in Resources */, 133A31851B5D0D3400AB74A4 /* SearchPlaceholderIcon@3x.png in Resources */, @@ -4934,6 +4952,7 @@ 134D92F21B8DA8A0004CFAC8 /* 猫.png in Resources */, 1359F49F1B6A237400A0ABE9 /* GtaTrevor.png in Resources */, 135E8AA01B4511B900C2270C /* AMap.bundle in Resources */, + 1326229C1B8EF5850074C589 /* Wasted2.png in Resources */, 13E27EED1AF8A67200C17362 /* VisitorIcon@3x.png in Resources */, 138EDEF91AD7DAD20020957C /* TabBarCamera@3x.png in Resources */, 13D9BF261AEB997E0020C94F /* Dawn.png in Resources */, @@ -4943,6 +4962,7 @@ 13FCC0931ADF5E9C0008DB41 /* TagAdd@3x.png in Resources */, 13D9BF281AEB997E0020C94F /* Holga.png in Resources */, 1359F4A01B6A237400A0ABE9 /* GtaFranklin.png in Resources */, + 1326228F1B8EE1150074C589 /* 手办.png in Resources */, 13D9BF2A1AEB997E0020C94F /* Luna.png in Resources */, 1357352B1B2EF44E0032515C /* QQLogin@3x.png in Resources */, 13E27F0E1AFA1A4900C17362 /* HomeLikeIcon@3x.png in Resources */, @@ -5666,8 +5686,8 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Distribution: Zhenjun Wang (BT5C5YCZ44)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Zhenjun Wang (BT5C5YCZ44)"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -5710,8 +5730,8 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Distribution: Zhenjun Wang (BT5C5YCZ44)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Zhenjun Wang (BT5C5YCZ44)"; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -5736,8 +5756,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Distribution: Zhenjun Wang (BT5C5YCZ44)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Zhenjun Wang (BT5C5YCZ44)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/LIKE/LKExternal/Tencent", @@ -5761,7 +5781,10 @@ "$(PROJECT_DIR)/LIKE/LKExternal/WeChat", "$(PROJECT_DIR)/LIKE/LKExternal/Weibo", ); - OTHER_LDFLAGS = "-all_load"; + OTHER_LDFLAGS = ( + "-all_load", + "-ObjC", + ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = 1; @@ -5773,8 +5796,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Distribution: Zhenjun Wang (BT5C5YCZ44)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Zhenjun Wang (BT5C5YCZ44)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/LIKE/LKExternal/Tencent", @@ -5798,7 +5821,10 @@ "$(PROJECT_DIR)/LIKE/LKExternal/WeChat", "$(PROJECT_DIR)/LIKE/LKExternal/Weibo", ); - OTHER_LDFLAGS = "-all_load"; + OTHER_LDFLAGS = ( + "-all_load", + "-ObjC", + ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = 1; diff --git a/LIKE/LIKE.xcodeproj/project.xcworkspace/xcuserdata/leer.xcuserdatad/UserInterfaceState.xcuserstate b/LIKE/LIKE.xcodeproj/project.xcworkspace/xcuserdata/leer.xcuserdatad/UserInterfaceState.xcuserstate index 35029a4..cdee5d9 100644 Binary files a/LIKE/LIKE.xcodeproj/project.xcworkspace/xcuserdata/leer.xcuserdatad/UserInterfaceState.xcuserstate and b/LIKE/LIKE.xcodeproj/project.xcworkspace/xcuserdata/leer.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/LIKE/LIKE.xcodeproj/xcuserdata/leer.xcuserdatad/xcschemes/LIKE.xcscheme b/LIKE/LIKE.xcodeproj/xcuserdata/leer.xcuserdatad/xcschemes/LIKE.xcscheme index c06b5d1..218445d 100755 --- a/LIKE/LIKE.xcodeproj/xcuserdata/leer.xcuserdatad/xcschemes/LIKE.xcscheme +++ b/LIKE/LIKE.xcodeproj/xcuserdata/leer.xcuserdatad/xcschemes/LIKE.xcscheme @@ -70,7 +70,7 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" + buildConfiguration = "Release" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" @@ -97,7 +97,7 @@ shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" + buildConfiguration = "Release" debugDocumentVersioning = "YES"> @@ -114,7 +114,7 @@ buildConfiguration = "Debug"> diff --git a/LIKE/LIKE/AppDelegate.m b/LIKE/LIKE/AppDelegate.m index 5f192d3..6cba8dd 100755 --- a/LIKE/LIKE/AppDelegate.m +++ b/LIKE/LIKE/AppDelegate.m @@ -75,6 +75,7 @@ -(void) load:(NSDictionary *)launchOptions // UMeng [MobClick startWithAppkey:@"54bf7949fd98c563bc00075d" reportPolicy:SENDWIFIONLY channelId:@"App Store"]; + [MobClick checkUpdate]; // CMD diff --git a/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/1136.png b/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/1136.png index b0e367f..833b7a6 100644 Binary files a/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/1136.png and b/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/1136.png differ diff --git a/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/1334.png b/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/1334.png index 825925d..95d43d9 100644 Binary files a/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/1334.png and b/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/1334.png differ diff --git a/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/2208.png b/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/2208.png index 940a536..40ac71d 100644 Binary files a/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/2208.png and b/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/2208.png differ diff --git a/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/960.png b/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/960.png index 473a117..c6a60aa 100644 Binary files a/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/960.png and b/LIKE/LIKE/Images.xcassets/LaunchImage.launchimage/960.png differ diff --git a/LIKE/LIKE/Info.plist b/LIKE/LIKE/Info.plist index 66ec178..62cb695 100755 --- a/LIKE/LIKE/Info.plist +++ b/LIKE/LIKE/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.0 + 1.1.1 CFBundleSignature ???? CFBundleURLTypes @@ -74,7 +74,7 @@ CFBundleVersion - 1.1.0.8 + 1.1.1.4 FacebookAppID 368579790017819 FacebookDisplayName diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/da.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/da.lproj/Localizable.strings index 0d40447..caa559d 100755 --- a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/da.lproj/Localizable.strings +++ b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/da.lproj/Localizable.strings @@ -51,6 +51,14 @@ "更换头像" = "Edit your avatar"; "拍摄新图片" = "Take a photo"; "从相册选择" = "Select from album"; +"自拍" = "Selfie"; +"广告" = "Advertisement"; +"色情" = "Pornographic"; +"谣言" = "Rumor"; +"恶意营销" = "Malicious marketing"; +"侮辱诋毁" = "Insult or slander"; +"侵权举报(诽谤、抄袭、冒用...)" = "Infringement"; +"删除该标签后，你的like数也会相应减少，确认删除吗？" = "After you delete the tag, your like number will be reduced, are you ready for the confirmation?"; // Tip "上传失败啦！请检查您的网络稍后再试Orz～" = "Upload failed! Please check your internet connection"; diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/de.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/de.lproj/Localizable.strings index b5ba775..c1d3305 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/de.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/de.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/en.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/en.lproj/Localizable.strings index b5ba775..c1d3305 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/en.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/en.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/es.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/es.lproj/Localizable.strings index b5ba775..c1d3305 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/es.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/es.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/fr.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/fr.lproj/Localizable.strings index b5ba775..c1d3305 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/fr.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/fr.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/it.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/it.lproj/Localizable.strings index b5ba775..c1d3305 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/it.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/it.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/ja.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/ja.lproj/Localizable.strings index b5ba775..c1d3305 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/ja.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/ja.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/pt-PT.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/pt-PT.lproj/Localizable.strings index b5ba775..c1d3305 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/pt-PT.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/pt-PT.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/pt.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/pt.lproj/Localizable.strings index b5ba775..c1d3305 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/pt.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/pt.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/ru.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/ru.lproj/Localizable.strings index b5ba775..c1d3305 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/ru.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/ru.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/tr.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/tr.lproj/Localizable.strings index b5ba775..c1d3305 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/tr.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/tr.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/zh-Hans.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/zh-Hans.lproj/Localizable.strings index 858e2e2..58c1519 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/zh-Hans.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/zh-Hans.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/zh-Hant.lproj/Localizable.strings b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/zh-Hant.lproj/Localizable.strings index 858e2e2..58c1519 100755 Binary files a/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/zh-Hant.lproj/Localizable.strings and b/LIKE/LIKE/LCFramework/Foundation/Resource/LCInternationalization.bundle/zh-Hant.lproj/Localizable.strings differ diff --git a/LIKE/LIKE/LKApplication/Application/Camera/LKCameraViewController.m b/LIKE/LIKE/LKApplication/Application/Camera/LKCameraViewController.m index b093e0f..213d949 100644 --- a/LIKE/LIKE/LKApplication/Application/Camera/LKCameraViewController.m +++ b/LIKE/LIKE/LKApplication/Application/Camera/LKCameraViewController.m @@ -38,7 +38,9 @@ @interface LKCameraViewController () LC_PROPERTY(assign) UIDeviceOrientation deviceOrientation; -LC_PROPERTY(strong) UIView * gtaView; +LC_PROPERTY(strong) UIView *gtaView; + +LC_PROPERTY(strong) UIView *wastedView; @end @@ -106,6 +108,17 @@ -(void) handleNotification:(NSNotification *)notification NSMutableArray * array = [@[self.flashButton, self.switchCameraButton, self.photosButton] mutableCopy]; + if (self.wastedView) { + [array addObject:self.wastedView]; + + LC_FAST_ANIMATIONS(0.25, ^{ + + self.wastedView.viewFrameX = 0; + self.wastedView.viewFrameY = (self.fastCamera.view.viewFrameHeight - self.wastedView.viewFrameHeight) * 0.5; + + }); + } + if (self.gtaView) { [array addObject:self.gtaView]; @@ -131,6 +144,17 @@ -(void) handleNotification:(NSNotification *)notification NSMutableArray * array = [@[self.flashButton, self.switchCameraButton, self.photosButton] mutableCopy]; + if (self.wastedView) { + + [array addObject:self.wastedView]; + + LC_FAST_ANIMATIONS(0.25, ^{ + + self.wastedView.viewFrameX = 0; + self.wastedView.viewFrameY = (self.fastCamera.view.viewFrameHeight - self.wastedView.viewFrameHeight) * 0.5; + }); + } + if (self.gtaView) { [array addObject:self.gtaView]; @@ -399,6 +423,11 @@ - (void)switchFilterAtIndex:(NSInteger)index { self.filterIndex = index; + if (self.wastedView) { + [self.wastedView removeFromSuperview]; + self.wastedView = nil; + } + if (self.gtaView) { [self.gtaView removeFromSuperview]; self.gtaView = nil; @@ -409,7 +438,15 @@ - (void)switchFilterAtIndex:(NSInteger)index return; } - if (self.filterIndex == 1 || self.filterIndex == 2) { + if (self.filterIndex == 1) { + + self.wastedView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Wasted2" useCache:YES]]; + self.wastedView.viewFrameX = 0; + self.wastedView.viewFrameY = (self.fastCamera.view.viewFrameHeight - self.wastedView.viewFrameHeight) * 0.5; + self.fastCamera.view.ADD(self.wastedView); + } + + if (self.filterIndex == 2 || self.filterIndex == 3) { self.gtaView = [[UIImageView alloc] initWithImage:self.filterIndex == 1 ? [UIImage imageNamed:@"Gta-driving.png" useCache:YES] : [UIImage imageNamed:@"Gta-walking.png" useCache:YES]]; self.gtaView.viewFrameX = 10; diff --git a/LIKE/LIKE/LKApplication/Application/Camera/LKFilterManager.m b/LIKE/LIKE/LKApplication/Application/Camera/LKFilterManager.m index 86d8d0b..55154a0 100755 --- a/LIKE/LIKE/LKApplication/Application/Camera/LKFilterManager.m +++ b/LIKE/LIKE/LKApplication/Application/Camera/LKFilterManager.m @@ -39,6 +39,7 @@ -(NSMutableArray *) allFilterNames -(void) defaultSettings { + [self addImageFilter:@"Wasted"]; [self addImageFilter:@"GtaTrevor"]; [self addImageFilter:@"GtaFranklin"]; [self addImageFilter:@"Vivid"]; diff --git a/LIKE/LIKE/LKApplication/Application/Camera/LKImageCropperViewController.m b/LIKE/LIKE/LKApplication/Application/Camera/LKImageCropperViewController.m index f61b11e..b8de46e 100644 --- a/LIKE/LIKE/LKApplication/Application/Camera/LKImageCropperViewController.m +++ b/LIKE/LIKE/LKApplication/Application/Camera/LKImageCropperViewController.m @@ -55,7 +55,9 @@ @interface LKImageCropperViewController () LC_PROPERTY(assign) NSInteger filterIndex; LC_PROPERTY(assign) BOOL magic; -LC_PROPERTY(strong) UIView * gtaView; +LC_PROPERTY(strong) UIView *gtaView; + +LC_PROPERTY(strong) UIView *wastedView; @end @@ -315,8 +317,17 @@ - (void)initControlBtn UIImage * image = [self lookkupImageFilterWithImage:LKFilterManager.singleton.allFilterImage[i - 1] originImage:preview]; + // Wasted滤镜 + if (i == 1) { + + CGFloat width = image.size.width; + CGFloat height = width / 414 * 72; + + image = [image addMaskImage:[UIImage imageNamed:@"Wasted2" useCache:YES] imageSize:image.size inRect:CGRectMake(0, (image.size.height - height) * 0.5, width, height)]; + } - if (i == 1 || i == 2) { + // GTA滤镜 + if (i == 2 || i == 3) { CGFloat width = (245. / 1020.) * image.size.width * 1.5; CGFloat height = width / 245 * 172.; @@ -474,13 +485,32 @@ -(void) update image = [self lookkupImageFilterWithImage:LKFilterManager.singleton.allFilterImage[self.filterIndex - 1] originImage:self.originalImage]; + if (self.wastedView) { + [self.wastedView removeFromSuperview]; + self.wastedView = nil; + } if (self.gtaView) { [self.gtaView removeFromSuperview]; self.gtaView = nil; } - if (self.filterIndex == 1 || self.filterIndex == 2) { + + // Wasted滤镜 + if (self.filterIndex == 1) { + +// CGFloat width = image.size.width; +// CGFloat screenW = [UIScreen mainScreen].bounds.size.width; +// CGFloat scale = [UIScreen mainScreen].scale; +// CGFloat height = width / 1242 * 216; + CGFloat width = image.size.width; + CGFloat height = width * 216 / 1242; + + image = [image addMaskImage:[UIImage imageNamed:@"Wasted2" useCache:YES] imageSize:image.size inRect:CGRectMake(0, (image.size.height - height) * 0.5, width, height)]; + } + + // GTA滤镜 + if (self.filterIndex == 2 || self.filterIndex == 3) { CGFloat width = (245. / 1020.) * image.size.width; CGFloat height = width / 245 * 172.; diff --git a/LIKE/LIKE/LKApplication/Application/Home/LKHomeViewController.m b/LIKE/LIKE/LKApplication/Application/Home/LKHomeViewController.m index 728a9fd..9234710 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/LKHomeViewController.m +++ b/LIKE/LIKE/LKApplication/Application/Home/LKHomeViewController.m @@ -34,6 +34,7 @@ #import "Doppelganger.h" #import "LKBadgeView.h" #import "LKSearchResultsViewController.h" +#import "MobClick.h" #define FOCUS_FEED_CACHE_KEY [NSString stringWithFormat:@"LKFocusFeedKey-%@", LKLocalUser.singleton.user.id] diff --git a/LIKE/LIKE/LKApplication/Application/Home/LKPostDetailViewController.m b/LIKE/LIKE/LKApplication/Application/Home/LKPostDetailViewController.m index 0364989..dbb0e99 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/LKPostDetailViewController.m +++ b/LIKE/LIKE/LKApplication/Application/Home/LKPostDetailViewController.m @@ -570,7 +570,7 @@ - (void)reportReason { @weakly(self); - [LKActionSheet showWithTitle:nil buttonTitles:@[LC_LO(@"自拍"),LC_LO(@"广告"),LC_LO(@"色情"),LC_LO(@"谣言"),LC_LO(@"恶意营销"),LC_LO(@"侮辱诋毁"),LC_LO(@"侵权举报 (诽谤、抄袭、冒用...)")] didSelected:^(NSInteger index) { + [LKActionSheet showWithTitle:nil buttonTitles:@[LC_LO(@"自拍"),LC_LO(@"广告"),LC_LO(@"色情"),LC_LO(@"谣言"),LC_LO(@"恶意营销"),LC_LO(@"侮辱诋毁"),LC_LO(@"侵权举报(诽谤、抄袭、冒用...)")] didSelected:^(NSInteger index) { @normally(self); @@ -621,7 +621,7 @@ - (void)reportWithIndex:(NSInteger)index { break; case 6: - [interface addParameter:LC_LO(@"侵权举报 (诽谤、抄袭、冒用...)") key:@"reason"]; + [interface addParameter:LC_LO(@"侵权举报(诽谤、抄袭、冒用...)") key:@"reason"]; break; default: @@ -997,7 +997,8 @@ - (UITableViewCell *)tableView:(LCUITableView *)tableView cellForRowAtIndexPath: }; - self.userHead.url = self.post.user.avatar; +// self.userHead.url = self.post.user.avatar; + [self.userHead sd_setImageWithURL:[NSURL URLWithString:self.post.user.avatar] placeholderImage:nil]; self.userName.text = self.post.user.name; [self.userLikes setText:self.post.user.likes.description animated:NO]; @@ -1309,7 +1310,8 @@ -(UIImage *) buildShareImage:(NSInteger)shareIndex imageView.viewFrameHeight = headWidth - 10 * proportion; imageView.viewFrameX = (20 + 18) * proportion + 5 * proportion; imageView.viewFrameY = 5 * proportion; - imageView.url = self.post.user.avatar; +// imageView.url = self.post.user.avatar; + [imageView sd_setImageWithURL:[NSURL URLWithString:self.post.user.avatar] placeholderImage:nil]; imageView.cornerRadius = imageView.viewMidHeight; imageView.backgroundColor = [UIColor whiteColor]; bottomView.ADD(imageView); @@ -1367,7 +1369,7 @@ -(UIImage *) buildShareImage:(NSInteger)shareIndex interestView.viewFrameY = CGRectGetMaxY(qrCodeView.frame) - interestView.viewFrameHeight; bottomView.ADD(interestView); - NSArray *interestArray = @[@"高达", @"狗", @"旅行", @"猫", @"美食", @"喷漆", @"摄影", @"游戏", @"手办"]; + NSArray *interestArray = @[@"高达", @"狗", @"旅行", @"猫", @"美食", @"喷漆", @"摄影", @"游戏", @"手办", @"变形金刚", @"钢铁侠", @"星球大战"]; UIImage *interestImage = nil; for (LKTag *tag in self.tagsListModel.tags) { @@ -1422,11 +1424,11 @@ -(UIImage *) buildShareImage:(NSInteger)shareIndex inRect:LC_RECT(0, image.size.height - headWidth / 2, bottomView.viewFrameWidth, bottomView.viewFrameHeight)]; - UIImage * icon = [[UIImage imageNamed:@"LikeIconSmall.png" useCache:NO] scaleToBeWidth:50 * proportion]; + UIImage * icon = [[UIImage imageNamed:@"LikeIconSmall.png" useCache:NO] scaleToBeWidth:33 * proportion]; image = [image addMaskImage:icon imageSize:image.size - inRect:LC_RECT(image.size.width - icon.size.width - 40, 40, icon.size.width, icon.size.height)]; + inRect:LC_RECT(image.size.width - icon.size.width - 20, 20, icon.size.width, icon.size.height)]; return image; } @@ -1441,7 +1443,7 @@ - (UIImage *)getInterestImageWithTagArray:(NSArray *)tagArray tag:(LKTag *)tag { // 狗 NSArray *dog = @[@"汪星人", @"汪", @"狗"]; // 旅行 - NSArray *travel = @[@"旅行"]; + NSArray *travel = @[@"旅行", @"吉他", @"音乐", @"艺术", @"旅游"]; // 猫 NSArray *cat = @[@"喵星人", @"猫", @"喵"]; // 美食 @@ -1453,7 +1455,13 @@ - (UIImage *)getInterestImageWithTagArray:(NSArray *)tagArray tag:(LKTag *)tag { // 游戏 NSArray *game = @[@"PS4", @"XBOX", @"游戏", @"GTA", @"数码", @"索尼大法好", @"索大好"]; // 手办 - NSArray *gk = @[@"手办", @"粘土人", @"粘土"]; + NSArray *gk = @[@"手办", @"粘土人", @"粘土", @"舰娘", @"初音", @"动漫", @"漫画"]; + // 变形金刚 + NSArray *transformer = @[@"变形金刚", @"擎天柱", @"大力神", @"大黄蜂", @"TF", @"汽车人", @"transformers", @"威震天"]; + // 钢铁侠 + NSArray *ironMan = @[@"钢铁侠", @"美国队长", @"IRON MAN", @"复仇者联盟", @"绿巨人", @"漫威"]; + // 星球大战 + NSArray *starWar = @[@"星球大战", @"STAR WARS", @"STARWARS", @"星战"]; if ([tag.tag rangeOfString:tagArray[0]].length) { @@ -1554,6 +1562,39 @@ - (UIImage *)getInterestImageWithTagArray:(NSArray *)tagArray tag:(LKTag *)tag { } } + if ([tag.tag rangeOfString:tagArray[9]].length) { + + for (NSString *str in transformer) { + + if ([tag.tag rangeOfString:str].length) { + + return [UIImage imageNamed:@"变形金刚"]; + } + } + } + + if ([tag.tag rangeOfString:tagArray[10]].length) { + + for (NSString *str in ironMan) { + + if ([tag.tag rangeOfString:str].length) { + + return [UIImage imageNamed:@"钢铁侠"]; + } + } + } + + if ([tag.tag rangeOfString:tagArray[11]].length) { + + for (NSString *str in starWar) { + + if ([tag.tag rangeOfString:str].length) { + + return [UIImage imageNamed:@"星球大战"]; + } + } + } + return nil; } diff --git a/LIKE/LIKE/LKApplication/Application/Home/LKTagCommentsViewController.m b/LIKE/LIKE/LKApplication/Application/Home/LKTagCommentsViewController.m index 8f0ca44..84469fe 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/LKTagCommentsViewController.m +++ b/LIKE/LIKE/LKApplication/Application/Home/LKTagCommentsViewController.m @@ -540,7 +540,8 @@ - (UITableViewCell *)tableView:(LCUITableView *)tableView cellForRowAtIndexPath: cell.ADD(item); } - head.url = self.tagValue.user.avatar; +// head.url = self.tagValue.user.avatar; + [head sd_setImageWithURL:[NSURL URLWithString:self.tagValue.user.avatar] placeholderImage:nil]; item.tagValue = self.tagValue; item.viewFrameX = head.viewRightX + padding; item.viewFrameY = 53 / 2 - item.viewMidHeight; diff --git a/LIKE/LIKE/LKApplication/Application/Home/Views/LKCommentsView.m b/LIKE/LIKE/LKApplication/Application/Home/Views/LKCommentsView.m index 4feb22d..646fa9b 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/Views/LKCommentsView.m +++ b/LIKE/LIKE/LKApplication/Application/Home/Views/LKCommentsView.m @@ -10,6 +10,7 @@ #import "LKComment.h" #import "LKTime.h" #import "LKPostDetailCell.h" +#import "UIImageView+WebCache.h" @implementation LKCommentsView @@ -79,7 +80,8 @@ -(void) setTagValue:(LKTag *)tagValue head.viewFrameWidth = 33; head.viewFrameHeight = 33; head.cornerRadius = 33 / 2; - head.url = comment.user.avatar; +// head.url = comment.user.avatar; + [head sd_setImageWithURL:[NSURL URLWithString:comment.user.avatar] placeholderImage:nil]; head.userInteractionEnabled = YES; [head addTapGestureRecognizer:self selector:@selector(headTapAction:)]; head.tag = i + 100; diff --git a/LIKE/LIKE/LKApplication/Application/Home/Views/LKHomeHeader.m b/LIKE/LIKE/LKApplication/Application/Home/Views/LKHomeHeader.m index 970e13e..84f5ee4 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/Views/LKHomeHeader.m +++ b/LIKE/LIKE/LKApplication/Application/Home/Views/LKHomeHeader.m @@ -11,6 +11,7 @@ #import "FXBlurView.h" #import "LKSearchBar.h" #import "LKLoginViewController.h" +#import "UIImageView+WebCache.h" #define kDefaultHeaderFrame CGRectMake(0, 0, self.frame.size.width, self.frame.size.height) @@ -301,7 +302,9 @@ -(void) updateWithUser:(LKUser *)user self.user = user; self.nameLabel.text = [NSString stringWithFormat:@"%@\n%@ likes",LKLocalUser.singleton.user.name, @(LKLocalUser.singleton.user.likes.integerValue)]; - self.headImageView.url = user.avatar; +// self.headImageView.url = user.avatar; + [self.headImageView sd_setImageWithURL:[NSURL URLWithString:user.avatar] placeholderImage:nil]; + if (!LC_NSSTRING_IS_INVALID(user.cover)) { @@ -310,7 +313,8 @@ -(void) updateWithUser:(LKUser *)user [animation setType:kCATransitionFade]; [self.backgroundView.layer addAnimation:animation forKey:@"transition"]; - self.backgroundView.url = user.cover; +// self.backgroundView.url = user.cover; + [self.backgroundView sd_setImageWithURL:[NSURL URLWithString:user.cover] placeholderImage:nil]; } else{ diff --git a/LIKE/LIKE/LKApplication/Application/Home/Views/LKHomepageHeader.m b/LIKE/LIKE/LKApplication/Application/Home/Views/LKHomepageHeader.m index f761472..c1dfe0b 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/Views/LKHomepageHeader.m +++ b/LIKE/LIKE/LKApplication/Application/Home/Views/LKHomepageHeader.m @@ -7,6 +7,7 @@ // #import "LKHomepageHeader.h" +#import "UIImageView+WebCache.h" @interface LKHomepageHeader () @@ -56,7 +57,8 @@ -(void) updateWithUser:(LKUser *)user if (user) { self.nameLabel.text = [NSString stringWithFormat:@"%@\n %@ likes", user.name, @(user.likes.integerValue)]; - self.headImageView.url = user.avatar; +// self.headImageView.url = user.avatar; + [self.headImageView sd_setImageWithURL:[NSURL URLWithString:user.avatar] placeholderImage:nil]; self.nameLabelOnShowing.text = user.name; if (!LC_NSSTRING_IS_INVALID(user.cover)) { @@ -66,7 +68,8 @@ -(void) updateWithUser:(LKUser *)user [animation setType:kCATransitionFade]; [self.backgroundView.layer addAnimation:animation forKey:@"transition"]; - self.backgroundView.url = user.cover; +// self.backgroundView.url = user.cover; + [self.backgroundView sd_setImageWithURL:[NSURL URLWithString:user.cover] placeholderImage:nil]; } else{ diff --git a/LIKE/LIKE/LKApplication/Application/Home/Views/LKLikesPage.m b/LIKE/LIKE/LKApplication/Application/Home/Views/LKLikesPage.m index c242336..7d25dc3 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/Views/LKLikesPage.m +++ b/LIKE/LIKE/LKApplication/Application/Home/Views/LKLikesPage.m @@ -7,6 +7,7 @@ // #import "LKLikesPage.h" +#import "UIImageView+WebCache.h" @interface LKLikesPage () @@ -263,7 +264,8 @@ -(void) reloadData item.tag = i; if (user.avatar) { - item.url = user.avatar; +// item.url = user.avatar; + [item sd_setImageWithURL:[NSURL URLWithString:user.avatar] placeholderImage:nil]; [item addTapGestureRecognizer:self selector:@selector(didTapHeadAction:)]; } diff --git a/LIKE/LIKE/LKApplication/Application/Home/Views/LKLikesScrollView.m b/LIKE/LIKE/LKApplication/Application/Home/Views/LKLikesScrollView.m index e4a57c2..01ca883 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/Views/LKLikesScrollView.m +++ b/LIKE/LIKE/LKApplication/Application/Home/Views/LKLikesScrollView.m @@ -7,6 +7,7 @@ // #import "LKLikesScrollView.h" +#import "UIImageView+WebCache.h" @interface LKLikesScrollView () @@ -84,7 +85,8 @@ -(void) setLikers:(NSArray *)likers allLikersNumber:(NSNumber *)allLikersNumber item.hidden = NO; item.viewFrameX = i * width + i * padding + 8; item.backgroundColor = LKColor.backgroundColor; - item.url = user.avatar; +// item.url = user.avatar; + [item sd_setImageWithURL:[NSURL URLWithString:user.avatar] placeholderImage:nil]; item.tag = i; viewRightX = item.viewRightX; diff --git a/LIKE/LIKE/LKApplication/Application/Home/Views/LKPostDetailCell.m b/LIKE/LIKE/LKApplication/Application/Home/Views/LKPostDetailCell.m index 30a4404..4603806 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/Views/LKPostDetailCell.m +++ b/LIKE/LIKE/LKApplication/Application/Home/Views/LKPostDetailCell.m @@ -11,6 +11,7 @@ #import "LKTime.h" #import "LKCommentsView.h" #import "LKLikesScrollView.h" +#import "UIImageView+WebCache.h" @interface LKPostDetailCell () @@ -133,7 +134,8 @@ -(void) setTagDetail:(LKTag *)tagDetail _tagDetail = tagDetail; self.headImageView.image = nil; - self.headImageView.url = tagDetail.user.avatar; +// self.headImageView.url = tagDetail.user.avatar; + [self.headImageView sd_setImageWithURL:[NSURL URLWithString:tagDetail.user.avatar] placeholderImage:nil]; if (!self.tagItem) { diff --git a/LIKE/LIKE/LKApplication/Application/Home/Views/LKShareTagsView.m b/LIKE/LIKE/LKApplication/Application/Home/Views/LKShareTagsView.m index 8b79549..064de2e 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/Views/LKShareTagsView.m +++ b/LIKE/LIKE/LKApplication/Application/Home/Views/LKShareTagsView.m @@ -27,13 +27,13 @@ -(instancetype) init self.tagLabel = LCUILabel.view; - self.tagLabel.font = LK_FONT(11 * 2); + self.tagLabel.font = LK_FONT_B(11 * 2); self.tagLabel.textColor = [UIColor whiteColor];//LC_RGB(74, 74, 74); self.ADD(self.tagLabel); self.likesLabel = LCUILabel.view; - self.likesLabel.font = LK_FONT(11 * 2); + self.likesLabel.font = LK_FONT_B(11 * 2); self.likesLabel.textColor = [UIColor whiteColor]; self.likesLabel.borderWidth = 1; self.likesLabel.borderColor = [[UIColor whiteColor] colorWithAlphaComponent:0.4]; @@ -116,8 +116,8 @@ -(void) reloadData __LKTagItem * item = __LKTagItem.view; if (self.proportion) { - item.tagLabel.font = LK_FONT(20 * self.proportion); - item.likesLabel.font = LK_FONT(20 * self.proportion); + item.tagLabel.font = LK_FONT_B(20 * self.proportion); + item.likesLabel.font = LK_FONT_B(20 * self.proportion); } diff --git a/LIKE/LIKE/LKApplication/Application/Home/Views/LKTagCommentCell.m b/LIKE/LIKE/LKApplication/Application/Home/Views/LKTagCommentCell.m index 5b1b8c0..0839240 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/Views/LKTagCommentCell.m +++ b/LIKE/LIKE/LKApplication/Application/Home/Views/LKTagCommentCell.m @@ -8,6 +8,7 @@ #import "LKTagCommentCell.h" #import "LKTime.h" +#import "UIImageView+WebCache.h" @interface LKTagCommentCell () @@ -71,7 +72,8 @@ -(void) setComment:(LKComment *)comment _comment = comment; self.head.image = nil; - self.head.url = comment.user.avatar; +// self.head.url = comment.user.avatar; + [self.head sd_setImageWithURL:[NSURL URLWithString:comment.user.avatar] placeholderImage:nil]; NSString * content = [NSString stringWithFormat:@"%@：%@%@" ,comment.user.name, comment.replyUser ? [NSString stringWithFormat:@"@%@ ", comment.replyUser.name] : @"",comment.content]; diff --git a/LIKE/LIKE/LKApplication/Application/Home/Views/LKTagLikesCell.m b/LIKE/LIKE/LKApplication/Application/Home/Views/LKTagLikesCell.m index 280ce08..4b19617 100644 --- a/LIKE/LIKE/LKApplication/Application/Home/Views/LKTagLikesCell.m +++ b/LIKE/LIKE/LKApplication/Application/Home/Views/LKTagLikesCell.m @@ -8,6 +8,7 @@ #import "LKTagLikesCell.h" #import "LKTime.h" +#import "UIImageView+WebCache.h" @interface LKTagLikesCell () @@ -107,7 +108,8 @@ -(void) setTagValue:(LKTag *)tagValue _tagValue = tagValue; self.userHead.image = nil; - self.userHead.url = tagValue.user.avatar; +// self.userHead.url = tagValue.user.avatar; + [self.userHead sd_setImageWithURL:[NSURL URLWithString:tagValue.user.avatar] placeholderImage:nil]; self.userName.text = tagValue.user.name; self.userName.FIT(); @@ -165,7 +167,8 @@ -(void) setLikes:(NSArray *)likes } userHead.viewFrameY = inv * (i/maxCount) + 33 * (i/maxCount); userHead.cornerRadius = 33 / 2; - userHead.url = user.avatar; +// userHead.url = user.avatar; + [userHead sd_setImageWithURL:[NSURL URLWithString:user.avatar] placeholderImage:nil]; userHead.backgroundColor = [UIColor whiteColor]; userHead.userInteractionEnabled = YES; userHead.tag = i; diff --git a/LIKE/LIKE/LKApplication/Application/Login/LKLoginViewController.m b/LIKE/LIKE/LKApplication/Application/Login/LKLoginViewController.m index 60b585e..9ff5146 100755 --- a/LIKE/LIKE/LKApplication/Application/Login/LKLoginViewController.m +++ b/LIKE/LIKE/LKApplication/Application/Login/LKLoginViewController.m @@ -677,8 +677,9 @@ -(void) login self.maskView.hidden = NO; self.loginButton.title = LC_LO(@"登录中..."); self.loginButton.userInteractionEnabled = NO; + - LKHttpRequestInterface * interface = [LKHttpRequestInterface interfaceType:@"authenticate/mobile"].POST_METHOD(); + LKHttpRequestInterface * interface = [LKHttpRequestInterface interfaceType:@"authenticate/mobile/mob"].POST_METHOD(); [interface addParameter:[LKISOCountryCodes countryWithCode:self.countryCode.text] key:@"zone"]; [interface addParameter:self.phoneField.text key:@"mobile"]; diff --git a/LIKE/LIKE/LKApplication/Application/Notification/Views/LKNotificationCell.m b/LIKE/LIKE/LKApplication/Application/Notification/Views/LKNotificationCell.m index 04188d1..9530aa8 100644 --- a/LIKE/LIKE/LKApplication/Application/Notification/Views/LKNotificationCell.m +++ b/LIKE/LIKE/LKApplication/Application/Notification/Views/LKNotificationCell.m @@ -8,6 +8,7 @@ #import "LKNotificationCell.h" #import "LKTime.h" +#import "UIImageView+WebCache.h" @interface LKNotificationCell () @@ -117,7 +118,8 @@ -(void) setNotification:(LKNotification *)notification _notification = notification; self.headImageView.image = nil; - self.headImageView.url = notification.user.avatar; +// self.headImageView.url = notification.user.avatar; + [self.headImageView sd_setImageWithURL:[NSURL URLWithString:notification.user.avatar] placeholderImage:nil]; self.nameLabel.text = [NSString stringWithFormat:@"%@%@", notification.user.name, [LKNotificationCell getTitle:notification]]; @@ -167,7 +169,8 @@ -(void) setNotification:(LKNotification *)notification image.viewFrameY = 55 / 2 - 35 / 2; image.viewFrameWidth = 35; image.viewFrameHeight = 35; - image.url = post.content; +// image.url = post.content; + [image sd_setImageWithURL:[NSURL URLWithString:post.content] placeholderImage:nil]; image.tag = i; image.userInteractionEnabled = YES; [self.morePreview addSubview:image]; @@ -180,7 +183,8 @@ -(void) setNotification:(LKNotification *)notification self.preview.hidden = NO; self.preview.image = nil; self.preview.tag = 0; - self.preview.url = ((LKPost *)notification.posts[0]).content; +// self.preview.url = ((LKPost *)notification.posts[0]).content; + [self.preview sd_setImageWithURL:[NSURL URLWithString:((LKPost *)notification.posts[0]).content] placeholderImage:nil]; self.morePreview.hidden = YES; } else{ diff --git a/LIKE/LIKE/LKApplication/Application/Search/LKSearchResultsViewController.m b/LIKE/LIKE/LKApplication/Application/Search/LKSearchResultsViewController.m index f9730f3..a6ceaa2 100644 --- a/LIKE/LIKE/LKApplication/Application/Search/LKSearchResultsViewController.m +++ b/LIKE/LIKE/LKApplication/Application/Search/LKSearchResultsViewController.m @@ -9,6 +9,7 @@ #import "LKSearchResultsViewController.h" #import "LKUserCenterPhotoCell.h" #import "LKPostDetailViewController.h" +#import "UIImageView+WebCache.h" @interface LKSearchResultsViewController () @@ -163,7 +164,8 @@ -(UIView *) buildHeader head.viewFrameX = 15; head.viewFrameY = 15; head.backgroundColor = LKColor.backgroundColor; - head.url = avatar; +// head.url = avatar; + [head sd_setImageWithURL:[NSURL URLWithString:avatar] placeholderImage:nil]; head.cornerRadius = 4; view.ADD(head); diff --git a/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotTagsScrollView.m b/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotTagsScrollView.m index ecac4c1..c960c3c 100644 --- a/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotTagsScrollView.m +++ b/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotTagsScrollView.m @@ -8,6 +8,7 @@ #import "LKHotTagsScrollView.h" #import "LKTag.h" +#import "UIImageView+WebCache.h" @interface __LKHotTagsItem : LCUIImageView @@ -21,7 +22,8 @@ -(instancetype) initWithTitle:(NSString *)title imageURL:(NSString *)imageURL { if (self = [super initWithFrame:CGRectMake(0, 0, 80, 80)]) { - self.url = imageURL; +// self.url = imageURL; + [self sd_setImageWithURL:[NSURL URLWithString:imageURL] placeholderImage:nil]; self.backgroundColor = LKColor.backgroundColor; diff --git a/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotTagsView.m b/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotTagsView.m index 2923afb..497c2cb 100644 --- a/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotTagsView.m +++ b/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotTagsView.m @@ -8,6 +8,7 @@ #import "LKHotTagsView.h" #import "LKTag.h" +#import "UIImageView+WebCache.h" @interface LKHotTagItem () @@ -184,7 +185,8 @@ -(void) reloadData if (!LC_NSSTRING_IS_INVALID(tag.image)) { - item.url = tag.image; +// item.url = tag.image; + [item sd_setImageWithURL:[NSURL URLWithString:tag.image] placeholderImage:nil]; } item.selected = self.highlight; diff --git a/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotUserView.m b/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotUserView.m index c27400c..3a03bb7 100644 --- a/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotUserView.m +++ b/LIKE/LIKE/LKApplication/Application/Search/Views/LKHotUserView.m @@ -7,6 +7,7 @@ // #import "LKHotUserView.h" +#import "UIImageView+WebCache.h" @interface LKHotUserView () @@ -67,7 +68,8 @@ -(void) setHotUsers:(NSArray *)hotUsers item.viewFrameWidth = 35; item.viewFrameHeight = 35; item.cornerRadius = 17.5; - item.url = user.avatar; +// item.url = user.avatar; + [item sd_setImageWithURL:[NSURL URLWithString:user.avatar] placeholderImage:nil]; item.backgroundColor = LKColor.backgroundColor; item.userInteractionEnabled = YES; item.tag = i; diff --git a/LIKE/LIKE/LKApplication/Application/Search/Views/LKSearchPlaceholderView.m b/LIKE/LIKE/LKApplication/Application/Search/Views/LKSearchPlaceholderView.m index 69f8e4e..4bdbe95 100644 --- a/LIKE/LIKE/LKApplication/Application/Search/Views/LKSearchPlaceholderView.m +++ b/LIKE/LIKE/LKApplication/Application/Search/Views/LKSearchPlaceholderView.m @@ -9,6 +9,7 @@ #import "LKSearchPlaceholderView.h" #import "LKTag.h" #import "LKSearchHistory.h" +#import "UIImageView+WebCache.h" @interface LKSearchPlaceholderView () @@ -221,7 +222,8 @@ - (UITableViewCell *)tableView:(LCUITableView *)tableView cellForRowAtIndexPath: LKUser * user = self.users[indexPath.row]; - head.url = user.avatar; +// head.url = user.avatar; + [head sd_setImageWithURL:[NSURL URLWithString:user.avatar] placeholderImage:nil]; label.text = user.name; head.alpha = 1; diff --git a/LIKE/LIKE/LKApplication/Application/Search/Views/LKSearchResultCollectionViewCell.m b/LIKE/LIKE/LKApplication/Application/Search/Views/LKSearchResultCollectionViewCell.m index 87d43d8..6afbe1e 100644 --- a/LIKE/LIKE/LKApplication/Application/Search/Views/LKSearchResultCollectionViewCell.m +++ b/LIKE/LIKE/LKApplication/Application/Search/Views/LKSearchResultCollectionViewCell.m @@ -7,6 +7,7 @@ // #import "LKSearchResultCollectionViewCell.h" +#import "UIImageView+WebCache.h" @interface LKSearchResultCollectionViewCell () @@ -117,7 +118,8 @@ -(void) setPost:(LKPost *)post self.head.image = nil; - self.head.url = post.user.avatar; +// self.head.url = post.user.avatar; + [self.head sd_setImageWithURL:[NSURL URLWithString:post.user.avatar] placeholderImage:nil]; self.title.text = LC_NSSTRING_FORMAT(@"%@", post.user.name); self.likes.text = LC_NSSTRING_FORMAT(@"%@ likes", post.user.likes); @@ -136,7 +138,8 @@ -(void) setPost:(LKPost *)post self.contentImage.viewFrameWidth = size.width; self.contentImage.viewFrameHeight = size.height; self.contentImage.image = nil; - self.contentImage.url = post.content; +// self.contentImage.url = post.content; + [self.contentImage sd_setImageWithURL:[NSURL URLWithString:post.content] placeholderImage:nil]; //[LKSearchResultCollectionViewCell roundCorners:UIRectCornerBottomLeft | UIRectCornerBottomRight forView:self.contentImage]; diff --git a/LIKE/LIKE/LKApplication/Application/UserCenter/LKSettingsViewController.m b/LIKE/LIKE/LKApplication/Application/UserCenter/LKSettingsViewController.m index 2bb5bad..a458a69 100644 --- a/LIKE/LIKE/LKApplication/Application/UserCenter/LKSettingsViewController.m +++ b/LIKE/LIKE/LKApplication/Application/UserCenter/LKSettingsViewController.m @@ -14,6 +14,7 @@ #import "LKUserInfoModel.h" #import "LKLinkAccountsViewController.h" #import "SDImageCache.h" +#import "UIImageView+WebCache.h" @interface LKSettingsViewController () @@ -166,7 +167,8 @@ - (UITableViewCell *)tableView:(LCUITableView *)tableView cellForRowAtIndexPath: self.head.viewFrameY = 200 / 3 / 2 - 20; self.head.cornerRadius = 20; self.head.image = nil; - self.head.url = LKLocalUser.singleton.user.avatar; +// self.head.url = LKLocalUser.singleton.user.avatar; + [self.head sd_setImageWithURL:[NSURL URLWithString:LKLocalUser.singleton.user.avatar] placeholderImage:nil]; configurationCell.ADD(self.head); diff --git a/LIKE/LIKE/LKApplication/Application/UserCenter/Views/LKUserCenterPhotoCell.m b/LIKE/LIKE/LKApplication/Application/UserCenter/Views/LKUserCenterPhotoCell.m index 04ae3c8..14af21d 100644 --- a/LIKE/LIKE/LKApplication/Application/UserCenter/Views/LKUserCenterPhotoCell.m +++ b/LIKE/LIKE/LKApplication/Application/UserCenter/Views/LKUserCenterPhotoCell.m @@ -7,6 +7,7 @@ // #import "LKUserCenterPhotoCell.h" +#import "UIImageView+WebCache.h" @interface __LKUserCenterPhotoItem : UIView @@ -103,7 +104,8 @@ -(void) setPosts:(NSArray *)posts if (post) { item.hidden = NO; - item.imageView.url = post.content; +// item.imageView.url = post.content; + [item.imageView sd_setImageWithURL:[NSURL URLWithString:post.content] placeholderImage:nil]; } } } diff --git a/LIKE/LIKE/LKApplication/Application/UserCenter/Views/LKUserCenterUserCell.m b/LIKE/LIKE/LKApplication/Application/UserCenter/Views/LKUserCenterUserCell.m index d98b09b..ae430c7 100644 --- a/LIKE/LIKE/LKApplication/Application/UserCenter/Views/LKUserCenterUserCell.m +++ b/LIKE/LIKE/LKApplication/Application/UserCenter/Views/LKUserCenterUserCell.m @@ -8,6 +8,7 @@ #import "LKUserCenterUserCell.h" #import "LKTime.h" +#import "UIImageView+WebCache.h" @interface LKUserCenterUserCell () @@ -67,7 +68,8 @@ -(void) setUser:(LKUser *)user _user = user; self.userHead.image = nil; - self.userHead.url = user.avatar; +// self.userHead.url = user.avatar; + [self.userHead sd_setImageWithURL:[NSURL URLWithString:user.avatar] placeholderImage:nil]; self.titleLabel.text = [NSString stringWithFormat:@"%@", user.name]; diff --git a/LIKE/LIKE/LKApplication/Model/LKShare.m b/LIKE/LIKE/LKApplication/Model/LKShare.m index 9092fac..0f15453 100644 --- a/LIKE/LIKE/LKApplication/Model/LKShare.m +++ b/LIKE/LIKE/LKApplication/Model/LKShare.m @@ -10,30 +10,37 @@ #import "LKWeChatShare.h" #import "LKSinaShare.h" #import "LKTencentShare.h" +#import "MobClick.h" @implementation LKShare +(BOOL) shareImageWithType:(LKShareType)type image:(UIImage *)image { switch (type) { - case LKShareTypeWeChatFriend: + case LKShareTypeWeChatFriend: { return [LKWeChatShare shareImage:image timeLine:NO]; + } - case LKShareTypeWeChatTimeLine: + case LKShareTypeWeChatTimeLine: { return [LKWeChatShare shareImage:image timeLine:YES]; - - case LKShareTypeSina: + } + + case LKShareTypeSina: { return [LKSinaShare shareImage:image]; break; - case LKShareTypeQQ: + } + + case LKShareTypeQQ: { return [LKTencentShare shareImage:image]; break; + + } default: return NO; diff --git a/LIKE/LIKE/LKExternal/UMAnalytics/MobClick.h b/LIKE/LIKE/LKExternal/UMAnalytics/MobClick.h index 505449e..110c463 100644 --- a/LIKE/LIKE/LKExternal/UMAnalytics/MobClick.h +++ b/LIKE/LIKE/LKExternal/UMAnalytics/MobClick.h @@ -2,7 +2,7 @@ // MobClick.h // Analytics // -// Copyright (C) 2010-2015 Umeng.com . All rights reserved. +// Copyright (C) 2010-2014 Umeng.com . All rights reserved. #import #import @@ -36,16 +36,16 @@ typedef enum { ///--------------------------------------------------------------------------------------- /** 设置app版本号。由于历史原因需要和xcode3工程兼容,友盟提取的是Build号(CFBundleVersion)， - 如果需要和App Store上的版本一致,请调用此方法。 + 如果需要和App Store上的版本一致,请调用此方法。 @param appVersion 版本号，例如设置成`XcodeAppVersion`. @return void. - */ +*/ + (void)setAppVersion:(NSString *)appVersion; /** 开启CrashReport收集, 默认YES(开启状态). @param value 设置为NO,可关闭友盟CrashReport收集功能. @return void. - */ +*/ + (void)setCrashReportEnabled:(BOOL)value; /** 设置是否打印sdk的log信息, 默认NO(不打印log). @@ -56,7 +56,7 @@ typedef enum { /** 设置是否开启background模式, 默认YES. @param value 为YES,SDK会确保在app进入后台的短暂时间保存日志信息的完整性，对于已支持background模式和一般app不会有影响. - 如果该模式影响某些App在切换到后台的功能，也可将该值设置为NO. + 如果该模式影响某些App在切换到后台的功能，也可将该值设置为NO. @return void. */ + (void)setBackgroundTaskEnabled:(BOOL)value; @@ -74,7 +74,7 @@ typedef enum { /** 初始化友盟统计模块 @param appKey 友盟appKey. @return void - */ +*/ + (void)startWithAppkey:(NSString *)appKey; /** 初始化友盟统计模块 @@ -88,7 +88,7 @@ typedef enum { /** 当reportPolicy == SEND_INTERVAL 时设定log发送间隔 @param second 单位为秒,最小90秒,最大86400秒(24hour). @return void. - */ +*/ + (void)setLogSendInterval:(double)second; /** 设置日志延迟发送 @@ -105,7 +105,7 @@ typedef enum { @param pageName 统计的页面名称. @param seconds 单位为秒，int型. @return void. - */ +*/ + (void)logPageView:(NSString *)pageName seconds:(int)seconds; /** 自动页面时长统计, 开始记录某个页面展示时长. @@ -131,7 +131,7 @@ typedef enum { ///--------------------------------------------------------------------------------------- /** 自定义事件,数量统计. - 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID +使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID @param eventId 网站上注册的事件Id. @param label 分类标签。不同的标签会分别进行统计，方便同一事件的不同标签的对比,为nil或空字符串时后台会生成和eventId同名的标签. @@ -152,8 +152,8 @@ typedef enum { + (void)event:(NSString *)eventId attributes:(NSDictionary *)attributes counter:(int)number; /** 自定义事件,时长统计. - 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID. - beginEvent,endEvent要配对使用,也可以自己计时后通过durations参数传递进来 + 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID. + beginEvent,endEvent要配对使用,也可以自己计时后通过durations参数传递进来 @param eventId 网站上注册的事件Id. @param label 分类标签。不同的标签会分别进行统计，方便同一事件的不同标签的对比,为nil或空字符串时后台会生成和eventId同名的标签. @@ -163,10 +163,10 @@ typedef enum { @warning 每个event的attributes不能超过10个 - eventId、attributes中key和value都不能使用空格和特殊字符，且长度不能超过255个字符（否则将截取前255个字符） - id， ts， du是保留字段，不能作为eventId及key的名称 - - */ + eventId、attributes中key和value都不能使用空格和特殊字符，且长度不能超过255个字符（否则将截取前255个字符） + id， ts， du是保留字段，不能作为eventId及key的名称 + +*/ + (void)beginEvent:(NSString *)eventId; /** 自定义事件,时长统计. 使用前，请先到友盟App管理后台的设置->编辑自定义事件 中添加相应的事件ID，然后在工程中传入相应的事件ID. @@ -214,17 +214,17 @@ typedef enum { ///--------------------------------------------------------------------------------------- /** 按渠道检测更新 - 检查当前app是否有更新，有则弹出UIAlertView提示用户,当用户点击升级按钮时app会跳转到您预先设置的网址。 - 无更新不做任何操作。 - 需要先在服务器端设置app版本信息，默认渠道是App Store. + 检查当前app是否有更新，有则弹出UIAlertView提示用户,当用户点击升级按钮时app会跳转到您预先设置的网址。 + 无更新不做任何操作。 + 需要先在服务器端设置app版本信息，默认渠道是App Store. @return void. */ + (void)checkUpdate; /** 按渠道检测更新 - 检查当前app是否有更新，有则弹出UIAlertView提示用户,当用户点击升级按钮时app会跳转到您预先设置的网址。 - 无更新不做任何操作。 - 需要先在服务器端设置app版本信息，默认渠道是App Store. + 检查当前app是否有更新，有则弹出UIAlertView提示用户,当用户点击升级按钮时app会跳转到您预先设置的网址。 + 无更新不做任何操作。 + 需要先在服务器端设置app版本信息，默认渠道是App Store. @param title 对应UIAlertView的title. @param cancelTitle 对应UIAlertView的cancelTitle. @@ -234,7 +234,7 @@ typedef enum { + (void)checkUpdate:(NSString *)title cancelButtonTitle:(NSString *)cancelTitle otherButtonTitles:(NSString *)otherTitle; /** 设置自由控制更新callback函数 - 若程序需要自由控制收到更新内容后的流程可设置delegate和callback函数来完成 + 若程序需要自由控制收到更新内容后的流程可设置delegate和callback函数来完成 @param delegate 需要自定义checkUpdate的对象. @param callBackSelectorWithDictionary 当checkUpdate事件完成时此方法会被调用,同时标记app更新信息的字典被传回. @@ -247,16 +247,16 @@ typedef enum { ///--------------------------------------------------------------------------------------- /** 此方法会检查并下载服务端设置的在线参数,例如可在线更改SDK端发送策略。 - 请在[MobClick startWithAppkey:]方法之后调用; - 监听在线参数更新是否完成，可注册UMOnlineConfigDidFinishedNotification通知 + 请在[MobClick startWithAppkey:]方法之后调用; + 监听在线参数更新是否完成，可注册UMOnlineConfigDidFinishedNotification通知 @param . @return void. */ + (void)updateOnlineConfig; /** 返回已缓存的在线参数值 - 带参数的方法获取某个key的值，不带参数的获取所有的在线参数. - 需要先调用updateOnlineConfig才能使用,如果想知道在线参数是否完成完成，请监听UMOnlineConfigDidFinishedNotification + 带参数的方法获取某个key的值，不带参数的获取所有的在线参数. + 需要先调用updateOnlineConfig才能使用,如果想知道在线参数是否完成完成，请监听UMOnlineConfigDidFinishedNotification @param key @return (NSString *) . */ diff --git a/LIKE/LIKE/LKExternal/UMAnalytics/libMobClickLibrary.a b/LIKE/LIKE/LKExternal/UMAnalytics/libMobClickLibrary.a index 136266c..6ff542d 100644 Binary files a/LIKE/LIKE/LKExternal/UMAnalytics/libMobClickLibrary.a and b/LIKE/LIKE/LKExternal/UMAnalytics/libMobClickLibrary.a differ diff --git a/LIKE/LIKE/LKResource/FilterImage/Wasted.png b/LIKE/LIKE/LKResource/FilterImage/Wasted.png new file mode 100644 index 0000000..d86c71e Binary files /dev/null and b/LIKE/LIKE/LKResource/FilterImage/Wasted.png differ diff --git a/LIKE/LIKE/LKResource/FilterImage/Wasted2.png b/LIKE/LIKE/LKResource/FilterImage/Wasted2.png new file mode 100644 index 0000000..742280a Binary files /dev/null and b/LIKE/LIKE/LKResource/FilterImage/Wasted2.png differ diff --git "a/LIKE/LIKE/LKResource/Share/\345\217\230\345\275\242\351\207\221\345\210\232.png" "b/LIKE/LIKE/LKResource/Share/\345\217\230\345\275\242\351\207\221\345\210\232.png" new file mode 100644 index 0000000..9ebbb6f Binary files /dev/null and "b/LIKE/LIKE/LKResource/Share/\345\217\230\345\275\242\351\207\221\345\210\232.png" differ diff --git "a/LIKE/LIKE/LKResource/Share/\346\211\213\345\212\236.png" "b/LIKE/LIKE/LKResource/Share/\346\211\213\345\212\236.png" index 3976085..4edd435 100644 Binary files "a/LIKE/LIKE/LKResource/Share/\346\211\213\345\212\236.png" and "b/LIKE/LIKE/LKResource/Share/\346\211\213\345\212\236.png" differ diff --git "a/LIKE/LIKE/LKResource/Share/\346\227\205\350\241\214.png" "b/LIKE/LIKE/LKResource/Share/\346\227\205\350\241\214.png" index dac0b07..b67a548 100644 Binary files "a/LIKE/LIKE/LKResource/Share/\346\227\205\350\241\214.png" and "b/LIKE/LIKE/LKResource/Share/\346\227\205\350\241\214.png" differ diff --git "a/LIKE/LIKE/LKResource/Share/\346\230\237\347\220\203\345\244\247\346\210\230.png" "b/LIKE/LIKE/LKResource/Share/\346\230\237\347\220\203\345\244\247\346\210\230.png" new file mode 100644 index 0000000..f8690cf Binary files /dev/null and "b/LIKE/LIKE/LKResource/Share/\346\230\237\347\220\203\345\244\247\346\210\230.png" differ diff --git "a/LIKE/LIKE/LKResource/Share/\351\222\242\351\223\201\344\276\240.png" "b/LIKE/LIKE/LKResource/Share/\351\222\242\351\223\201\344\276\240.png" new file mode 100644 index 0000000..36d5da4 Binary files /dev/null and "b/LIKE/LIKE/LKResource/Share/\351\222\242\351\223\201\344\276\240.png" differ