screendisplay/screendisplay.xcworkspace/xcuserdata/danjunhua.xcuserdatad/UserInterfaceState.xcuserstateBinary files differ
screendisplay/screendisplay.xcworkspace/xcuserdata/danjunhua.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -106,11 +106,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "screendisplay/Classes/检测/Controller/MonitoringMapViewController.m" timestampString = "553068350.753279" timestampString = "554348132.743227" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "452" endingLineNumber = "452" startingLineNumber = "465" endingLineNumber = "465" landmarkName = "-clickPopView" landmarkType = "7"> </BreakpointContent> @@ -259,5 +259,37 @@ landmarkType = "7"> </BreakpointContent> </BreakpointProxy> <BreakpointProxy BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> <BreakpointContent shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" filePath = "screendisplay/Classes/检测/Controller/MonitoringMapViewController.m" timestampString = "554348132.743997" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "423" endingLineNumber = "423" landmarkName = "-mapView:viewForAnnotation:" landmarkType = "7"> </BreakpointContent> </BreakpointProxy> <BreakpointProxy BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> <BreakpointContent shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" filePath = "screendisplay/Classes/检测/Controller/MonitoringMapViewController.m" timestampString = "554348132.7442729" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "425" endingLineNumber = "425" landmarkName = "-mapView:viewForAnnotation:" landmarkType = "7"> </BreakpointContent> </BreakpointProxy> </Breakpoints> </Bucket> screendisplay/screendisplay/Classes/??/Controller/MonitoringMapViewController.m
@@ -24,6 +24,7 @@ BMKActionPaopaoView * pPaopaoView; UILabel * titleLabel; UILabel * addressLabel; UILabel * macLabel; NSTimer * myTimer; // 更新设备状态 int hCurrentIndex; } @@ -362,7 +363,7 @@ annotationView.annotation = annotation; // 设定popView的高度 CGFloat hWidth = 180; CGFloat hWidth = 200; CGFloat hHight = 80; if(popView == nil) { @@ -383,7 +384,7 @@ // title if(titleLabel==nil) { titleLabel = [[UILabel alloc]initWithFrame:CGRectMake(AdaptedWidth(10), AdaptedHeight(10), AdaptedWidth(hWidth-20-10), AdaptedHeight(20))]; titleLabel = [[UILabel alloc]initWithFrame:CGRectMake(AdaptedWidth(10), AdaptedHeight(10), AdaptedWidth(hWidth-20-10), AdaptedHeight(15))]; titleLabel.font = AdaptedFontSize(10); titleLabel.textColor = kUIColorFromRGB(0xff7800); @@ -391,14 +392,25 @@ [popViewBk addSubview:titleLabel]; } // title if(macLabel==nil) { macLabel = [[UILabel alloc]initWithFrame:CGRectMake(AdaptedWidth(10), AdaptedHeight(10+15+2), AdaptedWidth(hWidth-20-10), AdaptedHeight(15))]; macLabel.font = AdaptedFontSize(9); macLabel.textColor = kUIColorFromRGB(0x595959); macLabel.textAlignment = NSTextAlignmentLeft; [popViewBk addSubview:macLabel]; } // 地址 if(addressLabel==nil) { addressLabel = [[UILabel alloc]initWithFrame:CGRectMake(AdaptedWidth(10), AdaptedHeight(10+20+2), AdaptedWidth(hWidth-20-10), AdaptedHeight(20))]; addressLabel = [[UILabel alloc]initWithFrame:CGRectMake(AdaptedWidth(10), AdaptedHeight(10+15+2+15+2), AdaptedWidth(hWidth-20-10), AdaptedHeight(15))]; addressLabel.textColor = kUIColorFromRGB(0x595959); addressLabel.textAlignment = NSTextAlignmentLeft; addressLabel.font = AdaptedFontSize(10); addressLabel.font = AdaptedFontSize(9); [popViewBk addSubview:addressLabel]; } @@ -407,7 +419,8 @@ } titleLabel.text = pModel.device_name; addressLabel.text = pModel.address; macLabel.text = [NSString stringWithFormat:@"MAC:%@",pModel.mac]; addressLabel.text = [NSString stringWithFormat:@"地址:%@",pModel.address]; ((BMKPinAnnotationView *)annotationView).paopaoView = pPaopaoView; popView = ((BMKPinAnnotationView *)annotationView).paopaoView ; @@ -473,7 +486,8 @@ { DeviceModel *pModel = [self.deviceSevice.deviceViewModels objectAtIndex:[((BMKPointAnnotation*)view.annotation).customIndex intValue]]; titleLabel.text = pModel.device_name; addressLabel.text = pModel.address; macLabel.text = [NSString stringWithFormat:@"MAC:%@",pModel.mac]; addressLabel.text = [NSString stringWithFormat:@"地址:%@",pModel.address]; hCurrentIndex = [((BMKPointAnnotation*)view.annotation).customIndex intValue]; [popView setHidden:NO]; NSLog(@"didSelectAnnotationView"); screendisplay/screendisplay/Supporting Files/Info.plist
@@ -17,9 +17,9 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> <string>1.0.1</string> <string>1.0.2</string> <key>CFBundleVersion</key> <string>1.0.1</string> <string>1.0.2</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSAppTransportSecurity</key>
