Skip to content
This repository has been archived by the owner on Jul 2, 2019. It is now read-only.

更换Emoji #355

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

更换Emoji #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbdc3e7
菊花
Oct 17, 2017
85a3526
界面仿微信
Oct 23, 2017
5d5264c
更换Emoji
Oct 25, 2017
3ece32e
更新代码
Oct 26, 2017
835fc42
Merge remote-tracking branch 'origin/master' into ronaldo
Oct 26, 2017
a0c66c3
修改bug
Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added ChatKit-OC/.DS_Store
View file
Open in desktop
Binary file not shown.
48 changes: 42 additions & 6 deletions ChatKit-OC/ChatKit-OC.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
4F5E34B61FA069300067EB95 /* EmojisList.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4F5E34B51FA069300067EB95 /* EmojisList.plist */; };
4F5E34B81FA069540067EB95 /* [删除]@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4F5E34B71FA069540067EB95 /* [删除]@2x.png */; };
9A2669C81D6DA89100B66545 /* LCCKInputViewPluginConversationBackground.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A2669B81D6DA89100B66545 /* LCCKInputViewPluginConversationBackground.m */; };
9A2669C91D6DA89100B66545 /* LCCKVCardMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A2669BD1D6DA89100B66545 /* LCCKVCardMessage.m */; };
9A2669CA1D6DA89100B66545 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 9A2669BF1D6DA89100B66545 /* [email protected] */; };
Expand Down Expand Up @@ -92,6 +94,8 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
4F5E34B51FA069300067EB95 /* EmojisList.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = EmojisList.plist; sourceTree = "<group>"; };
4F5E34B71FA069540067EB95 /* [删除]@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[删除]@2x.png"; sourceTree = "<group>"; };
7404AB0E0935F68A63803D6D /* Pods-ChatKit-OC.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ChatKit-OC.release.xcconfig"; path = "Pods/Target Support Files/Pods-ChatKit-OC/Pods-ChatKit-OC.release.xcconfig"; sourceTree = "<group>"; };
9A0B721B1CED662D004FDACC /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
9A0B721D1CED6637004FDACC /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -440,6 +444,8 @@
9A4730541CECAEC500AEB86F /* Other */ = {
isa = PBXGroup;
children = (
4F5E34B71FA069540067EB95 /* [删除]@2x.png */,
4F5E34B51FA069300067EB95 /* EmojisList.plist */,
9A4730551CECAEC500AEB86F /* Assets.xcassets */,
9A4730561CECAEC500AEB86F /* LaunchScreen.storyboard */,
9A4730581CECAEC500AEB86F /* Info.plist */,
Expand Down Expand Up @@ -762,7 +768,7 @@
TargetAttributes = {
9A754D4A1CECAC3E000967F1 = {
CreatedOnToolsVersion = 7.3;
DevelopmentTeam = Y6X8P44TM5;
DevelopmentTeam = 44PUDQ6NP3;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.Push = {
Expand Down Expand Up @@ -800,7 +806,9 @@
9A4730701CECAEC500AEB86F /* Assets.xcassets in Resources */,
9AB37B2C1DC86A60000782F2 /* ChatKit.podspec in Resources */,
9A2669CE1D6DA89100B66545 /* LCCKVCardView.xib in Resources */,
4F5E34B81FA069540067EB95 /* [删除]@2x.png in Resources */,
9A2669CA1D6DA89100B66545 /* [email protected] in Resources */,
4F5E34B61FA069300067EB95 /* EmojisList.plist in Resources */,
9A4730681CECAEC500AEB86F /* LCCKLoginViewController.xib in Resources */,
9A53BE2D1D8BB13E00AAB118 /* RedpacketCellResource.bundle in Resources */,
);
Expand Down Expand Up @@ -830,13 +838,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ChatKit-OC-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
5852033203B0746EE8645654 /* 📦 Copy Pods Resources */ = {
Expand Down Expand Up @@ -890,9 +901,34 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-ChatKit-OC/Pods-ChatKit-OC-resources.sh",
"${PODS_ROOT}/AVOSCloud/AVOS/AVOSCloud/AVOSCloud_Art.inc",
"${PODS_ROOT}/../../ChatKit/Class/Resources/BarButtonIcon.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Resources/ChatKeyboard.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Resources/DateTools.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Resources/Emoji.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Resources/LCCKPBLocalizations.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Resources/LCCKPhotoBrowser.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Resources/MBProgressHUD.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Resources/MessageBubble.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Resources/Other.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Resources/Placeholder.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Resources/VoiceMessageSource.bundle",
"${PODS_ROOT}/../../ChatKit/Class/Module/ContactList/View/LCCKContactCell.xib",
"${PODS_ROOT}/MJRefresh/MJRefresh/MJRefresh.bundle",
$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser/MWPhotoBrowser.bundle,
"${PODS_ROOT}/RedPacketAlipay/AlipaySDK.bundle",
"${PODS_ROOT}/RedpacketLib/RedpacketStaticLib/resources/RedPacketResource.bundle",
"${PODS_ROOT}/TWMessageBarManager/Classes/Icons/icon-error.png",
"${PODS_ROOT}/TWMessageBarManager/Classes/Icons/[email protected]",
"${PODS_ROOT}/TWMessageBarManager/Classes/Icons/icon-info.png",
"${PODS_ROOT}/TWMessageBarManager/Classes/Icons/[email protected]",
"${PODS_ROOT}/TWMessageBarManager/Classes/Icons/icon-success.png",
"${PODS_ROOT}/TWMessageBarManager/Classes/Icons/[email protected]",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -1108,7 +1144,7 @@
CODE_SIGN_ENTITLEMENTS = "ChatKit-OC.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = Y6X8P44TM5;
DEVELOPMENT_TEAM = 44PUDQ6NP3;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/Example/Class/Module/Other/Info.plist";
Expand Down Expand Up @@ -1138,7 +1174,7 @@
"\"$(SRCROOT)/../../RedpacketStaticLib/AlipayLib\"/**",
);
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.chatkit.leancloud;
PRODUCT_BUNDLE_IDENTIFIER = com.leleyun.medassn;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -1155,7 +1191,7 @@
CODE_SIGN_ENTITLEMENTS = "ChatKit-OC.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = Y6X8P44TM5;
DEVELOPMENT_TEAM = 44PUDQ6NP3;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/Example/Class/Module/Other/Info.plist";
Expand Down Expand Up @@ -1185,7 +1221,7 @@
"\"$(SRCROOT)/../../RedpacketStaticLib/AlipayLib\"/**",
);
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.chatkit.leancloud;
PRODUCT_BUNDLE_IDENTIFIER = com.leleyun.medassn;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
Binary file added ChatKit-OC/Example/Class/Module/.DS_Store
View file
Open in desktop
Binary file not shown.
Loading