添加 从业计时判断+ 二维码登录 + 友盟统计 v1.9.7

Podfile

@@ -90,6 +90,12 @@ target  'jiaPei'  do
     pod 'OpenSSL-Universal'
     pod 'GKPhotoBrowser'
     pod 'SGQRCode'
+    
+    #pod <友盟+SDK名> 按需复制相应SDK名称代码
+    pod 'UMCommon'    #必须集成
+    pod 'UMDevice'    #必须集成
+    #依赖库
+    pod 'UMCCommonLog'  #可选，日志插件
 		# MobShareSDK
 #		pod 'mob_smssdk', :inhibit_warnings => true		# 短信
 		# 主模块(必须)

Podfile.lock

@@ -541,6 +541,10 @@ PODS:
   - TZImagePickerController/Basic (3.8.3)
   - TZImagePickerController/Location (3.8.3)
   - UICKeyChainStore (2.1.2)
+  - UMCCommonLog (2.0.2)
+  - UMCommon (7.4.1):
+    - UMDevice
+  - UMDevice (3.1.0)
   - WebViewJavascriptBridge (6.0.3)
   - WechatOpenSDK (2.0.2)
   - XHLaunchAd (3.9.12):
@@ -614,6 +618,9 @@ DEPENDENCIES:
   - SDWebImageWebPCoder (= 0.8.3)
   - SGQRCode
   - TZImagePickerController
+  - UMCCommonLog
+  - UMCommon
+  - UMDevice
   - WebViewJavascriptBridge
   - WechatOpenSDK
   - XHLaunchAd
@@ -692,6 +699,9 @@ SPEC REPOS:
     - TTTAttributedLabel
     - TZImagePickerController
     - UICKeyChainStore
+    - UMCCommonLog
+    - UMCommon
+    - UMDevice
     - WebViewJavascriptBridge
     - WechatOpenSDK
     - XHLaunchAd
@@ -778,6 +788,9 @@ SPEC CHECKSUMS:
   TTTAttributedLabel: 0a2ac7b2dd726d32a070dafb01446026b11e624f
   TZImagePickerController: e9909edbadf7381140efc5b5c9f5bdbfd630f7d4
   UICKeyChainStore: 85db518bb1d294366d15ec9b92a416c4e670518f
+  UMCCommonLog: bea707e50c85cef4b0eb47cc5c7226bb843245ca
+  UMCommon: 47e0b53f6a36568e958a5abd005ed7577fcac9ad
+  UMDevice: 9ef8045b59e0479cff7062915c879a1af46fa094
   WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29
   WechatOpenSDK: e79349b37d44c015210f39fd6d2379f0ec60efe2
   XHLaunchAd: 6320f9c68732667323072fc3a5f104e40fbe9cfe
@@ -789,6 +802,6 @@ SPEC CHECKSUMS:
   ZFPlayer: 5cf39e8d9f0c2394a014b0db4767b5b5a6bffe13
   ZXSDK: 3ae8f7f2c5d45b4c1def43e14d930495c5f4d424
 
-PODFILE CHECKSUM: f76fa47c492177440fc27b7171b6a34cd2b0e3c0
+PODFILE CHECKSUM: da26c854e4df6fe8a4a087bfa8d23a59cba7b829
 
 COCOAPODS: 1.12.1

Pods/Manifest.lock

@@ -541,6 +541,10 @@ PODS:
   - TZImagePickerController/Basic (3.8.3)
   - TZImagePickerController/Location (3.8.3)
   - UICKeyChainStore (2.1.2)
+  - UMCCommonLog (2.0.2)
+  - UMCommon (7.4.1):
+    - UMDevice
+  - UMDevice (3.1.0)
   - WebViewJavascriptBridge (6.0.3)
   - WechatOpenSDK (2.0.2)
   - XHLaunchAd (3.9.12):
@@ -614,6 +618,9 @@ DEPENDENCIES:
   - SDWebImageWebPCoder (= 0.8.3)
   - SGQRCode
   - TZImagePickerController
+  - UMCCommonLog
+  - UMCommon
+  - UMDevice
   - WebViewJavascriptBridge
   - WechatOpenSDK
   - XHLaunchAd
@@ -692,6 +699,9 @@ SPEC REPOS:
     - TTTAttributedLabel
     - TZImagePickerController
     - UICKeyChainStore
+    - UMCCommonLog
+    - UMCommon
+    - UMDevice
     - WebViewJavascriptBridge
     - WechatOpenSDK
     - XHLaunchAd
@@ -778,6 +788,9 @@ SPEC CHECKSUMS:
   TTTAttributedLabel: 0a2ac7b2dd726d32a070dafb01446026b11e624f
   TZImagePickerController: e9909edbadf7381140efc5b5c9f5bdbfd630f7d4
   UICKeyChainStore: 85db518bb1d294366d15ec9b92a416c4e670518f
+  UMCCommonLog: bea707e50c85cef4b0eb47cc5c7226bb843245ca
+  UMCommon: 47e0b53f6a36568e958a5abd005ed7577fcac9ad
+  UMDevice: 9ef8045b59e0479cff7062915c879a1af46fa094
   WebViewJavascriptBridge: 7f5bc4d3581e672e8f32bd0f812d54bc69bb8e29
   WechatOpenSDK: e79349b37d44c015210f39fd6d2379f0ec60efe2
   XHLaunchAd: 6320f9c68732667323072fc3a5f104e40fbe9cfe
@@ -789,6 +802,6 @@ SPEC CHECKSUMS:
   ZFPlayer: 5cf39e8d9f0c2394a014b0db4767b5b5a6bffe13
   ZXSDK: 3ae8f7f2c5d45b4c1def43e14d930495c5f4d424
 
-PODFILE CHECKSUM: f76fa47c492177440fc27b7171b6a34cd2b0e3c0
+PODFILE CHECKSUM: da26c854e4df6fe8a4a087bfa8d23a59cba7b829
 
 COCOAPODS: 1.12.1

Pods/Pods.xcodeproj/xcuserdata/mimasigeling.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -329,6 +329,21 @@
 			<key>isShown</key>
 			<false/>
 		</dict>
+		<key>UMCCommonLog.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+		</dict>
+		<key>UMCommon.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+		</dict>
+		<key>UMDevice.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+		</dict>
 		<key>WebViewJavascriptBridge.xcscheme</key>
 		<dict>
 			<key>isShown</key>

Pods/Target Support Files/Pods-jiaPei/Pods-jiaPei-acknowledgements.markdown

@@ -2284,6 +2284,21 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+## UMCCommonLog
+
+Copyright 2011 - 2021 umeng.com. All rights reserved.
+
+
+## UMCommon
+
+Copyright 2011 - 2021 umeng.com. All rights reserved.
+
+
+## UMDevice
+
+Copyright 2011 - 2021 umeng.com. All rights reserved.
+
+
 ## WebViewJavascriptBridge
 
 Copyright (c) 2011-2015 Marcus Westin, Antoine Lagadec

Pods/Target Support Files/Pods-jiaPei/Pods-jiaPei-acknowledgements.plist

@@ -2649,6 +2649,39 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright 2011 - 2021 umeng.com. All rights reserved.
+</string>
+			<key>License</key>
+			<string>Copyright</string>
+			<key>Title</key>
+			<string>UMCCommonLog</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright 2011 - 2021 umeng.com. All rights reserved.
+</string>
+			<key>License</key>
+			<string>Copyright</string>
+			<key>Title</key>
+			<string>UMCommon</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright 2011 - 2021 umeng.com. All rights reserved.
+</string>
+			<key>License</key>
+			<string>Copyright</string>
+			<key>Title</key>
+			<string>UMDevice</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>Copyright (c) 2011-2015 Marcus Westin, Antoine Lagadec

Pods/Target Support Files/Pods-jiaPei/Pods-jiaPei-resources.sh

@@ -113,6 +113,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_resource "${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle"
   install_resource "${PODS_ROOT}/SGQRCode/SGQRCode/SGQRCode.bundle"
   install_resource "${PODS_ROOT}/TZImagePickerController/TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle"
+  install_resource "${PODS_ROOT}/UMCCommonLog/UMCommonLog/UMCommonLog.bundle"
   install_resource "${PODS_ROOT}/ZFPlayer/ZFPlayer/Classes/ControlView/ZFPlayer.bundle"
 fi
 if [[ "$CONFIGURATION" == "Release" ]]; then
@@ -132,6 +133,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
   install_resource "${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle"
   install_resource "${PODS_ROOT}/SGQRCode/SGQRCode/SGQRCode.bundle"
   install_resource "${PODS_ROOT}/TZImagePickerController/TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle"
