diff --git a/src/java2020spring/Test.java b/src/java2020spring/Test.java
index fc09c195f566d0e707f5e8a2f05fd168069c73a7..31826699f1fedf5c4013ece7b492b6aab42a0262 100644
--- a/src/java2020spring/Test.java
+++ b/src/java2020spring/Test.java
@@ -3,7 +3,7 @@ package java2020spring;
 public class Test {
 
 	public static void main(String[] args) {
-		System.out.println("Hello world!");
+		new calculatorFrame();
 
 	}
 
diff --git a/src/java2020spring/calculatorFrame.java b/src/java2020spring/calculatorFrame.java
new file mode 100644
index 0000000000000000000000000000000000000000..c6c5875b3d5a3262117843e3057a49d495f260a3
--- /dev/null
+++ b/src/java2020spring/calculatorFrame.java
@@ -0,0 +1,373 @@
+package java2020spring;
+
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Font;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.*;
+
+public class calculatorFrame extends JFrame implements ActionListener {
+	JMenuBar menubar;
+	JMenu menu;
+	JMenuItem item1,item2;
+	JPanel panel,panel1,panel2;
+	CardLayout card;
+	JTextField text;
+	String operator=null,//记录运算符
+			number=null,//记录数字
+			ms=null;//记录存储数字
+	boolean point=false,//判断是否已经有小数点了
+			num=false,//判断是否按了加减乘除取余数运算符
+			error=false;//判断是否出现运算错误
+
+	calculatorFrame(){//计算器总页面
+		setMenu();
+		setText();
+		card=new CardLayout();
+		panel=new JPanel();
+		panel.setLayout(card);
+		setCalculator1();
+		setCalculator2();
+		add(panel,BorderLayout.CENTER);
+		setBounds(100, 100, 400, 400);
+		setVisible(true);
+		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+		pack();
+	}
+
+	public void setMenu() {//设计菜单
+		menubar=new JMenuBar();
+		menu=new JMenu("计算器类型");
+		item1=new JMenuItem("标准计算器");
+		item2=new JMenuItem("科学计算器");
+		item1.addActionListener(this);
+		item2.addActionListener(this);
+		menu.add(item1);
+		menu.add(item2);
+		menubar.add(menu);
+		setJMenuBar(menubar);
+	}
+
+	public void setText() {//设计文本区
+		text=new JTextField("0");
+		text.setFont(new Font("楷体",Font.PLAIN, 20));
+		text.setSize(400, 100);
+		text.setHorizontalAlignment(JTextField.RIGHT);//光标向右对齐
+		text.setEditable(false);
+		add(text,BorderLayout.NORTH);
+	}
+
+	public void setCalculator1(){    //设置标准计算器的界面
+		panel1=new JPanel();
+		panel1.setLayout(new GridLayout(7,4));
+		String buttonText[]= {"MC","MR","MS","M+","%","CE","C","删除","1/x","x^2","√x"
+				,"/","7","8","9","X","4","5","6","-","1","2","3","+",
+				"+/-","0",".","="};
+		JButton button[] = new JButton[buttonText.length];
+		for(int i=0;i<buttonText.length;i++) {
+			button[i]=new JButton(buttonText[i]);
+			button[i].setFont(new Font("楷体",Font.PLAIN, 20));
+			button[i].addActionListener(this);
+			panel1.add(button[i]);
+		}
+		panel.add("1", panel1);
+	}
+
+	public void setCalculator2(){    //设置科学计算器的界面
+		panel2=new JPanel();
+		panel2.setLayout(new GridLayout(8,5));
+		String buttonText[]= {"MC","MR","MS","M+","M-","mod","sin","cos","tan","PI","x^y","10^x"
+				,"lg","ln","e","x^2","CE","C","删除","/","√x","7","8","9","X",
+				"|x|","4","5","6","-","1/x","1","2","3","+","n!","+/-","0",".","="};
+		for(int i=0;i<buttonText.length;i++) {
+			JButton button=new JButton(buttonText[i]);
+			button.setFont(new Font("楷体",Font.PLAIN, 20));
+			button.addActionListener(this);
+			panel2.add(button);
+		}
+		panel.add("2", panel2);
+	}
+
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		String str1=e.getActionCommand(),//判断按下了哪个键
+				str2=text.getText();//获取文本框的文本
+		if(str1=="0"||str1=="1"||str1=="2"||str1=="3"||str1=="4"||str1=="5"
+				||str1=="6"||str1=="7"||str1=="8"||str1=="9") {
+			if(num==true) {//输入另一个数
+				text.setText(str1);
+				point=false;
+				num=false;
+				error=false;
+			}
+			else {
+//str2=="0"判断文本区开头为零判断不出来，为什么？换了个方法可以了，忽然意识到字符串比对好像都是用equal方法的。。。算了，能用就不改了
+				if(str2.equals("0")) { 
+					text.setText(str1);}
+				else {
+					text.setText(str2+str1);}
+			}
+		}
+		else if(str1=="+/-"||str1=="."||str1=="CE"||str1=="C"||str1=="删除"
+				||str1=="x^2"||str1=="√x"||str1=="1/x"||str1=="%"||str1=="sin"||str1=="cos"
+				||str1=="tan"||str1=="PI"||str1=="10^x"||str1=="lg"
+				||str1=="ln"||str1=="e"||str1=="|x|"||str1=="n!") {
+			str2=calculate1(str1,str2);
+			text.setText(str2);
+		}
+		if(error==false) {//判断文本框是不是有错误信息，有就不执行语句
+			if(str1=="+"||str1=="-"||str1=="X"||str1=="/"||str1=="mod"||str1=="x^y") {
+				if(operator==null) {
+					operator=str1;
+					number=str2;
+					num=true;
+				}
+				else{
+					str2=calculate2(str2);
+					text.setText(str2);
+					operator=str1;
+					point=true;
+					number=str2;
+					num=true;
+				}
+			}
+			else if(str1=="=") {
+				str2=calculate2(str2);
+				text.setText(str2);
+				operator=null;
+				point=true;
+				number=null;
+			}
+
+			if(str1=="MC") {//记忆清空
+				ms=null;
+			}
+			else if(str1=="MR") {//记忆读出，读出的数据有小数点，point记得设为true
+				if(ms==null) {}
+				else {
+					if(ms.contains(".")) {
+						point=true;
+					}
+					text.setText(ms);
+				}
+			}
+			else if(str1=="MS") {//记忆存储
+				ms=str2;
+			}
+			else if(str1=="M+") {
+				if(ms==null) {
+					ms=str2;
+				}
+				else {
+					ms=String.valueOf(Double.parseDouble(ms)+Double.parseDouble(str2));
+				}
+			}
+			else if(str1=="M-") {
+				if(ms==null) {
+					ms=str2;
+				}
+				else {
+					ms=String.valueOf(Double.parseDouble(ms)-Double.parseDouble(str2));
+				}
+			}
+		}
+
+		if(str1.equals("标准计算器")) {//切换页面
+			card.show(panel, "1");
+		}
+		else if(str1.equals("科学计算器")) {
+			card.show(panel, "2");
+		}
+	}
+
+	public String calculate1(String str1,String str2) {//一个数的运算
+		if(error==false) {
+			if(str1=="+/-") {
+				str2=String.valueOf(-Double.parseDouble(str2));
+				point=true;
+			}
+			else if(str1==".") {
+				if(point==false) {
+					str2=str2+str1;
+					point=true;//有时算完后要把其改为true
+				}
+			}
+			else if(str1=="删除") {
+				//要检查文本为空时，检测str2的长度就行了
+				if(str2.length()!=1){
+					if(str2.endsWith("."))//判断是否删除了小数点
+						point=false;	
+					str2=str2.substring(0, str2.length()-1);
+				}
+				else if(str2.length()==1) {
+					str2="0";
+				}
+			}
+			else if(str1=="x^2") {//平方算法
+				str2=String.valueOf(Math.pow(Double.parseDouble(str2), 2));
+				point=true;
+			}
+			else if(str1=="√x") {//开平方
+				double a=Double.parseDouble(str2);
+				if(a<0) {
+					str2="被开方数不能为负数！请按C清零";
+					num=true;
+					error=true;//会出现非数字字符的都把error设为true
+				}
+				else {
+					str2=String.valueOf(Math.sqrt(a));
+					point=true;
+				}
+			}
+			else if(str1=="1/x") {//1/x
+				double a=Double.parseDouble(str2);
+				if(a==0) {
+					str2="除数不能为零！请按C清零";
+					num=true;
+					error=true;
+				}
+				else {
+					str2=String.valueOf(1/a);
+					point=true;
+				}
+			}
+			else if(str1=="%") {//当前的数除以100，之前还以为这个是取余数的意思
+				str2=String.valueOf(Double.parseDouble(str2)/100);
+				point=true;
+			}
+			else if(str1=="sin") {//sin
+				str2=String.valueOf(Math.sin(Double.parseDouble(str2)));
+				point=true;
+			}
+			else if(str1=="cos") {//cos
+				str2=String.valueOf(Math.cos(Double.parseDouble(str2)));
+				point=true;
+			}
+			else if(str1=="tan") {//tan
+				str2=String.valueOf(Math.tan(Double.parseDouble(str2)));
+				point=true;
+			}
+			else if(str1=="PI") {//直接将 PI 的值放去文本区
+				str2=String.valueOf(Math.PI);
+				point=true;
+			}
+			else if(str1=="10^x") {//求10的几次方
+				str2=String.valueOf(Math.pow(10, Double.parseDouble(str2)));
+				point=true;
+			}
+			else if(str1=="lg") {//计算器里的log其实就是lg。。。要注意求对数的条件
+				double a=Double.parseDouble(str2);
+				if(a<=0) {
+					str2="必须为正数！请按C清零";
+					num=true;
+					error=true;
+				}
+				else {
+					str2=String.valueOf(Math.log10(Double.parseDouble(str2)));
+					point=true;
+				}
+			}
+			else if(str1=="ln") {//要注意求对数的条件
+				double a=Double.parseDouble(str2);
+				if(a<=0) {
+					str2="必须为正数！请按C清零";
+					num=true;
+					error=true;
+				}
+				else {//Java的Math里的log是求自然对数的意思
+					str2=String.valueOf(Math.log(Double.parseDouble(str2)));
+					point=true;
+				}
+			}
+			else if(str1=="e") {//直接设e的值
+				str2=String.valueOf(Math.E);
+				point=true;
+			}
+			else if(str1=="|x|") {//求绝对值
+				str2=String.valueOf(Math.abs(Double.parseDouble(str2)));
+				point=true;
+			}
+			else if(str1=="n!") {//求n的阶乘
+				int a=(int)Double.parseDouble(str2),
+						n=1;
+				if(a<0) {//注意0的阶乘也是1！
+					str2="阶乘必须要正整数，请按C清零";
+					num=true;
+					error=true;
+				}
+				else {
+					for(int i=1;i<=a;i++) {
+						n=n*i;
+					}
+					str2=String.valueOf(n);
+				}
+				point=false;
+			}
+			if(str1=="CE") {
+				str2="0";
+				point=false;
+				error=false;
+			}
+		}
+		if(str1=="C") {
+			str2="0";
+			number=null;
+			point=false;
+			operator=null;
+			error=false;
+		}
+
+		return str2;
+	}
+
+	public String calculate2(String a) {//要用两个数的运算
+		double result;
+
+		if(operator=="+") {
+			result=Double.parseDouble(number)+Double.parseDouble(a);
+			a=String.valueOf(result);
+		}
+		else if(operator=="-") {
+			result=Double.parseDouble(number)-Double.parseDouble(a);
+			a=String.valueOf(result);
+		}
+		else if(operator=="X") {
+			result=Double.parseDouble(number)*Double.parseDouble(a);
+			a=String.valueOf(result);
+		}
+		else if(operator=="/") {
+			double b=Double.parseDouble(a);
+			if(b==0) {//检查除数是否为零
+				a="除数不能为零！请按C清零";
+				num=true;
+				error=true;
+			}
+			else {
+				result=Double.parseDouble(number)/b;
+				a=String.valueOf(result);
+			}
+		}
+		else if(operator=="mod") {//取余数
+			double b=Double.parseDouble(a);
+			if(b==0) {//检查除数是否为零
+				a="取余数时的除数不能为零！请按C清零";
+				num=true;
+				error=true;
+			}
+			else {
+				result=Double.parseDouble(number)%Double.parseDouble(a);
+			a=String.valueOf(result);
+			}
+			
+		}
+		else if(operator=="x^y") {//x的y次方
+			result=Math.pow(Double.parseDouble(number), Double.parseDouble(a));
+			a=String.valueOf(result);
+		}
+
+		return a;
+	}
+}