拆分sikey common sdk

ChineseMedicine.xcworkspace/xcuserdata/liuzhenxing.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -76,83 +76,5 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "618834A6-C7F3-4B44-9D78-986153F66245"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ChineseMedicine/ViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "30"
-            endingLineNumber = "30"
-            landmarkName = "-viewDidLoad"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "618834A6-C7F3-4B44-9D78-986153F66245 - 310c039c1dd9061"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[ViewController viewDidLoad]"
-                  moduleName = "ChineseMedicine"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/liuzhenxing/Documents/H210/ChineseMedicine/ChineseMedicine/ViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "30"
-                  endingLineNumber = "30"
-                  offsetFromSymbolStart = "182">
-               </Location>
-               <Location
-                  uuid = "618834A6-C7F3-4B44-9D78-986153F66245 - 310c039c1dd9061"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[ViewController viewDidLoad]"
-                  moduleName = "ChineseMedicine"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/liuzhenxing/Documents/H210/ChineseMedicine/ChineseMedicine/ViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "30"
-                  endingLineNumber = "30"
-                  offsetFromSymbolStart = "280">
-               </Location>
-               <Location
-                  uuid = "618834A6-C7F3-4B44-9D78-986153F66245 - 310c039c1dd9061"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[ViewController viewDidLoad]"
-                  moduleName = "ChineseMedicine"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/liuzhenxing/Documents/H210/ChineseMedicine/ChineseMedicine/ViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "30"
-                  endingLineNumber = "30"
-                  offsetFromSymbolStart = "300">
-               </Location>
-               <Location
-                  uuid = "618834A6-C7F3-4B44-9D78-986153F66245 - 310c039c1dd9061"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[ViewController viewDidLoad]"
-                  moduleName = "ChineseMedicine"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/liuzhenxing/Documents/H210/ChineseMedicine/ChineseMedicine/ViewController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "30"
-                  endingLineNumber = "30"
-                  offsetFromSymbolStart = "116">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

ChineseMedicine/Manager/ChineseMedicineManager.m → ChineseMedicine/ChineseMedicineSDK/Manager/ChineseMedicineManager.m

@@ -36,8 +36,10 @@
 }
 
 - (void)requestInfo:(void(^)(BOOL isOK))callback {
+    NSLog(@"==============requestInfo===================");
     __weak __typeof(self) weak_self = self;
     [self requestLoginInfo:^(BOOL isOK) {
+        NSLog(@"==============requestInfo1===================");
         if (isOK) {
             [weak_self requestPayInfo:^(BOOL isOK) {
                 callback(isOK);
@@ -49,6 +51,7 @@
 }
 
 - (void)requestLoginInfo:(void(^)(BOOL isOK))callback {
+    NSLog(@"========requestLoginInfo ============");
     NSString* deviceName = [self.mUserModel.deviceName isEqualToString:@""] ? DEVICE_MODEL : self.mUserModel.deviceName;
     NSDictionary *param = @{
         KEY_USERID : self.mUserModel.userId,
@@ -56,7 +59,8 @@
         @"deviceName" : deviceName,
     };
     __weak __typeof(self) weak_self = self;
-    [LoginInfoRequest beforeLoginHttpRequest:param onSuccess:^(NSDictionary *result) {
+    [LoginInfoRequest httpRequestWithoutEncrypt:param httpMethod:@"POST" onSuccess:^(NSDictionary *result) {
+        NSLog(@"==============requestLoginInfo1===================");
         if ([ERequest isSuccessWithResult:result]) {
             weak_self.mUserModel.isOK = YES;
             weak_self.mUserModel.token = result[KEY_DATA][@"token"];

ChineseMedicine/PrefixHeader.pch → ChineseMedicine/ChineseMedicineSDK/PrefixHeader.pch

@@ -11,11 +11,14 @@
 // Include any system framework and library headers here that should be included in all compilation units.
 // You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
 
+//#import <SikeyCommonSDK/SikeyCommonSDK.h>
+#import "ERequest.h"
+#import "ServerManager.h"
+#import "SKDefine.h"
 
 #import "SKMacro.h"
 #import "SKValue.h"
 #import "SKUtils.h"
-#import "ServerManager.h"
 #import "ERequestList.h"
 
 #import "OnceModel.h"

ChineseMedicine/ChineseMedicineSDK/Request/ERequestList.h

@@ -0,0 +1,45 @@
+#import "ERequestParam.h"
+
+@interface LoginInfoRequest : ERequestParam
+@end
+
+@interface LaestDetectionRequest : ERequestParam
+@end
+
+@interface PayInfoRequest : ERequestParam
+@end
+
+@interface VipPriceRequest : ERequestParam
+@end
+
+//首次使用
+@interface VipTrialRequest : ERequestParam
+@end
+
+@interface PayResultRequest : ERequestParam
+@end
+
+@interface WebpayRequest : ERequestParam
+@end
+
+@interface AlipayRequest : ERequestParam
+@end
+
+@interface WxpayRequest : ERequestParam
+@end
+
+//上传手表检测数据
+@interface PostSubmitPulseRequest : ERequestParam
+@end
+
+@interface PostReportRequest : ERequestParam
+@end
+
+//获取一段时间的数据
+@interface PostReportRangeRequest : ERequestParam
+@end
+
+@interface PostQuestionRequest : ERequestParam
+@end
+
+

ChineseMedicine/ChineseMedicineSDK/Request/ERequestParam.h

@@ -0,0 +1,16 @@
+//
+//  ERequestParam.h
+//  ChineseMedicineLibrary
+//
+//  Created by 刘振兴 on 2023/7/20.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ERequestParam : ERequest
+
+@end
+
+NS_ASSUME_NONNULL_END

ChineseMedicine/ChineseMedicineSDK/Request/ERequestParam.m

@@ -0,0 +1,21 @@
+//
+//  ERequestParam.m
+//  ChineseMedicineLibrary
+//
+//  Created by 刘振兴 on 2023/7/20.
+//
+
+#import "ERequestParam.h"
+
+@implementation ERequestParam
+
+- (NSString *)getMacAddress {
+    return [[ChineseMedicineManager shared] getMacAddress];
+}
+
+- (NSString *)getToken {
+    UserModel* userModel = [[ChineseMedicineManager shared] getUserInfo];
+    return userModel.token;
+}
+
+@end

ChineseMedicine/SKValue.h → ChineseMedicine/ChineseMedicineSDK/SKValue.h

@@ -20,10 +20,6 @@
 
 
 //接口
-#define BASEURL                     @"http://api.tecanswer.com"
-#define BASEURL_TEST                @"http://api-test.tecanswer.com"
-#define BASEURL_DEV                 @"http://192.168.111.227"
-
 #define POST_LOGIN_INFO_URL         @"/account/api/v1/entry/login/temporary"
 #define POST_SUBMIT_PULSE_URL       @"/healthy/api/v1/submit/report"
 #define POST_QUESTION_URL           @"/healthy/api/v1/inquiry/submit/pulse"
@@ -41,12 +37,8 @@
 
 
 //key
-#define KEY_AES                     @"a3ca2bcd4bcda6c7" //加密
 #define PAY_WX_APPID                @"wxc501f69c23c0a923"
 #define PAY_WX_UNIVERSALLINK        @"https://sikey/"
-#define PRODUCT_CODE                @"d1369d757c83407b8172e8ee69542463"
-#define DEVICE_MODEL                @"H210"
-#define BUGLY_APPID                 @"5abbbc0f08"
 
 #define KEY_USERID                  @"userId"
 #define KEY_DATA                    @"data"