Skip to content

Commit cc6aac2

Browse files
wanghenghengwanghengheng
committed
beta
1 parent 04a7313 commit cc6aac2

20 files changed

Lines changed: 533 additions & 6 deletions

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,15 @@
120120
4E2BF3C31B95B97A00A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3BF1B95B97A00A5A0A8 /* [email protected] */; };
121121
4E2BF3C41B95B97A00A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3C01B95B97A00A5A0A8 /* [email protected] */; };
122122
4E2BF3C51B95B97A00A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3C11B95B97A00A5A0A8 /* [email protected] */; };
123+
4E2BF3CF1B96CDF800A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3C71B96CDF800A5A0A8 /* [email protected] */; };
124+
4E2BF3D01B96CDF800A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3C81B96CDF800A5A0A8 /* [email protected] */; };
125+
4E2BF3D11B96CDF800A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3C91B96CDF800A5A0A8 /* [email protected] */; };
126+
4E2BF3D21B96CDF800A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3CA1B96CDF800A5A0A8 /* [email protected] */; };
127+
4E2BF3D31B96CDF800A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3CB1B96CDF800A5A0A8 /* [email protected] */; };
128+
4E2BF3D41B96CDF800A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3CC1B96CDF800A5A0A8 /* [email protected] */; };
129+
4E2BF3D51B96CDF800A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3CD1B96CDF800A5A0A8 /* [email protected] */; };
130+
4E2BF3D61B96CDF800A5A0A8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4E2BF3CE1B96CDF800A5A0A8 /* [email protected] */; };
131+
4E2BF3D91B96D0FA00A5A0A8 /* CodingShareView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E2BF3D81B96D0FA00A5A0A8 /* CodingShareView.m */; };
123132
4E35A99F1A3EC47E00CE35F1 /* FileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E35A99E1A3EC47E00CE35F1 /* FileViewController.m */; };
124133
4E38CF5F1A7A28AF005536C0 /* CodeBranchTagButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E38CF5E1A7A28AF005536C0 /* CodeBranchTagButton.m */; };
125134
4E38CF621A7B7C99005536C0 /* CodeBranchOrTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E38CF611A7B7C99005536C0 /* CodeBranchOrTag.m */; };
@@ -1052,6 +1061,16 @@
10521061
4E2BF3BF1B95B97A00A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
10531062
4E2BF3C01B95B97A00A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
10541063
4E2BF3C11B95B97A00A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1064+
4E2BF3C71B96CDF800A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1065+
4E2BF3C81B96CDF800A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1066+
4E2BF3C91B96CDF800A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1067+
4E2BF3CA1B96CDF800A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1068+
4E2BF3CB1B96CDF800A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1069+
4E2BF3CC1B96CDF800A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1070+
4E2BF3CD1B96CDF800A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1071+
4E2BF3CE1B96CDF800A5A0A8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
1072+
4E2BF3D71B96D0FA00A5A0A8 /* CodingShareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodingShareView.h; sourceTree = "<group>"; };
1073+
4E2BF3D81B96D0FA00A5A0A8 /* CodingShareView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CodingShareView.m; sourceTree = "<group>"; };
10551074
4E35A99D1A3EC47E00CE35F1 /* FileViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileViewController.h; sourceTree = "<group>"; };
10561075
4E35A99E1A3EC47E00CE35F1 /* FileViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileViewController.m; sourceTree = "<group>"; };
10571076
4E38CF5D1A7A28AF005536C0 /* CodeBranchTagButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeBranchTagButton.h; sourceTree = "<group>"; };
@@ -2435,6 +2454,21 @@
24352454
path = tweet_btn;
24362455
sourceTree = "<group>";
24372456
};
2457+
4E2BF3C61B96CDF800A5A0A8 /* share_btn */ = {
2458+
isa = PBXGroup;
2459+
children = (
2460+
4E2BF3C71B96CDF800A5A0A8 /* [email protected] */,
2461+
4E2BF3C81B96CDF800A5A0A8 /* [email protected] */,
2462+
4E2BF3C91B96CDF800A5A0A8 /* [email protected] */,
2463+
4E2BF3CA1B96CDF800A5A0A8 /* [email protected] */,
2464+
4E2BF3CB1B96CDF800A5A0A8 /* [email protected] */,
2465+
4E2BF3CC1B96CDF800A5A0A8 /* [email protected] */,
2466+
4E2BF3CD1B96CDF800A5A0A8 /* [email protected] */,
2467+
4E2BF3CE1B96CDF800A5A0A8 /* [email protected] */,
2468+
);
2469+
path = share_btn;
2470+
sourceTree = "<group>";
2471+
};
24382472
4E53EB4C1AF9CC520034FE1C /* RKSwipeBetweenViewControllers */ = {
24392473
isa = PBXGroup;
24402474
children = (
@@ -3763,6 +3797,7 @@
37633797
8EA6CF5D19E240C40076D59C /* Images */ = {
37643798
isa = PBXGroup;
37653799
children = (
3800+
4E2BF3C61B96CDF800A5A0A8 /* share_btn */,
37663801
4E2BF3BD1B95B97A00A5A0A8 /* tweet_btn */,
37673802
4E93F2341B84356500017916 /* file_menu_icon */,
37683803
4EAE06BB1B7B51AF00179F4B /* file_activity_icon */,
@@ -4261,6 +4296,8 @@
42614296
8BDF9AA51B7456060093BF2C /* HotTopicBannerView.m */,
42624297
4E095A5A1B6907AA008DC439 /* CodingBannersView.h */,
42634298
4E095A5B1B6907AA008DC439 /* CodingBannersView.m */,
4299+
4E2BF3D71B96D0FA00A5A0A8 /* CodingShareView.h */,
4300+
4E2BF3D81B96D0FA00A5A0A8 /* CodingShareView.m */,
42644301
);
42654302
path = Views;
42664303
sourceTree = "<group>";
@@ -4584,6 +4621,7 @@
45844621
4E6383BB1B32640900D98648 /* [email protected] in Resources */,
45854622
4E095A851B6B24DE008DC439 /* [email protected] in Resources */,
45864623
7E8E59841B6F91C40083CA02 /* [email protected] in Resources */,
4624+
4E2BF3CF1B96CDF800A5A0A8 /* [email protected] in Resources */,
45874625
8EA6D15019E240C40076D59C /* [email protected] in Resources */,
45884626
8EA6D15E19E240C40076D59C /* [email protected] in Resources */,
45894627
8E97CE721A0B8C6C006F9AD7 /* emotion_list.plist in Resources */,
@@ -4610,6 +4648,7 @@
46104648
4EF17ED71B3C3112003CDD2D /* [email protected] in Resources */,
46114649
4E6384031B33C8E900D98648 /* [email protected] in Resources */,
46124650
4EACB4401A2C448F0097ABB3 /* [email protected] in Resources */,
4651+
4E2BF3D41B96CDF800A5A0A8 /* [email protected] in Resources */,
46134652
8E8F7B2F19EF6306006BA8BD /* [email protected] in Resources */,
46144653
4E96E7E01A1B537E0037C098 /* [email protected] in Resources */,
46154654
4EFE8DAC1B394A0D004B7559 /* [email protected] in Resources */,
@@ -4689,11 +4728,13 @@
46894728
8EA6D15F19E240C40076D59C /* [email protected] in Resources */,
46904729
4E66EE2A1A28226000DA1B3E /* [email protected] in Resources */,
46914730
8EA6D18419E240C40076D59C /* [email protected] in Resources */,
4731+
4E2BF3D21B96CDF800A5A0A8 /* [email protected] in Resources */,
46924732
4E07D3151A4D3CA6009EDDF2 /* [email protected] in Resources */,
46934733
8EA6D17519E240C40076D59C /* [email protected] in Resources */,
46944734
B94C1B6B1AC945FB0000C271 /* NewProject.storyboard in Resources */,
46954735
8ED2AAFA19F60D5200607A1D /* [email protected] in Resources */,
46964736
8B3516501B6CE9460049BC45 /* [email protected] in Resources */,
4737+
4E2BF3D31B96CDF800A5A0A8 /* [email protected] in Resources */,
46974738
4EE1A23D1B5F3834004284F1 /* [email protected] in Resources */,
46984739
4E5C06E81AC2B34800F427C5 /* [email protected] in Resources */,
46994740
7E774C261B870DC70026E5AB /* [email protected] in Resources */,
@@ -4712,11 +4753,13 @@
47124753
4EF17ECB1B3C3112003CDD2D /* [email protected] in Resources */,
47134754
0A6E6BBB1AB168B0004C0107 /* [email protected] in Resources */,
47144755
8EA6D16919E240C40076D59C /* [email protected] in Resources */,
4756+
4E2BF3D11B96CDF800A5A0A8 /* [email protected] in Resources */,
47154757
4EF17EE41B3C3112003CDD2D /* [email protected] in Resources */,
47164758
4EAE06C01B7B51AF00179F4B /* [email protected] in Resources */,
47174759
8EA6D18F19E240C40076D59C /* [email protected] in Resources */,
47184760
7E774C251B870DC70026E5AB /* [email protected] in Resources */,
47194761
8EA6D16A19E240C40076D59C /* [email protected] in Resources */,
4762+
4E2BF3D61B96CDF800A5A0A8 /* [email protected] in Resources */,
47204763
4E96E7E51A1B537E0037C098 /* [email protected] in Resources */,
47214764
4E90F89E1AF709C100B44F03 /* topic-ios.html in Resources */,
47224765
4EF17EDF1B3C3112003CDD2D /* [email protected] in Resources */,
@@ -4843,6 +4886,7 @@
48434886
8E97CE611A0A3424006F9AD7 /* [email protected] in Resources */,
48444887
4E93F23B1B84356500017916 /* [email protected] in Resources */,
48454888
8E1C3DF619E7F4CA00EF3032 /* address.json in Resources */,
4889+
4E2BF3D01B96CDF800A5A0A8 /* [email protected] in Resources */,
48464890
4EF17ED41B3C3112003CDD2D /* [email protected] in Resources */,
48474891
8EA6D18819E240C40076D59C /* [email protected] in Resources */,
48484892
8EA6D18D19E240C40076D59C /* [email protected] in Resources */,
@@ -4926,6 +4970,7 @@
49264970
8E97CEAA1A0C7E26006F9AD7 /* [email protected] in Resources */,
49274971
4EB845331AB83C3B0030DC69 /* [email protected] in Resources */,
49284972
4E90F89D1AF709C100B44F03 /* markdown.html in Resources */,
4973+
4E2BF3D51B96CDF800A5A0A8 /* [email protected] in Resources */,
49294974
4EB845351AB83C3B0030DC69 /* [email protected] in Resources */,
49304975
4E96E7E31A1B537E0037C098 /* [email protected] in Resources */,
49314976
8EA6D18919E240C40076D59C /* [email protected] in Resources */,
@@ -5053,6 +5098,7 @@
50535098
4ECE8ADA1A3943E80021E29C /* NSDate+Common.m in Sources */,
50545099
8EA6D20A19E240C40076D59C /* RDVTabBar.m in Sources */,
50555100
4E0BD8861B6C7F0A0061CAA6 /* TMCacheExtend.m in Sources */,
5101+
4E2BF3D91B96D0FA00A5A0A8 /* CodingShareView.m in Sources */,
50565102
8E1C3DF019E7D58A00EF3032 /* DistancePickerView.m in Sources */,
50575103
4EAE06AE1B7B241A00179F4B /* FileVersionsViewController.m in Sources */,
50585104
4EAE06BA1B7B47A700179F4B /* FileVersion.m in Sources */,

‎Coding_iOS/AppDelegate.m‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
#import "PasswordViewController.h"
2626
#import "IntroductionViewController.h"
2727
#import "FunctionIntroManager.h"
28+
#import <UMengSocial/UMSocial.h>
29+
#import <UMengSocial/UMSocialWechatHandler.h>
30+
#import <UMengSocial/UMSocialQQHandler.h>
31+
#import <UMengSocial/UMSocialSinaHandler.h>
32+
2833

2934
#import "Tweet.h"
3035
#import "sys/utsname.h"
@@ -113,6 +118,12 @@ - (void)completionStartAnimationWithOptions:(NSDictionary *)launchOptions{
113118
// UMENG 统计
114119
[MobClick startWithAppkey:kUmeng_AppKey reportPolicy:BATCH channelId:nil];
115120

121+
// UMENG Social
122+
[UMSocialData setAppKey:@"507fcab25270157b37000010"];
123+
[UMSocialWechatHandler setWXAppId:@"wxd930ea5d5a258f4f" appSecret:@"db426a9829e4b49a0dcac7b4162da6b6" url:[NSObject baseURLStr]];
124+
[UMSocialQQHandler setQQWithAppId:@"100424468" appKey:@"c7394704798a158208a74ab60104f0ba" url:[NSObject baseURLStr]];
125+
[UMSocialSinaHandler openSSOWithRedirectURL:@"http://sns.whalecloud.com/sina2/callback"];
126+
116127
// 信鸽推送
117128
[XGPush startApp:kXGPush_Id appKey:kXGPush_Key];
118129
[Login setXGAccountWithCurUser];

‎Coding_iOS/Coding_iOS-Info.plist‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<key>CFBundleURLSchemes</key>
2929
<array>
3030
<string>coding-net</string>
31+
<string>wb126663232</string>
32+
<string>QQ05FC5B14</string>
33+
<string>wxd9a39c7122aa6516</string>
3134
</array>
3235
</dict>
3336
</array>

‎Coding_iOS/Controllers/ConversationViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,12 +385,12 @@ - (void)willTranspondMessage:(PrivateMessage *)message{
385385
}
386386

387387
- (void)doTranspondMessage:(PrivateMessage *)curMessage{
388-
[self showHudTipStr:@"已发送"];
389388
if ([curMessage.friend.global_key isEqualToString:_myPriMsgs.curFriend.global_key]) {
390389
[self sendPrivateMessageWithMsg:curMessage];
391390
}else{
392391
[[Coding_NetAPIManager sharedManager] request_SendPrivateMessage:curMessage andBlock:^(id data, NSError *error) {
393392
if (data) {
393+
[self showHudTipStr:@"已发送"];
394394
DebugLog(@"转发成功：%@, %@", curMessage.friend.name, curMessage.htmlMedia.contentOrigional);
395395
}
396396
}];

‎Coding_iOS/Controllers/RootControllers/BaseViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr analyseMethod:(An
160160
NSString *pp_id = matchedCaptures[2];
161161
if ([presentingVC isKindOfClass:[TweetDetailViewController class]]) {
162162
TweetDetailViewController *vc = (TweetDetailViewController *)presentingVC;
163-
if ([vc.curTweet.pp_id isEqualToString:pp_id]
164-
&& [vc.curTweet.user_global_key isEqualToString:user_global_key]) {
163+
if ([vc.curTweet.id.stringValue isEqualToString:pp_id]
164+
&& [vc.curTweet.owner.global_key isEqualToString:user_global_key]) {
165165
[vc refreshTweet];
166166
analyseVCIsNew = NO;
167167
analyseVC = vc;

‎Coding_iOS/Images/.DS_Store‎

0 Bytes
Binary file not shown.

‎Coding_iOS/Images/share_btn/[email protected]‎

4.15 KB
Loading

‎Coding_iOS/Images/share_btn/[email protected]‎

4.17 KB
Loading

‎Coding_iOS/Images/share_btn/[email protected]‎

4 KB
Loading

‎Coding_iOS/Images/share_btn/[email protected]‎

3.5 KB
Loading

0 commit comments

Comments
 (0)