Commit d1211c25 authored by 曹云霄's avatar 曹云霄

debug

parent e814e7ed
...@@ -519,15 +519,13 @@ ...@@ -519,15 +519,13 @@
#pragma mark -筛选 #pragma mark -筛选
- (void)ScreeningButtonClick - (void)ScreeningButtonClick
{ {
//
// ExperienceCentreViewController *ExperienceCenter = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ExperienceCentre"]; // ExperienceCentreViewController *ExperienceCenter = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
//// [self presentViewController:ExperienceCenter animated:YES completion:nil];
//
// ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen; // ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen;
// UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController; // UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController;
// popover.sourceView = ExperienceCenter.view; // popover.sourceView = ExperienceCenter.view;
// [self presentViewController:ExperienceCenter animated:YES completion:nil]; // [self presentViewController:ExperienceCenter animated:YES completion:nil];
self.screenView = [[[NSBundle mainBundle] loadNibNamed:@"ScreeningView" owner:self options:nil]firstObject]; self.screenView = [[[NSBundle mainBundle] loadNibNamed:@"ScreeningView" owner:self options:nil]firstObject];
self.screenView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight); self.screenView.frame = CGRectMake(0, 0, ScreenWidth, ScreenHeight);
self.screenView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5]; self.screenView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
......
...@@ -191,6 +191,8 @@ ...@@ -191,6 +191,8 @@
#pragma mark -返回 #pragma mark -返回
- (IBAction)ReturnButtonClickAction:(UIButton *)sender { - (IBAction)ReturnButtonClickAction:(UIButton *)sender {
SHARED_APPDELEGATE.sceneArray = nil;
SHARED_APPDELEGATE.productArray = nil;
[self dismissViewControllerAnimated:YES completion:nil]; [self dismissViewControllerAnimated:YES completion:nil];
} }
...@@ -338,7 +340,7 @@ ...@@ -338,7 +340,7 @@
{ {
if (isScene) { if (isScene) {
//场景 //场景
SceneListModel *sceneModel = (SceneListModel *)model; SceneListModel *sceneModel = [(SceneListModel *)model copy];
for (SceneListModel *objc in self.sceneDatasArray) { for (SceneListModel *objc in self.sceneDatasArray) {
if ([objc.fid isEqualToString:sceneModel.fid]) { if ([objc.fid isEqualToString:sceneModel.fid]) {
isThere(YES); isThere(YES);
...@@ -355,7 +357,7 @@ ...@@ -355,7 +357,7 @@
}else }else
{ {
//产品 //产品
TOGoodsEntityModel *goodsModel = (TOGoodsEntityModel *)model; TOGoodsEntityModel *goodsModel = [(TOGoodsEntityModel *)model copy];
for (TOGoodsEntityModel *objc in self.productDatasArray) { for (TOGoodsEntityModel *objc in self.productDatasArray) {
if ([objc.fid isEqualToString:goodsModel.fid]) { if ([objc.fid isEqualToString:goodsModel.fid]) {
isThere(YES); isThere(YES);
......
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
- (void)setModel:(SceneListModel *)model - (void)setModel:(SceneListModel *)model
{ {
[self.sceneImageView sd_setImageWithURL:[NSURL URLWithString:model.pricure] placeholderImage:REPLACEIMAGE]; _model = model;
if (model.isSelectedSate) { [self.sceneImageView sd_setImageWithURL:[NSURL URLWithString:_model.pricure] placeholderImage:REPLACEIMAGE];
if (_model.isSelectedSate) {
self.layer.borderWidth = 2.0f; self.layer.borderWidth = 2.0f;
self.layer.borderColor = kMainBlueColor.CGColor; self.layer.borderColor = kMainBlueColor.CGColor;
}else }else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment