bugfix

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -3191,7 +3191,7 @@
 		B19D4EF91F7247BA00C598F3 /* AlipaySDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = AlipaySDK.bundle; sourceTree = "<group>"; };
 		B19D4EFA1F7247BA00C598F3 /* AlipaySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AlipaySDK.framework; sourceTree = "<group>"; };
 		B19D4EFD1F724CDC00C598F3 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
-		B1B2BDAE1F78A59F00645EAD /* route.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = route.h; path = ../../../../../../Desktop/route.h; sourceTree = "<group>"; };
+		B1B2BDB01F79E74000645EAD /* net_route.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_route.h; sourceTree = "<group>"; };
 		B1C871121EADAEE1003DACF0 /* loading_monkey@2x.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "loading_monkey@2x.gif"; sourceTree = "<group>"; };
 		B1C871141EADF0B1003DACF0 /* messageAT@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "messageAT@3x.png"; sourceTree = "<group>"; };
 		B1C871151EADF0B1003DACF0 /* messageComment@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "messageComment@3x.png"; sourceTree = "<group>"; };
@@ -3837,7 +3837,7 @@
 				4E3068381E0B781A00AEE0CE /* LDSimplePing.h */,
 				4E3068391E0B781A00AEE0CE /* LDSimplePing.m */,
 				4E30683A1E0B781A00AEE0CE /* Route.h */,
-				B1B2BDAE1F78A59F00645EAD /* route.h */,
+				B1B2BDB01F79E74000645EAD /* net_route.h */,
 			);
 			path = LDNetDiagnoService;
 			sourceTree = "<group>";

Coding_iOS/Controllers/Shop/ExchangeGoodsViewController.m

@@ -398,7 +398,7 @@ - (void)exchangeActionClicked{
     mparms[@"receiverPhone"] = _receiverPhone;
     mparms[@"remark"] = _remark;
     mparms[@"giftId"] = _shopGoods.id;
-    mparms[@"payment_amount"] = _shopGoods.curPrice;
+//    mparms[@"payment_amount"] = _shopGoods.curPrice;
     mparms[@"point_discount"] = _shopGoods.curPointWillUse;
 //    mparms[@"pay_method"] = @"Alipay";
 //    mparms[@"password"] = [pwd sha1Str];
@@ -416,6 +416,7 @@ - (void)exchangeActionClicked{
                     }
                 }];
             }else{//码币兑换，直接成功
+                [NSObject hideHUDQuery];;
                 [NSObject showHudTipStr:@"恭喜你，提交订单成功!"];
                 [weakSelf goToAfterPay];
             }
@@ -433,14 +434,17 @@ - (void)aliPayOrder:(NSString *)orderStr{
 }
 
 - (void)handleAliResult:(NSDictionary *)resultDic{
+    DebugLog(@"handleAliResult: %@", resultDic);
     BOOL isPaySuccess = ([resultDic[@"resultStatus"] integerValue] == 9000);
     [NSObject showHudTipStr:isPaySuccess? @"支付成功": @"支付失败"];
     [self goToAfterPay];
 }
 
 - (void)goToAfterPay{
+    UINavigationController *nav = self.navigationController;
+    [nav popViewControllerAnimated:NO];
     ShopOrderViewController *orderViewController = [[ShopOrderViewController alloc] init];
-    [self.navigationController pushViewController:orderViewController animated:YES];
+    [nav pushViewController:orderViewController animated:YES];
 }
 
 - (void)dealloc

Coding_iOS/Util/EADeviceToServerLog/LDNetDiagnoService/LDNetGetAddress.m

@@ -19,7 +19,7 @@
 #import <netinet/in.h>
 
 #if TARGET_IPHONE_SIMULATOR
-#include "route.h"
+#include "net_route.h"
 #else
 #include "Route.h"
 #endif /*the very same from google-code*/