+  install_resource "${PODS_ROOT}/UMCCommonLog/UMCommonLog/UMCommonLog.bundle"
   install_resource "${PODS_ROOT}/ZFPlayer/ZFPlayer/Classes/ControlView/ZFPlayer.bundle"
 fi
 

jiaPei.xcodeproj/project.pbxproj

@@ -10488,6 +10488,7 @@
 				"${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle",
 				"${PODS_ROOT}/SGQRCode/SGQRCode/SGQRCode.bundle",
 				"${PODS_ROOT}/TZImagePickerController/TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle",
+				"${PODS_ROOT}/UMCCommonLog/UMCommonLog/UMCommonLog.bundle",
 				"${PODS_ROOT}/ZFPlayer/ZFPlayer/Classes/ControlView/ZFPlayer.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
@@ -10508,6 +10509,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SAMKeychain.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SGQRCode.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TZImagePickerController.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UMCommonLog.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZFPlayer.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -11547,7 +11549,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]" = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1962023060601;
+				CURRENT_PROJECT_VERSION = 1972023061901;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11583,7 +11585,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 1.9.6;
+				MARKETING_VERSION = 1.9.7;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -11628,7 +11630,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1962023060601;
+				CURRENT_PROJECT_VERSION = 1972023061901;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				ENABLE_BITCODE = NO;
@@ -11664,7 +11666,7 @@
 					"$(PROJECT_DIR)/jiaPei/Vendor/BaiDuFaceSDK/BDFaceSDK/lib",
 					"$(PROJECT_DIR)/jiaPei/Vendor/QiNiu_IMSDK/Vendors/Voice",
 				);
-				MARKETING_VERSION = 1.9.6;
+				MARKETING_VERSION = 1.9.7;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

jiaPei/AppDelegate.h

@@ -88,8 +88,8 @@
 @property (strong, nonatomic) NSTimer* timer;
 
 //将理论计时页面放在这里 然后定时器也在这里面
-//@property (strong, nonatomic) PeriodVC *tPeriodVC;
-@property (strong, nonatomic) NYBasetjTimeVC *tPeriodVC;
+@property (strong, nonatomic) PeriodVC *tPeriodVC;
+//@property (strong, nonatomic) NYBasetjTimeVC *tPeriodVC;
 
 
 //将实操计时页面放在这里 然后定时器也在这里面

jiaPei/AppDelegate.m

@@ -10,6 +10,7 @@
 #import <AlipaySDK/AlipaySDK.h>
 #import "WXApiManager.h"
 #import <ZFPlayer/ZFLandscapeRotationManager.h>
+#import <UMCommon/UMCommon.h>
 
 @interface AppDelegate () <WXApiDelegate>
 /// APP管理的导航栏的堆栈
@@ -62,14 +63,19 @@
 
     [RQ_AD_MANAGER loadMineSplashAd];
     
-    
-    
+    [self configureSDKs];
     
 
     return YES;
 }
 
-
+//配置第三方 SDK
+- (void)configureSDKs{
+    
+    //友盟 UM_APPKEY
+    [UMConfigure setLogEnabled:YES];
+    [UMConfigure initWithAppkey:UM_APPKEY channel:@"App Store"];
+}
 
 
 

jiaPei/Macros/RQMacros.h

@@ -18,7 +18,8 @@
 /// 应用build
 #define RQ_APP_BUILD   ([[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"])
 
-
+//友盟
+#define UM_APPKEY @"64828a40e31d6071ec4d2ac7"
 
 // 输出日志 (格式: [时间] [哪个方法] [哪行] [输出内容])
 #ifdef DEBUG

jiaPei/Modules/OtherModules/PTObjectMolule/RQPTObjectMolule.m

@@ -53,7 +53,25 @@ static id rq_ptObjectModule = nil;
         resultBlock(NO);
         return;
     }
