apple 6 жил өмнө
parent
commit
af50f7704c

BIN
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate


+ 3 - 3
ios/JianYuIOS/JianYuIOS.xcworkspace/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -26,11 +26,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "JianYuIOS/AppDelegate.m"
-            timestampString = "556186451.709945"
+            timestampString = "558411242.3393019"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "401"
-            endingLineNumber = "401"
+            startingLineNumber = "400"
+            endingLineNumber = "400"
             landmarkName = "-application:handleOpenURL:"
             landmarkType = "7">
          </BreakpointContent>

+ 3 - 4
ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -248,11 +248,10 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
             // 跳转到该链接
             [[NSNotificationCenter defaultCenter] postNotificationName:kRequestWebViewWithUrl object:temp userInfo:nil];
             
-            [[LXDataBaseManager shareDataBaseManager] changeCatagoryTypeWithURL:info[@"url"]];
-            
-            
-            
              if([info[@"type"] isEqualToString:@"message"]) {
+                 
+                 [[LXDataBaseManager shareDataBaseManager] changeCatagoryTypeWithURL:info[@"url"]];
+                 
                  NSDictionary * infoDic;
                  if(self.wakeUpBool) {
                      infoDic = @{@"url":info[@"url"],

+ 3 - 2
ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -28,8 +28,9 @@
 
 //#define kHost @"https://www.jianyu360.com/"
 
-//#define kHost @"http://webws.qmx.top/"
-//#define kHost @"http://webwcj.qmx.top/"
+//#define kHost @"http://weblxl.qmx.top/" //小璐
+//#define kHost @"http://webws.qmx.top/" //王山
+//#define kHost @"http://webwcj.qmx.top/"//王传近
 #define kHost @"http://w2blmjy.qmx.top/"//测试环境
 //#define kHost @"123.56.103.12/"
 

+ 4 - 4
ios/JianYuIOS/JianYuIOS/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.6</string>
+	<string>1.0.8</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -56,7 +56,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>12</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wtloginmqq2</string>
@@ -83,14 +83,14 @@
 			<true/>
 			<key>NSIncludesSubdomains</key>
 			<true/>
-			<key>webws.qmx.top</key>
+			<key>w2blmjy.qmx.top</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>
 				<key>NSIncludesSubdomains</key>
 				<true/>
 			</dict>
-			<key>w2blmjy.qmx.top</key>
+			<key>webws.qmx.top</key>
 			<dict>
 				<key>NSExceptionAllowsInsecureHTTPLoads</key>
 				<true/>

+ 78 - 5
ios/JianYuIOS/JianYuIOS/VfiewController.m

@@ -15,9 +15,11 @@
 #import <AFNetworking.h>
 #import "NoNetView.h"
 //#import <WebKit/WebKit.h>
+#import  <CommonCrypto/CommonCryptor.h>
 
 
 
+#define LocalStr_None @""//空字符串
 #define KIsiPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
 
 @protocol ViewControllerMain<JSExport>
@@ -27,6 +29,8 @@
 
 @end
 
+
+
 @protocol ViewControllerJSExport<JSExport>
 
 JSExportAs(loginByWeixin, -(NSString *)jsLoginByWeixin:(NSString *)str);// 微信登录 openid
@@ -48,22 +52,24 @@ JSExportAs(openExternalLink, -(void)jsOpenExternalLink:(NSString *)url title:(NS
 JSExportAs(getVersion, -(NSString *)jsGetVersion:(NSString *)str);// 获取当前版本号
 JSExportAs(alert, -(void)jsAlert:(NSString *)content);// 弹框
 JSExportAs(isInstallWeixin, -(int)jsIsInstallWeixin:(NSString *)str);// 是否安装微信
-
-
 JSExportAs(changeMessageType, -(void)jsChangeMessageType:(NSString *)link);//已读操作处理
 JSExportAs(openActivityPage, -(void)jsOpenActivityPage:(NSString *)url rectype:(NSString *)rectype openid:(NSString *)openid);
 
+JSExportAs(getCipherText, -(NSString *)jsGGetCipherText:(NSString *)phone);
 
+JSExportAs(business, -(NSInteger)jsBusiness:(NSInteger)shooID shopType:(NSInteger )shopType);
 
 
-@end
 
 
+@end
+
 
 @interface ViewController ()<UIWebViewDelegate, ViewControllerJSExport>
 {
     CGPoint startTouch;
     BOOL _isMoving;
+    
 }
 
 @property (weak, nonatomic) IBOutlet UIWebView *webView;
@@ -81,6 +87,10 @@ JSExportAs(openActivityPage, -(void)jsOpenActivityPage:(NSString *)url rectype:(
 
 @end
 
+NSString *const kInitVector = @"1389461544135476";
+size_t const kKeySize = kCCKeySizeAES128;
+NSString *const AesKey = @"mGlAgnIBB8bx2nch";
+
 @implementation ViewController
 
 - (void)viewDidLoad {
@@ -114,7 +124,7 @@ JSExportAs(openActivityPage, -(void)jsOpenActivityPage:(NSString *)url rectype:(
     
 
     
-//    [self clearWeb];
+    [self clearWeb];
 
     UIPanGestureRecognizer *recognizer = [[UIPanGestureRecognizer alloc]initWithTarget:self action:@selector(paningGestureReceive:)];
     [recognizer delaysTouchesBegan];
@@ -589,7 +599,7 @@ JSExportAs(openActivityPage, -(void)jsOpenActivityPage:(NSString *)url rectype:(
     if (arr.count > 0) {
         return [[LXViewControllerManager shareViewControllerManager] getJsonStr:arr];
     }
-    return@"";
+    return @"";
 }
 
 // 更新消息状态
@@ -712,6 +722,69 @@ JSExportAs(openActivityPage, -(void)jsOpenActivityPage:(NSString *)url rectype:(
 }
 
 
+
+
+
+-(NSString *)jsGGetCipherText:(NSString *)phone
+{
+    
+    NSDate *date=[NSDate date];
+    NSDateFormatter *format1=[[NSDateFormatter alloc] init];
+    [format1 setDateFormat:@"yyyyMMddhhmmss"];
+    NSString *dateStr;
+    dateStr=[format1 stringFromDate:date];
+    NSLog(@"%@",dateStr);
+    
+    NSString *content = [[NSString stringWithFormat:@"%@_%@",phone,dateStr] stringByAppendingString:[NSString stringWithFormat:@"_%@",[LXMD5 md532BitLower:[NSString stringWithFormat:@"%@&%@",phone,dateStr]]]];
+    NSData *contentData = [content dataUsingEncoding:NSUTF8StringEncoding];
+    NSUInteger dataLength = contentData.length;
+    // 为结束符'\\0' +1
+    char keyPtr[kKeySize + 1];
+    memset(keyPtr, 0, sizeof(keyPtr));
+    [AesKey getCString:keyPtr maxLength:sizeof(keyPtr) encoding:NSUTF8StringEncoding];
+    // 密文长度 <= 明文长度 + BlockSize
+    size_t encryptSize = dataLength + kCCBlockSizeAES128;
+    void *encryptedBytes = malloc(encryptSize);
+    size_t actualOutSize = 0;
+    NSData *initVector = [kInitVector dataUsingEncoding:NSUTF8StringEncoding];
+    CCCryptorStatus cryptStatus = CCCrypt(kCCEncrypt,
+                                          kCCAlgorithmAES,
+                                          kCCOptionPKCS7Padding,  // 系统默认使用 CBC,然后指明使用 PKCS7Padding
+                                          keyPtr,
+                                          kKeySize,
+                                          initVector.bytes,
+                                          contentData.bytes,
+                                          dataLength,
+                                          encryptedBytes,
+                                          encryptSize,
+                                          &actualOutSize);
+    if (cryptStatus == kCCSuccess) {
+        // 对加密后的数据进行 base64 编码
+        return [[NSData dataWithBytesNoCopy:encryptedBytes length:actualOutSize] base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithLineFeed];
+    }
+    free(encryptedBytes);
+    return nil;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+