diff --git a/Lighting/Class/AllpriceTableViewCell.m b/Lighting/Class/AllpriceTableViewCell.m index cc3863cf79b283683f85e0014ec5e9ffcf984ecf..37586b11cde89e85ff68f90b89bbee50dcd273e0 100644 --- a/Lighting/Class/AllpriceTableViewCell.m +++ b/Lighting/Class/AllpriceTableViewCell.m @@ -27,10 +27,10 @@ for (ShopcarModel *model in _goodsAllprice) { allNumber += model.goodsNum; - allPrice += [model.goods.costPrice integerValue]; + allPrice += [model.goods.costPrice integerValue] *model.goodsNum; } self.goodsAllNumber.text = [NSString stringWithFormat:@"%ld",allNumber]; - self.goodsAllPrice.text = [NSString stringWithFormat:@"%ld",allPrice*allNumber]; + self.goodsAllPrice.text = [NSString stringWithFormat:@"%ld",allPrice]; } @@ -47,8 +47,8 @@ for (TOOrderdetailEntity *model in _goodsArray) { - allNumber += [model.goodsPrice integerValue]; - allPrice += [model.goodsNum integerValue]; + allNumber += [model.goodsNum integerValue]; + allPrice += [model.goodsPrice integerValue]*[model.goodsNum intValue]; } self.goodsAllNumber.text = [NSString stringWithFormat:@"%ld",allNumber]; self.goodsAllPrice.text = [NSString stringWithFormat:@"ï¿¥%ld",allPrice]; diff --git a/Lighting/Class/ClientViewController.m b/Lighting/Class/ClientViewController.m index 48379998c95d8136392d2c0eb01b7fdb925ccb56..6e3159ee0da9984a1f91a3520e2996efce88f453 100644 --- a/Lighting/Class/ClientViewController.m +++ b/Lighting/Class/ClientViewController.m @@ -64,10 +64,10 @@ self.navigationController.interactivePopGestureRecognizer.enabled = NO; } - //下拉刷新 MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init]; + condition.resellerCodeEquals = [[Shoppersmanager manager].Shoppers.employee.currentDepart orgCode]; DataPage *page = [[DataPage alloc]init]; page.page = 1; condition.page = page; @@ -156,6 +156,7 @@ [self.CustomerresultArray removeAllObjects]; } NSDictionary *datas = returnValue[@"data"]; + ConsumerPageResult *Customerresult = [[ConsumerPageResult alloc]initWithDictionary:datas error:nil]; self.totalPages = [datas[@"totalpages"] intValue]; for (TOConsumerEntity *objc in Customerresult.results) { @@ -418,6 +419,10 @@ self.customerAddress.enabled = NO; self.phoneNumberField.enabled = NO; self.companyNameField.enabled = NO; + + [self SetupUserShoppingCarNumberRequest]; + [self SetupUserRequest]; + [self ChangeCustomerName]; } else { @@ -477,24 +482,41 @@ [self ErrorMBProgressView:@"æœç´¢ä¿¡æ¯ä¸èƒ½ä¸ºç©º"]; return; } - [self CreateMBProgressHUDLoding]; ConsumerQueryCondition *searchCustomer = [[ConsumerQueryCondition alloc]init]; DataPage *page = [[DataPage alloc]init]; - page.page = 0; + page.page = 1; + page.rows = 10; searchCustomer.page = page; searchCustomer.nameEquals = self.searchPersonInformationField.text; searchCustomer.mobileEquals = self.searchPersonInformationField.text; + //request [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/consumer/query"] WithRequestType:0 WithParameter:searchCustomer WithReturnValueBlock:^(id returnValue) { [self RemoveMBProgressHUDLoding]; if ([returnValue[@"code"] isEqualToNumber:@0]) { - ConsumerPageResult *result = [[ConsumerPageResult alloc]initWithDictionary:returnValue error:nil]; + ConsumerPageResult *result = [[ConsumerPageResult alloc]initWithDictionary:returnValue[@"data"] error:nil]; [self.CustomerresultArray removeAllObjects]; - for (TOConsumerEntity *model in result.results) { - [self.CustomerresultArray addObject:model]; + for (TOConsumerEntity *objc in result.results) { + + MyclientEntityModel *myclientModel = [[MyclientEntityModel alloc]init]; + myclientModel.fid = objc.fid; + myclientModel.createName = objc.createName; + myclientModel.createBy = objc.createBy; + myclientModel.createDate = objc.createDate; + myclientModel.sysOrgCode = objc.sysOrgCode; + myclientModel.name = objc.name; + myclientModel.mobile = objc.mobile; + myclientModel.province = objc.province; + myclientModel.city = objc.city; + myclientModel.country = objc.country; + myclientModel.address = objc.address; + myclientModel.picture = objc.picture; + myclientModel.lastVisitedTime = objc.lastVisitedTime; + + [self.CustomerresultArray addObject:myclientModel]; } [self.informationTableview reloadData]; } diff --git a/Lighting/Class/CommodityListTableViewCell.m b/Lighting/Class/CommodityListTableViewCell.m index 278b5d62bb89427dc3a3f6e200b8c8d5210f2dcf..1ca49e45d80b8c846c00556766474c6c9aeea182 100644 --- a/Lighting/Class/CommodityListTableViewCell.m +++ b/Lighting/Class/CommodityListTableViewCell.m @@ -28,8 +28,6 @@ NSInteger price = [_model.goods.costPrice integerValue]; NSInteger allPrice = number*price; self.totalPrice.text = [NSString stringWithFormat:@"%ld",allPrice]; - - } @@ -39,9 +37,11 @@ { _orderDetailslist = orderDetailslist; [self.goodsHeader sd_setImageWithURL:[NSURL URLWithString:_orderDetailslist.goodsBrand] placeholderImage:ReplaceImage]; - self.goodsNumber.text = _orderDetailslist.goodsNum; - self.clinchPrice.text = [_orderDetailslist.goodsPrice stringValue]; - self.totalPrice.text = [_orderDetailslist.goodsTotalPrice stringValue]; + self.goodsNumber.text = [NSString stringWithFormat:@"æ•°é‡ X%@",_orderDetailslist.goodsNum]; + self.clinchPrice.text = [NSString stringWithFormat:@"æˆäº¤ä»· ï¿¥%@",[_orderDetailslist.goodsPrice stringValue]]; + //å°è®¡ + NSInteger totalPrice = [_orderDetailslist.goodsNum integerValue] * [_orderDetailslist.goodsPrice integerValue]; + self.totalPrice.text = [NSString stringWithFormat:@"ï¿¥%ld",totalPrice]; self.goodsName.text = _orderDetailslist.goodsSpec; diff --git a/Lighting/Class/CustomerOrderTableViewCell.h b/Lighting/Class/CustomerOrderTableViewCell.h index c0708f5fc0d01df77339a8e5a8f3a107811f8c0f..7c1acd69f6a88b697c57b1efbfa0da201cbeeb8e 100644 --- a/Lighting/Class/CustomerOrderTableViewCell.h +++ b/Lighting/Class/CustomerOrderTableViewCell.h @@ -21,7 +21,7 @@ * * @param cellindex cellä¸‹æ ‡ */ -- (void)undoOrderButtonClick:(NSInteger)cellindex; +- (void)undoOrderButtonClick:(NSInteger)cellindex WithButtonCurrent:(NSString *)title; @end diff --git a/Lighting/Class/CustomerOrderTableViewCell.m b/Lighting/Class/CustomerOrderTableViewCell.m index 1bbac30d9b5eba99a0d4db408480828017e9505c..9a038d9c51cbec84ac74a6af0544e44d3b48afcb 100644 --- a/Lighting/Class/CustomerOrderTableViewCell.m +++ b/Lighting/Class/CustomerOrderTableViewCell.m @@ -53,9 +53,12 @@ goodsAllprice += [goodslist.goodsTotalPrice integerValue]; } self.orderTotalPrice.text = [NSString stringWithFormat:@"%ld",goodsAllprice]; - - if ([_model.order.orderState isEqualToString:@"002"]) { + //撤销订å•ã€åŽ»æ”¯ä»˜ + if ([_model.order.orderState isEqualToString:@"002"] || [_model.order.orderState isEqualToString:@"001"]) { self.delecteOrder.hidden = NO; + if ([_model.order.orderState isEqualToString:@"001"]) { + [self.delecteOrder setTitle:@"去支付" forState:UIControlStateNormal]; + } }else { self.delecteOrder.hidden = YES; @@ -83,9 +86,9 @@ #pragma mark -æ’¤é”€è®¢å• - (IBAction)delecteOrderButtonClick:(UIButton *)sender { - if ([self.delegate respondsToSelector:@selector(undoOrderButtonClick:)]) { + if ([self.delegate respondsToSelector:@selector(undoOrderButtonClick:WithButtonCurrent:)]) { - [self.delegate undoOrderButtonClick:_cellIndex]; + [self.delegate undoOrderButtonClick:_cellIndex WithButtonCurrent:sender.currentTitle]; } } diff --git a/Lighting/Class/CustomerOrderViewController.m b/Lighting/Class/CustomerOrderViewController.m index 5c59ec3cbb94741aaf8edec103dc4fd4c392e9ed..b315566e9ade5d8de45cb03e19f4632f63d6ea83 100644 --- a/Lighting/Class/CustomerOrderViewController.m +++ b/Lighting/Class/CustomerOrderViewController.m @@ -8,7 +8,7 @@ #import "CustomerOrderViewController.h" #import "CustomerOrderTableViewCell.h" - +#import "OrderdetailsViewController.h" @interface CustomerOrderViewController ()<UITableViewDataSource,UITableViewDelegate,ReturnTableviewcellIndexpathdelegate,UITextFieldDelegate,undoOrderDelegate> /** @@ -75,7 +75,7 @@ Neworder.guideId = [Shoppersmanager manager].Shoppers.employee.fid; allOrder.datapage = page; allOrder.order = Neworder; - self.indexPage = 0; + self.indexPage = 1; [self getGuideAllcustomerOrder:YES WithorderBill:allOrder]; }]; headerRefresh.stateLabel.hidden = YES; @@ -190,6 +190,22 @@ return 260; } +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil]; + OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"]; + + TOOrderEntity *model = [[self.datasArray objectAtIndex_opple:indexPath.row] order]; + orderdetails.orderCode = model.orderNumber; + orderdetails.sectionTitle = @[@"订å•ä¿¡æ¯",@"客户信æ¯",@"æ”¶è´§ä¿¡æ¯",@"商å“ä¿¡æ¯",@"附件信æ¯"]; + orderdetails.isShowattachment = YES; + if ([model.orderState isEqualToString:@"006"]) { + orderdetails.isShowPayButton = YES; + orderdetails.isShowPrintButton = YES; + } + [self.navigationController pushViewController:orderdetails animated:YES]; +} + #pragma mark -弹出popover视图控制器 @@ -309,32 +325,39 @@ * * @param cellindex cellä¸‹æ ‡ */ -- (void)undoOrderButtonClick:(NSInteger)cellindex +- (void)undoOrderButtonClick:(NSInteger)cellindex WithButtonCurrent:(NSString *)title { [self CreateMBProgressHUDLoding]; - OrderBill *model = [self.datasArray objectAtIndex_opple:cellindex]; - [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@",ServerAddress,@"/order/updateOrderState/",model.order.orderNumber,model.order.orderState,@"005"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) { - - [self RemoveMBProgressHUDLoding]; - if ([returnValue[@"code"] isEqualToNumber:@0]) { + if ([title isEqualToString:@"撤销订å•"]) { + OrderBill *model = [self.datasArray objectAtIndex_opple:cellindex]; + [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@%@/%@/%@",ServerAddress,@"/order/updateOrderState/",model.order.orderNumber,model.order.orderState,@"005"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) { - [self SuccessMBProgressView:@"撤销æˆåŠŸ"]; - model.order.orderState = @"005"; - NSIndexPath *indexapath = [NSIndexPath indexPathForRow:cellindex inSection:0]; - [self.customerOrderTableView reloadRowsAtIndexPaths:@[indexapath] withRowAnimation:UITableViewRowAnimationLeft]; - } - else - { - [self ErrorMBProgressView:returnValue[@"message"]]; - } + [self RemoveMBProgressHUDLoding]; + if ([returnValue[@"code"] isEqualToNumber:@0]) { + + [self SuccessMBProgressView:@"撤销æˆåŠŸ"]; + model.order.orderState = @"005"; + NSIndexPath *indexapath = [NSIndexPath indexPathForRow:cellindex inSection:0]; + [self.customerOrderTableView reloadRowsAtIndexPaths:@[indexapath] withRowAnimation:UITableViewRowAnimationLeft]; + } + else + { + [self ErrorMBProgressView:returnValue[@"message"]]; + } + + } WithErrorCodeBlock:^(id errorCodeValue) { + + } WithFailureBlock:^(id error) { + + [self RemoveMBProgressHUDLoding]; + }]; - } WithErrorCodeBlock:^(id errorCodeValue) { + }else if ([title isEqualToString:@"去支付"]) + { - } WithFailureBlock:^(id error) { - - [self RemoveMBProgressHUDLoding]; - }]; + } + } diff --git a/Lighting/Class/InformationTableViewCell.m b/Lighting/Class/InformationTableViewCell.m index 93a96cef291cd69cc9ccc43c1a49d16c9b144c36..747cf605323533c93453b6c4aa4ce78f2740570c 100644 --- a/Lighting/Class/InformationTableViewCell.m +++ b/Lighting/Class/InformationTableViewCell.m @@ -24,7 +24,7 @@ self.personName.text = _model.name; self.personPhoneNumber.text = _model.mobile; self.recentTime.text = _model.lastVisitedTime; - self.Guideservices.text = _model.createName; + self.Guideservices.text = [[Shoppersmanager manager].Shoppers.employee realName]; self.personLocation.text = _model.address; self.setCurrentCustomer.selected = _model.selectedState; } diff --git a/Lighting/Class/OrderInformationTableViewCell.m b/Lighting/Class/OrderInformationTableViewCell.m index e2fffdd2dbac0620bd22cfacb89a1fe61930eb3d..2cfcf1cf83e76974482f9641d7de47fe2d286b6e 100644 --- a/Lighting/Class/OrderInformationTableViewCell.m +++ b/Lighting/Class/OrderInformationTableViewCell.m @@ -21,7 +21,7 @@ { _model = model; self.orderNumber.text = _model.order.orderNumber; - self.orderTime.text = _model.order.orderTime; + self.orderTime.text = _model.order.createDate; self.orderStatus.text = [BaseViewController ReturnOrderStateTitleWithStateCode:[_model.order.orderState integerValue] withPoint:CGPointMake(self.orderStatus.frame.origin.x, self.orderStatus.frame.origin.y) WithCode:0]; self.orderStatus.textColor = [BaseViewController ReturnOrderStateTitleWithStateCode:[_model.order.orderState integerValue] withPoint:CGPointMake(self.orderStatus.frame.origin.x, self.orderStatus.frame.origin.y) WithCode:1]; self.operatorName.text = _model.employee.realName; diff --git a/Lighting/Class/PersonInformationTableViewCell.h b/Lighting/Class/PersonInformationTableViewCell.h index 8e61a0d01ed206a55e77c4b7ed771e75b2d5701b..2cb395ba5f91731ba61e01cad9c309f9e7b392dd 100644 --- a/Lighting/Class/PersonInformationTableViewCell.h +++ b/Lighting/Class/PersonInformationTableViewCell.h @@ -58,7 +58,10 @@ @property (nonatomic,strong) TOConsumerEntity *model; - +/** + * å®¢æˆ·åœ°å€ + */ +@property (weak, nonatomic) IBOutlet UILabel *customerAddress; diff --git a/Lighting/Class/PersonInformationTableViewCell.m b/Lighting/Class/PersonInformationTableViewCell.m index 72fd4a85c7ff9a17617f500dac72d2512fbb50c5..be2fa43f479e2da116a5cc3dd2c1705aea541d54 100644 --- a/Lighting/Class/PersonInformationTableViewCell.m +++ b/Lighting/Class/PersonInformationTableViewCell.m @@ -14,16 +14,25 @@ [super awakeFromNib]; // Initialization code - [self.customerHeader sd_setImageWithURL:[NSURL URLWithString:[Customermanager manager].customerName] placeholderImage:REPLACEIMAGE]; - self.customerName.text = [Customermanager manager].customerName; - self.companyName.text = [Customermanager manager].customerName; -// self.emailName.text = [Customermanager manager] - self.companyLocation.text = [Customermanager manager].companyName; - self.customerPhoneNumber.text = [Customermanager manager].customerPhoneNumber; - + [self.customerHeader sd_setImageWithURL:[NSURL URLWithString:[[Customermanager manager] customerID]] placeholderImage:REPLACEIMAGE]; + self.customerName.text = [[Customermanager manager] customerName]; + self.companyName.text = [[Customermanager manager] customerName]; + self.companyLocation.text = [[Customermanager manager] cutomerAddress]; + self.customerPhoneNumber.text = [[Customermanager manager] customerPhoneNumber]; + } +- (void)setModel:(TOConsumerEntity *)model +{ + _model = model; + [self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.picture] placeholderImage:REPLACEIMAGE]; + self.customerName.text = _model.name; + self.companyName.text = _model.name; + self.customerAddress.text = _model.address; + self.customerPhoneNumber.text = _model.mobile; +} + diff --git a/Lighting/Class/SceneLibraryViewController.m b/Lighting/Class/SceneLibraryViewController.m index 6b3cc2166c29db98c15e4ed2c1bfa23cc45d27df..189f0a776f95ff6d32f34303a787210b8f939e24 100644 --- a/Lighting/Class/SceneLibraryViewController.m +++ b/Lighting/Class/SceneLibraryViewController.m @@ -104,11 +104,13 @@ DataPage *page = [[DataPage alloc]init]; if (self.indexPage ++ > self.totalPages) { [self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData]; + }else + { + page.page = self.indexPage ++; + page.rows = 10; + condition.page = page; + [self getSceneLibrarydatas:condition isRemove:NO]; } - page.page = self.indexPage ++; - page.rows = 10; - condition.page = page; - [self getSceneLibrarydatas:condition isRemove:NO]; }]; } diff --git a/Lighting/Class/Shoppingcart/GenerateOrdersViewController.m b/Lighting/Class/Shoppingcart/GenerateOrdersViewController.m index 0d0d997aeb6e742d11e888a7842bc5fad2caefe8..2ca13986f56034bd71483f5f7df789fa23f1bd37 100644 --- a/Lighting/Class/Shoppingcart/GenerateOrdersViewController.m +++ b/Lighting/Class/Shoppingcart/GenerateOrdersViewController.m @@ -333,7 +333,7 @@ OrderBill *order = [[OrderBill alloc]init]; //分页 DataPage *page = [[DataPage alloc]init]; - page.page = 0; + page.page = 1; order.datapage = page; //æ”¶è´§åœ°å€ @@ -366,7 +366,7 @@ orderGoods.goodsSpec = model.goods.spec; orderGoods.goodsName = model.goods.name; orderGoods.goodsBrand = model.goods.brandId; - orderGoods.goodsNum = model.goods.number; + orderGoods.goodsNum = [NSString stringWithFormat:@"%d",model.goodsNum]; orderGoods.goodsPrice = model.goods.costPrice; orderGoods.remark = model.goods.spec; orderGoods.goodsUnit = model.goods.unit; diff --git a/Lighting/Class/Shoppingcart/ShoppingViewController.m b/Lighting/Class/Shoppingcart/ShoppingViewController.m index 415f94be22c4722738b0e6a2e6daf04c7658b3c2..ec3581ae643622220b1149b56052a654f9d7a3c9 100644 --- a/Lighting/Class/Shoppingcart/ShoppingViewController.m +++ b/Lighting/Class/Shoppingcart/ShoppingViewController.m @@ -292,8 +292,7 @@ model.isSelected = YES; } [self.settlementButton setTitle:[NSString stringWithFormat:@"去结算(%ld)",self.shopResponseArray.count] forState:UIControlStateNormal]; - //è®¡ç®—æ€»é‡‘é¢ - [self CalculateSelectedGoodsAllprice]; + }else { //å–æ¶ˆå…¨éƒ¨é€‰ä¸ @@ -307,6 +306,8 @@ } [self.settlementButton setTitle:@"去结算(0)" forState:UIControlStateNormal]; } + //è®¡ç®—æ€»é‡‘é¢ + [self CalculateSelectedGoodsAllprice]; } #pragma mark -计算选ä¸åŽçš„商哿€»é‡‘é¢ diff --git a/Lighting/Class/Tabbar/CustomTabbarController.m b/Lighting/Class/Tabbar/CustomTabbarController.m index 5e75986b04d6c635816bd814d3df45ca83ef50ed..684caf69c1dc6e744ea785650a1fad8922e4dbac 100644 --- a/Lighting/Class/Tabbar/CustomTabbarController.m +++ b/Lighting/Class/Tabbar/CustomTabbarController.m @@ -189,7 +189,26 @@ //è´ç‰©è½¦ case 103: - self.selectedIndex = 8; + //必须设置当å‰å®¢æˆ·æ‰èƒ½è·³è½¬åˆ°è´ç‰©è½¦ + if (![Shoppersmanager manager].currentCustomer) { + + MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view.window animated:YES]; + // Set the custom view mode to show any view. + hud.mode = MBProgressHUDModeCustomView; + // Set an image view with a checkmark. + UIImage *image = [[UIImage imageNamed:@"Error"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; + hud.customView = [[UIImageView alloc] initWithImage:image]; + // Looks a bit nicer if we make it square. + hud.square = YES; + // Optional label text. + hud.activityIndicatorColor = kMainBlueColor; + hud.labelFont = [UIFont systemFontOfSize:12]; + hud.labelText = @"必须设置当å‰å®¢æˆ·"; + [hud hide:YES afterDelay:1]; + }else + { + self.selectedIndex = 8; + } break; diff --git a/Lighting/Lighting/StoryboardwithCYX.storyboard b/Lighting/Lighting/StoryboardwithCYX.storyboard index 90c2b0f7dd2575a694ff37865d2ac66b8ae0318a..f25410850c8cc7ba14cb67b2c75bb2e977baaba2 100644 --- a/Lighting/Lighting/StoryboardwithCYX.storyboard +++ b/Lighting/Lighting/StoryboardwithCYX.storyboard @@ -880,6 +880,7 @@ </tableViewCellContentView> <connections> <outlet property="companyName" destination="oql-Lw-B2F" id="BuX-in-oFM"/> + <outlet property="customerAddress" destination="TDA-d4-cxP" id="RZW-69-UX8"/> <outlet property="customerHeader" destination="Zdg-s0-xfD" id="Q2Q-ff-q8T"/> <outlet property="customerName" destination="86V-EZ-5eX" id="Paa-1D-l0z"/> <outlet property="customerPhoneNumber" destination="A8m-f4-VJE" id="2iI-No-miD"/> @@ -953,8 +954,8 @@ <rect key="frame" x="10" y="4" width="70" height="70"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> </imageView> - <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="åŠç¯" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="aGq-4q-dKu"> - <rect key="frame" x="102" y="18" width="72" height="42"/> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="åŠç¯" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="aGq-4q-dKu"> + <rect key="frame" x="102" y="5" width="100" height="70"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> @@ -2062,14 +2063,14 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ï¿¥25600" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dZX-LS-ay8"> - <rect key="frame" x="607" y="14" width="130" height="21"/> + <rect key="frame" x="611" y="14" width="130" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="18"/> <color key="textColor" red="1" green="0.39892781040000003" blue="0.50448872310000004" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="r7E-5t-6TA"> - <rect key="frame" x="445" y="15" width="77" height="21"/> + <rect key="frame" x="443" y="15" width="77" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="18"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>