-    
+    //新需求 - 2023-6-19
+    //        二维码内容：
+    //        #FJMN#xczx@@模拟器序列号@@时间戳
+    //        例：#FJMN#xczx@@mn3423424@@1677114420415
+    if ([resultStr containsString:@"#FJMN#"] && resultStr.length > 8) {
+        NSString *testString = [DES3Util decrypt:[resultStr substringFromIndex:6]];
+        NSArray *array = [testString componentsSeparatedByString:@"@@"];
+        NSString *devSn = array[1];
+        NSString *timeStamp = array[2];
+        NSMutableArray *arr = [NSMutableArray array];
+        [arr addPro:@"devSn"            Value:devSn];///设备ID
+        [arr addPro:@"stuid"            Value:RQ_USER_MANAGER.currentUser.outId];///学员ID
+        [arr addPro:@"timestamp"            Value:timeStamp];///时间戳
+        [jiaPeiManager requestAnythingWithURL:@"phoneMnLogin" array:arr data:nil completion:^(NSDictionary * root) {
+            NSString *body = root[@"body"];
+            [RQ_SHARE_FUNCTION showAlertWithMessage:body completion:nil];
+            return;
+        }];
+    }
     if ([resultStr containsString:@"#DECODE#"] && resultStr.length > 8) {
         ///程序内某些验证
         NSString *testString = [DES3Util decrypt:[resultStr substringFromIndex:8]];
@@ -89,6 +107,7 @@ static id rq_ptObjectModule = nil;
             ///#ZJJP#SIM卡号@@类型@@地区编号@@时间戳   (类型：1签到  2签退  3过程)
         }
         
+        
         __block NSString *ptSubjectStr;
         if (_rqQRCodeType == RQQRCodeType_PTSC && !RQObjectIsNil(array[5]) && !RQObjectIsNil(array[7])) {
             ptSubjectStr = array[5];

jiaPei/Modules/TimeModule/ViewModel/itemViewModel/RQTimeSingleItemViewModel.m

@@ -14,8 +14,8 @@
 #import "NYGetjobTimeViewModel.h"
 
 @interface RQTimeSingleItemViewModel () {
-//    PeriodVC                   *KVOPeriodVC;
-    NYBasetjTimeVC             *KVOPeriodVC;
+    PeriodVC                   *KVOPeriodVC;
+//    NYBasetjTimeVC             *KVOPeriodVC;
     ShiCaoPeriodVC             *KVOSCPeriodVC;
     
     NSString                *orderId;            // 订单ID
@@ -71,32 +71,32 @@
 
 - (void)gotoPeriod:(int)type {
     
-    NYBasetjTimeVC *vc = nil;
-    if(type==0){
-        if ([myDelegate.tPeriodVC isKindOfClass:[NYTheoryTimeVC class]]) {
-            vc = myDelegate.tPeriodVC;
-        }else {
-            KVOPeriodVC = [self getNYTheoryTimeVC] ;
-            vc = KVOPeriodVC;
-        }
-    }else if(type==1){
-        if ([myDelegate.tPeriodVC isKindOfClass:[NYGetjobTimeVC class]]) {
-            vc = myDelegate.tPeriodVC;
-        }else {
-            KVOPeriodVC = [self getNYGetjobTimeVC];
-            vc = KVOPeriodVC;
-        }
-    }
-    if(vc)[self navPushHideTabbarToVC:vc];
-    
-//    PeriodVC *vc = nil;
-//    if (myDelegate.tPeriodVC) {
-//        vc = myDelegate.tPeriodVC;
-//    }else {
-//        KVOPeriodVC = [[PeriodVC alloc] init];
-//        vc = KVOPeriodVC;
+//    NYBasetjTimeVC *vc = nil;
+//    if(type==0){
+//        if ([myDelegate.tPeriodVC isKindOfClass:[NYTheoryTimeVC class]]) {
+//            vc = myDelegate.tPeriodVC;
+//        }else {
+//            KVOPeriodVC = [self getNYTheoryTimeVC] ;
+//            vc = KVOPeriodVC;
+//        }
+//    }else if(type==1){
+//        if ([myDelegate.tPeriodVC isKindOfClass:[NYGetjobTimeVC class]]) {
+//            vc = myDelegate.tPeriodVC;
+//        }else {
+//            KVOPeriodVC = [self getNYGetjobTimeVC];
+//            vc = KVOPeriodVC;
+//        }
 //    }
-//    [self navPushHideTabbarToVC:vc];
+//    if(vc)[self navPushHideTabbarToVC:vc];
+    
+    PeriodVC *vc = nil;
+    if (myDelegate.tPeriodVC) {
+        vc = myDelegate.tPeriodVC;
+    }else {
+        KVOPeriodVC = [[PeriodVC alloc] init];
+        vc = KVOPeriodVC;
+    }
+    [self navPushHideTabbarToVC:vc];
 }
 
 - (NYBasetjTimeVC *)getNYTheoryTimeVC{