Skip to content

Commit

Permalink
修复发送消息群主显示问题
Browse files Browse the repository at this point in the history
  • Loading branch information
angelporo committed Dec 9, 2017
1 parent ca362c9 commit ba0697f
Show file tree
Hide file tree
Showing 17 changed files with 312 additions and 491 deletions.
4 changes: 2 additions & 2 deletions android/app/src/main/assets/index.android.bundle

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions android/app/src/main/assets/index.android.bundle.meta
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
g�b
#�Dy�5%� ot
y�LVp�
��p�����%"|
35 changes: 31 additions & 4 deletions ios/ImClient.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
};
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
Expand Down Expand Up @@ -52,6 +53,7 @@
2DCD954D1E0B4F2C00145EB5 /* ImClientTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ImClientTests.m */; };
361F273C6014468DAA3BDA38 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = ACDA8E8417314A36BA7205AA /* MaterialIcons.ttf */; };
3F6E80E45DDA439FB117FD44 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 84B9CE6EC6D642D5BE0C7552 /* MaterialCommunityIcons.ttf */; };
408DAA9933B54341A3736375 /* libRNFetchBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31572964BE904874ACF4C2E4 /* libRNFetchBlob.a */; };
495FF45923024D3CAFDD676E /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8149E0F541A944D59BE7882D /* Ionicons.ttf */; };
4A652B03779F4127A0EF0D57 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DBD2A6F246414D94B6EE6D32 /* SimpleLineIcons.ttf */; };
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
Expand All @@ -68,7 +70,6 @@
DA8CFC2450DD4243B850A8F8 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2804315DAB8B4114811FAAA4 /* Entypo.ttf */; };
E1B3823FE711488083C0F1E2 /* libRNFS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D91FBB2CC9C344C3948652EB /* libRNFS.a */; };
F0C7A2CE13C74A2DBB7A3A1A /* libRCTImageResizer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 308704DF2D604318A7485AD9 /* libRCTImageResizer.a */; };
408DAA9933B54341A3736375 /* libRNFetchBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 31572964BE904874ACF4C2E4 /* libRNFetchBlob.a */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -163,6 +164,13 @@
remoteGlobalIDString = 5DBEB1501B18CEA900B34395;
remoteInfo = RNVectorIcons;
};
0BFBC4541FD9481800E34402 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6EA30BAA6703476BB2108F7A /* RNFetchBlob.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A15C300E1CD25C330074CB35;
remoteInfo = RNFetchBlob;
};
139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
Expand Down Expand Up @@ -367,12 +375,14 @@
2D02E47B1E0B4A5D006451C7 /* ImClient-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ImClient-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2D02E4901E0B4A5D006451C7 /* ImClient-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ImClient-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
308704DF2D604318A7485AD9 /* libRCTImageResizer.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTImageResizer.a; sourceTree = "<group>"; };
31572964BE904874ACF4C2E4 /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFetchBlob.a; sourceTree = "<group>"; };
43B8F1DAA3E34F4A93E3B29D /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; };
52A852C8A1854F61BEED265F /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; };
56C813F58F3048598D756768 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
5FCF0FB6A612436DADE581DA /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
6C96534D3997491B89EE39FB /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNImagePicker.xcodeproj; path = "../node_modules/react-native-image-picker/ios/RNImagePicker.xcodeproj"; sourceTree = "<group>"; };
6EA30BAA6703476BB2108F7A /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFetchBlob.xcodeproj; path = "../node_modules/react-native-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = "<group>"; };
72575A255C61428780F0DCCC /* RealmReact.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RealmReact.xcodeproj; path = "../node_modules/realm/react-native/ios/RealmReact.xcodeproj"; sourceTree = "<group>"; };
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
7ECEF3256F2B4376854200CD /* RNFS.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFS.xcodeproj; path = "../node_modules/react-native-fs/RNFS.xcodeproj"; sourceTree = "<group>"; };
Expand All @@ -391,8 +401,6 @@
DBD2A6F246414D94B6EE6D32 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; };
E1CBE1CEC2A545218604EC99 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; };
E98317D7E7AB4CEA967C2338 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
6EA30BAA6703476BB2108F7A /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; name = "RNFetchBlob.xcodeproj"; path = "../node_modules/react-native-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
31572964BE904874ACF4C2E4 /* libRNFetchBlob.a */ = {isa = PBXFileReference; name = "libRNFetchBlob.a"; path = "libRNFetchBlob.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -559,7 +567,7 @@
308704DF2D604318A7485AD9 /* libRCTImageResizer.a */,
D91FBB2CC9C344C3948652EB /* libRNFS.a */,
CEE548344173409786D13FD8 /* libimageCropPicker.a */,
AB382DB1F9EA46CC8E6EB2F0 /* libRNFetchBlob.a */,
31572964BE904874ACF4C2E4 /* libRNFetchBlob.a */,
);
name = "Recovered References";
sourceTree = "<group>";
Expand Down Expand Up @@ -597,6 +605,14 @@
name = Products;
sourceTree = "<group>";
};
0BFBC4511FD9481700E34402 /* Products */ = {
isa = PBXGroup;
children = (
0BFBC4551FD9481800E34402 /* libRNFetchBlob.a */,
);
name = Products;
sourceTree = "<group>";
};
139105B71AF99BAD00B5F7CC /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -934,6 +950,10 @@
ProductGroup = 0B21B3EF1F64D4440021DD91 /* Products */;
ProjectRef = 72575A255C61428780F0DCCC /* RealmReact.xcodeproj */;
},
{
ProductGroup = 0BFBC4511FD9481700E34402 /* Products */;
ProjectRef = 6EA30BAA6703476BB2108F7A /* RNFetchBlob.xcodeproj */;
},
{
ProductGroup = 0B42C5AE1F70C5C6002B8ACD /* Products */;
ProjectRef = 7ECEF3256F2B4376854200CD /* RNFS.xcodeproj */;
Expand Down Expand Up @@ -1042,6 +1062,13 @@
remoteRef = 0BC624AD1F58F163005BDEB8 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
0BFBC4551FD9481800E34402 /* libRNFetchBlob.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRNFetchBlob.a;
remoteRef = 0BFBC4541FD9481800E34402 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
139105C11AF99BAD00B5F7CC /* libRCTSettings.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"bundle-ios": "node node_modules/react-native/local-cli/cli.js bundle --entry-file index.ios.js --platform ios --dev false --bundle-output ./ios/bundle/index.ios.jsbundle --assets-dest ./ios/bundle",
"bundle-android": "react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/src/main/res/",
"build-android": "cd android && ./gradlew installRelease",
"build-dev-android": "cd android && ./gradlew assembleDevDebug",
"build-dev-android": "cd android && ./gradlew assembleDevDebug",
"build-pro-android":"cd android && ./gradlew assembleRelease",
"dev": "cross-env NODE_ENV=development",
"build": "cross-env NODE_ENV=production"
},
Expand Down
Loading

0 comments on commit ba0697f

Please sign in to comment.