稍微完善了一些的简单计算器的设计

 相对上次做得计算器，稍微将代码简化了一些，加了小树点的功能，能够在实现第一次运算后能够继续将结果进行多次运算，将昨天学的动画设计，和文字的设计加入到了界面中

#import "ViewController.h"

@interface ViewController ()
@property (weak, nonatomic) IBOutlet UILabel *show;



@end

@implementation ViewController
int i=10;

- (void)viewDidLoad {
    [super viewDidLoad];
    jisuan=[[jisuanqi alloc]init];
    
    
    UILabel *lab=[[UILabel alloc] initWithFrame:CGRectMake(100,400,1200,20)];
    //lab.backgroundColor=[UIColor greenColor];
    lab.text=@"欢迎使用！";
    lab.textColor=[UIColor blueColor];
    //lab.textColor=[UIColor colorWithRed:63/255.0 green:130/255.0 blue:139/255.0 alpha:1];
    lab.font=[UIFont systemFontOfSize:20];
    lab.shadowColor=[UIColor yellowColor];
    lab.shadowOffset=CGSizeMake(10,0);
    [self.view addSubview:lab];
    
    // Do any additional setup after loading the view, typically from a nib.
    jisuan=[[jisuanqi alloc]init];
    
    UIImageView *imgview=[[UIImageView alloc]initWithFrame:CGRectMake(80, 190, 200, 100)];
    UIImage *img1=[UIImage imageNamed:@"5.png"];  //创建一个对象，并初始化
    UIImage *img2=[UIImage imageNamed:@"6.png"];
    UIImage *img3=[UIImage imageNamed:@"7.png"];
    UIImage *img4=[UIImage imageNamed:@"8.png"];
    UIImage *img5=[UIImage imageNamed:@"9.png"];
    UIImage *img6=[UIImage imageNamed:@"10.png"];
    UIImage *img7=[UIImage imageNamed:@"11.png"];
    
    imgview.alpha=0.4;
    
    NSArray *array=[NSArray arrayWithObjects:img1,img2,img3,img4 ,img5,img6,img7,nil]; //创建数组
    //    NSArray *array = [NSArray arrayWithObjects:img1, img2, img3,img4, nil];
    imgview.animationDuration=1;   //动画跳动的时间间隔 1/7秒
    imgview.animationImages = array; //跳动的图片
    [imgview startAnimating]; //调用方法
    [self.view addSubview:imgview];
    // Do any additional setup after loading the view, typically from a nib.
}
- (IBAction)clicknum:(UIButton *)sender {
    
    
  /*if(jisuan.opp1==0){
        jisuan.opr1=jisuan.opr1*10+sender.tag;
     self.show.text = [NSString stringWithFormat:@"%f", jisuan.opr1];
    }
    else{
        jisuan.opr2=jisuan.opr1*10+sender.tag;
        self.show.text = [NSString stringWithFormat:@"%f", jisuan.opr2];
    }*/
    if(jisuan.opp1=='+'||jisuan.opp1=='-'||jisuan.opp1=='*'||jisuan.opp1=='/') //判断是否已经按了运算符
    //if (jisuan.opp1==0)
    {
        
        if (jisuan.dot=='.')
        {
             jisuan.opr1 = jisuan.opr1 + sender.tag*1.0/i;
             i=i*10;
        }
            else
            {
            jisuan.opr1 = jisuan.opr1*10 + sender.tag;
            }
        self.show.text = [NSString stringWithFormat:@"%f",jisuan.opr1];
    }
    
    
    else {
        jisuan.opp1=0;
        if (jisuan.dot=='.') {
            
        jisuan.opr2 = jisuan.opr2+ sender.tag*1.0/i;
        i=i*10;
            
            
        } else {
            
        jisuan.opr2 = jisuan.opr2*10 + sender.tag;
        
        }
        
        self.show.text = [NSString stringWithFormat:@"%f",jisuan.opr2];
        
    }
    
    
}


- (IBAction)function:(UIButton *)sender {
    switch(sender.tag)
        
    {
        case(10):
        {
        self.show.text =@"+";
        
       jisuan.opp1 = '+';
            jisuan.dot=0;
            i=10;
            //jisuan.opr1=jisuan.opr1+jisuan.opr2;
            break;
        }
        case(11):
        {
            self.show.text =@"-";
            
           jisuan.opp1 = '-';
            jisuan.dot=0;
            i=10;
             break;
        }

        case(12):
        {
            self.show.text =@"*";
            
            jisuan.opp1 = '*';
            jisuan.dot=0;
            i=10;
            break;
        }
        case(13):
        {
            self.show.text =@"/";
            
            jisuan.opp1 = '/';
            jisuan.dot=0;
            i=10;
             break;
        }
        case 14:
        {
        self.show.text=@"%";
            jisuan.opp1='%';
        }
        default:break;
    }
    
}

- (IBAction)clear:(id)sender {
    jisuan.opr1=0;
    jisuan.opr2=0;
    jisuan.dot=0;
    jisuan.opp1=0;
    i =10;
    self.show.text = @"0";

}



- (IBAction)dot:(id)sender {       //给dot属性赋值
     jisuan.dot='.';
}



- (IBAction)eql:(id)sender {    //  给=号添加响应
    float result;
    switch (jisuan.opp1)
    {
        case '+':
        {
           
            result=[jisuan work1];
            
          

            break;
        }
            case '-':
        {
            
            result=[jisuan work2];
            break;
        }
            case '*':
        {
            
            result=[jisuan work3];
            break;
        }
            case '/':
        {
            
            result=[jisuan work4];
            
            break;
        }
            
                default:
            break;
        
            
    }


    self.show.text = [NSString stringWithFormat:@"%f", result];
    jisuan.opp1=0;
    jisuan.opr1=0;
    jisuan.opr2=result;

    
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

@end