1.设备管理

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -4716,7 +4716,7 @@
 		7D2DA53E1DF55FAF00C2C4A8 /* icon_zan_nor222.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor222.png; sourceTree = "<group>"; };
 		7D2DA53F1DF55FAF00C2C4A8 /* icon_zan_nor333.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor333.png; sourceTree = "<group>"; };
 		7D2EFB871E4C43A400962098 /* icon_dakalandian_nor3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_dakalandian_nor3.png; sourceTree = "<group>"; };
-		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "$RL2N4PN.png"; sourceTree = "<group>"; };
+		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = $RL2N4PN.png; sourceTree = "<group>"; };
 		7D2FBD6A1E683D5500A08F1F /* JLHONGDIANDetailVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JLHONGDIANDetailVC.h; path = myOA/JLHONGDIANDetailVC.h; sourceTree = "<group>"; };
 		7D2FBD6B1E683D5500A08F1F /* JLHONGDIANDetailVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JLHONGDIANDetailVC.m; path = myOA/JLHONGDIANDetailVC.m; sourceTree = "<group>"; };
 		7D2FBD6E1E6841A000A08F1F /* NumButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NumButton.h; path = myOA/NumButton.h; sourceTree = "<group>"; };
@@ -20056,10 +20056,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -20100,10 +20100,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -20138,10 +20138,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
+				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20165,18 +20165,18 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "shiku_im/shiku_im-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					"$DOUBANGO_HOME/bindings/_common",
-					"$DOUBANGO_HOME/tinySDP/include",
-					"$DOUBANGO_HOME/tinyHTTP/include",
-					"$DOUBANGO_HOME/tinySMS/include",
-					"$DOUBANGO/HOME/tinyMSRP/include",
+					$DOUBANGO_HOME/bindings/_common,
+					$DOUBANGO_HOME/tinySDP/include,
+					$DOUBANGO_HOME/tinyHTTP/include,
+					$DOUBANGO_HOME/tinySMS/include,
+					$DOUBANGO/HOME/tinyMSRP/include,
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					"$DOUBANGO_HOME/tinyDAV/include",
-					"$DOUBANGO_HOME/tinySAK/src",
-					"$DOUBANGO_HOME/tinyNET/src",
-					"$DOUBANGO_HOME/tinyMEDIA/include",
-					"$DOUBANGO_HOME/tinySIP/include",
+					$DOUBANGO_HOME/tinyDAV/include,
+					$DOUBANGO_HOME/tinySAK/src,
+					$DOUBANGO_HOME/tinyNET/src,
+					$DOUBANGO_HOME/tinyMEDIA/include,
+					$DOUBANGO_HOME/tinySIP/include,
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20207,8 +20207,48 @@
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay",
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay(支付宝)",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/shiku_im/LibBPush $(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/audioRecorder $(PROJECT_DIR)/shiku_im/RSA/include $(PROJECT_DIR)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im $(PROJECT_DIR) $(PROJECT_DIR)/shiku_im/controller/MapChoseLocation $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited) $DOUBANGO_LIBS $(SRCROOT)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/youMeng $(PROJECT_DIR)/shiku_im/audioRecorder $(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
+				"LIBRARY_SEARCH_PATHS[arch=*]" = (
+					"$(PROJECT_DIR)/shiku_im/LibBPush",
+					"$(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib",
+					"$(PROJECT_DIR)/shiku_im/audioRecorder",
+					"$(PROJECT_DIR)/shiku_im/RSA/include",
+					"$(PROJECT_DIR)/shiku_im/Vendor/libidn",
+					"$(PROJECT_DIR)/shiku_im/RSA",
+					"$(PROJECT_DIR)/shiku_im/admob5.05",
+					"$(PROJECT_DIR)/shiku_im",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/shiku_im/controller/MapChoseLocation",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
+					"$(inherited)",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
+				);
+				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
+					"$(inherited)",
+					$DOUBANGO_LIBS,
+					"$(SRCROOT)/shiku_im/Vendor/libidn",
+					"$(PROJECT_DIR)/shiku_im/RSA",
+					"$(PROJECT_DIR)/shiku_im/youMeng",
+					"$(PROJECT_DIR)/shiku_im/audioRecorder",
+					"$(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib",
+					"$(PROJECT_DIR)/shiku_im/admob5.05",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
+					"$(inherited)",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
+				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -20255,10 +20295,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
+				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20284,16 +20324,16 @@
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					"$DOUBANGO_HOME/tinyDAV/include",
-					"$DOUBANGO_HOME/tinySAK/src",
-					"$DOUBANGO_HOME/tinyNET/src",
-					"$DOUBANGO_HOME/tinyMEDIA/include",
-					"$DOUBANGO/HOME/tinyMSRP/include",
-					"$DOUBANGO_HOME/tinySIP/include",
-					"$DOUBANGO_HOME/tinyHTTP/include",
-					"$DOUBANGO_HOME/tinySMS/include",
-					"$DOUBANGO_HOME/tinySDP/include",
-					"$DOUBANGO_HOME/bindings/_common",
+					$DOUBANGO_HOME/tinyDAV/include,
+					$DOUBANGO_HOME/tinySAK/src,
+					$DOUBANGO_HOME/tinyNET/src,
+					$DOUBANGO_HOME/tinyMEDIA/include,
+					$DOUBANGO/HOME/tinyMSRP/include,
+					$DOUBANGO_HOME/tinySIP/include,
+					$DOUBANGO_HOME/tinyHTTP/include,
+					$DOUBANGO_HOME/tinySMS/include,
+					$DOUBANGO_HOME/tinySDP/include,
+					$DOUBANGO_HOME/bindings/_common,
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20301,7 +20341,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$DOUBANGO_LIBS",
+					$DOUBANGO_LIBS,
 					"$(SRCROOT)/shiku_im/Vendor/libidn",
 					"$(PROJECT_DIR)/shiku_im/RSA",
 					"$(PROJECT_DIR)/shiku_im/youMeng",

shiku_im/shiku_im/AppDelegate.mm

@@ -6102,7 +6102,7 @@
         
         NSDictionary *errDic = @{@"reason":@"登录失败"};
         
-//        [[NSNotificationCenter defaultCenter] postNotificationName:@"UUAppUserLoginFailed" object:errDic];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"UUAppUserLoginFailed" object:errDic];
         
         [UASUserInfo shareManager].isAutoFrist = YES;
         
@@ -6129,7 +6129,7 @@
         
     }
     
-//    [[NSNotificationCenter defaultCenter] postNotificationName:@"UUAppUserLoginFailed" object:errDic];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"UUAppUserLoginFailed" object:errDic];
   
     [UASUserInfo shareManager].isAutoFrist = YES;
         

shiku_im/shiku_im/Register&Login/loginVC.m

@@ -525,14 +525,7 @@
 -(int) didServerResultFailed:(JXConnection*)aDownload dict:(NSDictionary*)dict{
     _btn.userInteractionEnabled = YES;
     [_wait hide];
-//    [KPromptBox showKPromptBoxWithMassage:@"IM登录失败，请重新登录"];
-    //    [((AppDelegate*)[[UIApplication sharedApplication] delegate]) showMainUI];
-    
-    [self loginUas];
-    
-    [self openAutoDaka];
-    
-    [self postBPushDataToServer:[BPush getChannelId]];
+    [KPromptBox showKPromptBoxWithMassage:@"IM登录失败，请重新登录"];
     
     return show_error;
 }
@@ -540,12 +533,8 @@
 -(int) didServerConnectError:(JXConnection*)aDownload error:(NSError *)error{//error为空时，代表超时
     _btn.userInteractionEnabled = YES;
     [_wait hide];
-    [self loginUas];
     
-    [self openAutoDaka];
     
-    [self postBPushDataToServer:[BPush getChannelId]];
-    //    [((AppDelegate*)[[UIApplication sharedApplication] delegate]) showMainUI];
     return show_error;
 }
 

shiku_im/shiku_im/shiku_im-Info.plist

@@ -33,7 +33,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.4.2</string>
+	<string>6.4.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

shiku_im/shiku_im/zh-Hans.lproj/InfoPlist.strings

@@ -1056,7 +1056,7 @@
 "UU_DeviceInquiry" = "设备查询";
 "UU_UsingApplication" = "使用申请";
 "UU_ScrapApplication" = "报废申请";
-"UU_Maintenance" = "养护管理";
+"UU_Maintenance" = "保养维护";
 "UU_FaultSubmission" = "故障送检";
 "UU_Repair" = "设备维修";
 "UU_CycleInventory" = "周期盘点";

shiku_im/shiku_im/文件夹1/设备管理/viewcontellers/LYYDeviceMainVC.m

@@ -49,12 +49,13 @@ static NSString *cellID = @"stutus";
 }
 
 - (void)getData{
-    self.nameArr = @[Localized(@"UU_Scan"),Localized(@"UU_DeviceInquiry"),Localized(@"UU_UsingApplication"),Localized(@"UU_ScrapApplication"),Localized(@"UU_Maintenance"),Localized(@"UU_FaultSubmission"),Localized(@"UU_Repair"),Localized(@"UU_CycleInventory"),Localized(@"UU_Requirement"),Localized(@"UU_Stock"),Localized(@"UU_Batchtransfer"),Localized(@"UU_Statistics")];
+//    self.nameArr = @[Localized(@"UU_Scan"),Localized(@"UU_DeviceInquiry"),Localized(@"UU_UsingApplication"),Localized(@"UU_ScrapApplication"),Localized(@"UU_Maintenance"),Localized(@"UU_FaultSubmission"),Localized(@"UU_Repair"),Localized(@"UU_CycleInventory"),Localized(@"UU_Requirement"),Localized(@"UU_Stock"),Localized(@"UU_Batchtransfer"),Localized(@"UU_Statistics")];
+    self.nameArr = @[Localized(@"UU_Scan"),Localized(@"UU_DeviceInquiry"),Localized(@"UU_UsingApplication"),Localized(@"UU_ScrapApplication"),Localized(@"UU_Maintenance"),Localized(@"UU_FaultSubmission"),Localized(@"UU_CycleInventory"),Localized(@"UU_Requirement")];
     
     for (NSInteger i = 0; i < self.nameArr.count; i ++) {
         LYYDevieceMainModel *model = [LYYDevieceMainModel new];
         model.nameSting = self.nameArr[i];
-        model.imageString = FORMAT(@"UU_device_icon%ld",i);
+        model.imageString = FORMAT(@"icon_devicemanagement_nor%ld",i+1);
         [self.dataArr addObject:model];
     }
 
@@ -134,21 +135,21 @@ static NSString *cellID = @"stutus";
           
         case 6://设备维修
         {
+            LYYDMCheckVC *vc = [LYYDMCheckVC new];
             
+            [self.navigationController pushViewController:vc animated:YES];
         }
             break;
         case 7://周期盘点
         {
-            LYYDMCheckVC *vc = [LYYDMCheckVC new];
-           
+            LYYRMatchingVC *vc = [LYYRMatchingVC new];
+            self.title = @"需求匹配";
             [self.navigationController pushViewController:vc animated:YES];
         }
             break;
         case 8://需求匹配
         {
-            LYYRMatchingVC *vc = [LYYRMatchingVC new];
-            self.title = @"需求匹配";
-            [self.navigationController pushViewController:vc animated:YES];
+            
         }
             break;
         case 9://库存查询

shiku_im/shiku_im/文件夹1/设备管理/viewcontellers/搜索/LYYDMDataSearchVC.m

@@ -451,13 +451,13 @@ static NSString * cellID = @"cellID";
         [self.navigationController pushViewController:detailVC animated:YES];
     }else{
         //点击跳转 
-//        LYYDMScanVC *vc = [[LYYDMScanVC alloc] init];
-//        vc.idstr = model.listDic[@"de_code"];
-//        [self.navigationController pushViewController:vc animated:YES];
-        
-        DeviceFormVC *vc = [DeviceFormVC new];
-        vc.deviceCode = FORMAT(@"%@",model.listDic[@"de_code"]);
+        LYYDMScanVC *vc = [[LYYDMScanVC alloc] init];
+        vc.idstr = model.listDic[@"de_code"];
         [self.navigationController pushViewController:vc animated:YES];
+        
+//        DeviceFormVC *vc = [DeviceFormVC new];
+//        vc.deviceCode = FORMAT(@"%@",model.listDic[@"de_code"]);
+//        [self.navigationController pushViewController:vc animated:YES];
     }
   
     

shiku_im/shiku_im/文件夹1/设备管理/viewcontellers/设备的盘点/LYYDMCheckDetailVC.m

@@ -34,9 +34,29 @@
 {
     self.title = @"设备盘点";
     [self.view addSubview:self.tableView];
+    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.top.bottom.equalTo(self.view);
+    }];
+    
+    
     [self loadData];
-    BackView
+    
+    UIView *footer = [[UIView alloc]initWithFrame:CGRectMake(0, 0, self.view.width, self.view.height - (8 * 40) + 50)];
+    
+    [footer addSubview:self.tableView11];
+    
+    [self.tableView11 mas_makeConstraints:^(MASConstraintMaker *make) {
+       
+        make.edges.equalTo(footer);
+        
+    }];
+    
+    self.tableView.tableFooterView = footer;
+    
+    
     self.view.backgroundColor = BGKJ_COLOR;
+    
+    BackView
  
     _index = 1;
     
@@ -108,20 +128,25 @@
         _upLoadAgain2.backgroundColor = HexColor(@"#0092E0");
         _upLoadAgain2.layer.cornerRadius = 5;
         _upLoadAgain2.layer.masksToBounds = YES;
-        [_upLoadAgain2 addTarget:self action:@selector(upLoadAgainBackToView2) forControlEvents:UIControlEventTouchUpInside];
         [self.view addSubview:_upLoadAgain2];
         
         UILabel *lbl1 = [[UILabel alloc]init];
-        lbl1.text = @"获取明细";
         lbl1.textColor = [UIColor whiteColor];
         lbl1.font = FONT_SIZE(15);
         lbl1.textAlignment = NSTextAlignmentCenter;
         lbl1.backgroundColor = [UIColor clearColor];
         [_upLoadAgain2 addSubview:lbl1];
         [lbl1 mas_makeConstraints:^(MASConstraintMaker *make) {
-            
             make.left.right.top.bottom.equalTo(_upLoadAgain2);
         }];
+        
+        if ([g_master isEqualToString:@"N_MALATA_ZZ"] || [g_master isEqualToString:@"N_MALATA_ZZ_ZS"] ) {
+            lbl1.text = @"刷新";
+            [_upLoadAgain2 addTarget:self action:@selector(reloadDataFromSever) forControlEvents:UIControlEventTouchUpInside];
+        }else{
+            lbl1.text = @"获取明细";
+            [_upLoadAgain2 addTarget:self action:@selector(upLoadAgainBackToView2) forControlEvents:UIControlEventTouchUpInside];
+        }
     }
     return _upLoadAgain2;
     
@@ -176,6 +201,13 @@
     [self loadDataDetail];
     
 }
+
+#pragma mark ------刷新当前页面
+-(void)reloadDataFromSever
+{
+    [self loadData];
+}
+
 #pragma mark ----------------  获取设备盘点数据
 
 
@@ -387,13 +419,21 @@
 -(UITableView *)tableView11
 {
     if (_tableView11 == nil) {
-        _tableView11 = [[UITableView alloc] initWithFrame:CGRectMake(0,0, SCREEN_WIDTH,SCREEN_HEIGHT) style:UITableViewStylePlain];
+        _tableView11 = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
         
         _tableView11.delegate=self;
         _tableView11.dataSource=self;
         _tableView11.backgroundColor = Color(235, 233, 233, 1.0);
         _tableView11.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
         _tableView11.separatorStyle = UITableViewCellSeparatorStyleNone;
+        @weakify(self)
+        _tableView11.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+            @strongify(self)
+            self.index++;
+            [self loadDataDetail];
+        }];
+        
+        
     }
     return _tableView11;
     
@@ -421,7 +461,7 @@
         if (self.dataArr.count == 0) {
             return 0;
         }
-        return self.dataArr.count+3;
+        return self.dataArr.count+2;
     }else{
         
         return self.detaiArr[section].count;
@@ -460,6 +500,7 @@
             [cell.contentView addSubview:self.upLoadAgain];
             [cell.contentView addSubview:self.upLoadAgain1];
             [cell.contentView addSubview:self.upLoadAgain2];
+            cell.selectionStyle = UITableViewCellSelectionStyleNone;
             [self.upLoadAgain1 mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.left.equalTo(cell.contentView).offset(30);
                 make.bottom.equalTo(cell.contentView).offset(-5);
@@ -484,30 +525,44 @@
             self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
             return cell;
         }else{
-            static NSString *idstr = @"stutuseqa11";
-            UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:idstr ];
-            if (!cell) {
-                cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:idstr];
+            static NSString *idstr = @"UITableView11Reid";
+            UITableViewCell *cellOne = [tableView dequeueReusableCellWithIdentifier:idstr ];
+            if (!cellOne) {
+                cellOne = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:idstr];
                 
             }
-            [cell.contentView addSubview:self.tableView11];
-            [self.tableView11 mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.top.equalTo(cell.contentView).offset(10);
-                make.right.left.bottom.equalTo(cell.contentView).offset(0);
+            UIView *footer = [UIView new];
+            
+            footer.backgroundColor = [UIColor redColor];
+            
+            
+            
+            [cellOne.contentView addSubview:footer];
+            
+            [footer mas_makeConstraints:^(MASConstraintMaker *make) {
+                
+                make.edges.equalTo(cellOne.contentView);
                 
             }];
-            @weakify(self)
-            self.tableView11.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
-             @strongify(self)
-                _index++;
-                [self loadDataDetail];
+            
+            
+            [footer addSubview:self.tableView11];
+            
+            [self.tableView11 mas_makeConstraints:^(MASConstraintMaker *make) {
+                
+                make.edges.equalTo(footer);
+                
             }];
             
-            self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-            return cell;
+            cellOne.selectionStyle = UITableViewCellSelectionStyleBlue;
+            
+            self.tableView11.separatorStyle = UITableViewCellSeparatorStyleNone;
+            
+            return cellOne;
             
         }
     }else{
+        
         LYYDMScanCell *cell = [LYYDMScanCell cellWithTableView:tableView];
         cell.model = self.detaiArr[indexPath.section][indexPath.row];
         
@@ -519,14 +574,14 @@
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (self.tableView ==tableView) {
+    if (self.tableView == tableView) {
         if (indexPath.row == 8) {
             return 50;
-        }else if (indexPath.row ==9)
+        }else if (indexPath.row == 9)
         {
-            return SCREEN_HEIGHT-260;
-        }
-        return 40;
+            return (self.view.height - ((self.dataArr.count * 40) + 50));
+        }else
+            return 40;
         
     }else{
         return 40;

shiku_im/shiku_im/文件夹1/设备管理/viewcontellers/设备的盘点/LYYDMCheckVC.m

@@ -75,7 +75,7 @@
         _tableView.dataSource=self;
         _tableView.backgroundColor = Color(235, 233, 233, 1.0);
         _tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero];
-        //_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     }
     return _tableView;
     

shiku_im/shiku_im/文件夹1/设备管理/views/LYYDMScanCell.m

@@ -118,6 +118,7 @@
         _namelLabel.font = FONT_SIZE(14);
         _namelLabel.textColor = Color(153, 153, 153, 1.0);
         _namelLabel.numberOfLines = 0;
+        
     }
     return _namelLabel;
 }
@@ -127,7 +128,8 @@
         _detailLabel = [UILabel new];
         _detailLabel.font = FONT_SIZE(14);
         _detailLabel.textAlignment = NSTextAlignmentRight;
-        _namelLabel.numberOfLines = 0;
+        _detailLabel.numberOfLines = 0;
+        
     }
     return _detailLabel;
 }
@@ -148,7 +150,12 @@
 }
 -(void)butAction:(UIButton *)sender{
     
-    self.block();
+    if (self.block) {
+        
+         self.block();
+        
+    }
+    
     
 }