diff --git a/readme.md b/readme.md
deleted file mode 100644
index 4af16add33b576d095308a1888db35774618715d..0000000000000000000000000000000000000000
--- a/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 科学计算器
-0103 张三
\ No newline at end of file
diff --git a/src/java2022spring/Calculate.java b/src/java2022spring/Calculate.java
new file mode 100644
index 0000000000000000000000000000000000000000..0de8fa19fc97338d66b1b844ac8627d23b7ef93a
--- /dev/null
+++ b/src/java2022spring/Calculate.java
@@ -0,0 +1,383 @@
+package java2022spring;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.*;
+
+public class Calculate extends JFrame{
+	JFrame frame=new JFrame("calculator");
+	JPanel panel,panel2,panel3;
+	JTextField textfield;
+	Container con;
+	JButton number[],backspace,sqrt,fuhao[],point,pingfang,qiuyu,equal,zhengfu,daoshu;
+	JButton Backspace,C,CE;
+	JButton M1,M2,M3,M4;
+	String string1;
+	double num1,num2; 			//用来存放计算的数值
+	double num3;				//临时存放用来累加运算的数字
+	private double figure=0;	//存放M的数字
+	char oper;  				//存放操作符
+	Color color;				//更改背景颜色
+	public Calculate() {
+		init();
+		frame.setSize(500,400);
+		frame.setVisible(true);
+		frame.setResizable(false);
+		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);	
+		textfield.setEditable(false);	//设置文本框为不可编辑
+		textfield.setBackground(color); //设置文本框的背景颜色
+	}
+
+	void init(){
+		textfield=new JTextField();
+		textfield.setPreferredSize(new Dimension (200,70));	
+		Font font=new Font("黑体",Font.PLAIN,50);
+		Font font1=new Font("黑体",Font.PLAIN,25);
+		textfield.setFont(font);
+		textfield.setBackground(color);
+		panel=new JPanel();
+		panel2=new JPanel();
+		panel3=new JPanel();
+		color=new Color(252,232,234);
+		
+		con=frame.getContentPane();	
+		con.setBackground(Color.white);		
+		
+		number=new JButton[10];
+		for(int i=0;i<number.length;i++) {
+			number[i]=new JButton(i+"");
+			number[i].setContentAreaFilled(false);//设置组件为不透明
+			number[i].setFont(font1); 
+		}
+		
+        fuhao=new JButton[4];
+        fuhao[0]=new JButton("+");
+        fuhao[1]=new JButton("-");
+        fuhao[2]=new JButton("*");
+        fuhao[3]=new JButton("/");
+        for(int i=0;i<fuhao.length;i++)
+        	fuhao[i].setFont(font1);
+       
+        zhengfu=new JButton("+/-");
+        point=new JButton(".");
+        pingfang=new JButton("x^2");
+        qiuyu=new JButton("%");
+        sqrt=new JButton("Sqrt");
+		equal=new JButton("=");
+		
+		
+		C=new JButton("C");
+		CE=new JButton("CE");
+		Backspace=new JButton("Backspace");
+		daoshu=new JButton("1/x");
+		
+		M1=new JButton("M+");
+		M2=new JButton("M-");
+		M3=new JButton("MR");
+		M4=new JButton("MC");
+		//将组件设置成透明
+		zhengfu.setContentAreaFilled(false);
+        point.setContentAreaFilled(false);
+        pingfang.setContentAreaFilled(false);
+        qiuyu.setContentAreaFilled(false);
+        sqrt.setContentAreaFilled(false);
+		equal.setContentAreaFilled(false);
+		C.setContentAreaFilled(false);
+		CE.setContentAreaFilled(false);
+		Backspace.setContentAreaFilled(false);
+		daoshu.setContentAreaFilled(false);
+		for(int i=0;i<fuhao.length;i++) {
+			fuhao[i].setContentAreaFilled(false);
+		}
+		M1.setContentAreaFilled(false);
+		M2.setContentAreaFilled(false);
+		M3.setContentAreaFilled(false);
+		M4.setContentAreaFilled(false);
+		
+		//设置布局
+		GridLayout buju=new GridLayout(4,5);
+		panel.setLayout(buju);
+		panel.add(number[7]);
+		panel.add(number[8]);
+		panel.add(number[9]);
+		panel.add(fuhao[3]);
+		panel.add(sqrt);
+		
+		panel.add(number[4]);
+		panel.add(number[5]);
+		panel.add(number[6]);
+		panel.add(fuhao[2]);
+		panel.add(qiuyu);
+		
+		panel.add(number[1]);
+		panel.add(number[2]);
+		panel.add(number[3]);
+		panel.add(fuhao[1]);
+		panel.add(pingfang);
+		
+		panel.add(number[0]);
+		panel.add(zhengfu);
+		panel.add(point);
+		panel.add(fuhao[0]);
+		panel.add(equal);
+		frame.add(panel,"Center");
+
+		
+		GridLayout buju2=new GridLayout(4,1);
+		panel2.setLayout(buju2);
+		panel2.add(C);
+		panel2.add(CE);
+		panel2.add(Backspace);
+		panel2.add(daoshu);
+		frame.add(panel2,"West");
+		frame.add(textfield,"North");
+		
+		//更改组件的颜色
+		panel.setBackground(color);
+		panel2.setBackground(color);
+		
+		GridLayout buju3=new GridLayout(4,1);
+		panel3.setLayout(buju3);
+		panel3.add(M1);
+		panel3.add(M2);
+		panel3.add(M3);
+		panel3.add(M4);
+		frame.add(textfield,"North");
+		frame.add(panel3,"East");
+		panel3.setBackground(color);
+		
+		/*
+		 * 注册监听器
+		 */
+		//数字
+		FigureListener figurelistener=new FigureListener();
+		for(int i=0;i<number.length;i++) {
+			number[i].addActionListener(figurelistener);
+		}
+		//小数点
+		point.addActionListener(figurelistener);
+		//正负
+		ZhengFuListener zhengfulistener=new ZhengFuListener();
+		zhengfu.addActionListener(zhengfulistener);
+		//平方根
+		SqrtListener sqrtlistener=new SqrtListener();
+		sqrt.addActionListener(sqrtlistener);
+		//平方
+		PFListener pflistener=new PFListener();
+		pingfang.addActionListener(pflistener);
+		//倒数
+		DSListener dslistener=new DSListener();
+		daoshu.addActionListener(dslistener);
+		//CE
+		CEListener CElistener=new CEListener();
+		CE.addActionListener(CElistener);
+		//BackSpace退格
+		BackSpaceListener bslistener=new BackSpaceListener();
+		Backspace.addActionListener(bslistener);
+		//C
+		CListener clistener=new CListener();
+		C.addActionListener(clistener);
+		//操作符
+		OperListener operlistener=new OperListener();
+		for(int i=0;i<fuhao.length;i++) {
+			fuhao[i].addActionListener(operlistener);
+		}
+		//等于号
+		EqualListener equallistener=new EqualListener();
+		equal.addActionListener(equallistener);
+		//M+
+		M1Listener m1listener=new M1Listener();
+		M1.addActionListener(m1listener);
+		//M-
+		M2Listener m2listener=new M2Listener();
+		M2.addActionListener(m2listener);
+		//MR
+		M3Listener m3listener=new M3Listener();
+		M3.addActionListener(m3listener);
+		//MC
+		M4Listener m4listener=new M4Listener();
+		M4.addActionListener(m4listener);
+	}
+	
+	//数字监听器
+	class FigureListener implements ActionListener{
+	
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			String str=e.getActionCommand();
+			if("[.]?[0123456789]*".indexOf(str)!=-1) {
+				textfield.setText(textfield.getText()+str);
+				textfield.setHorizontalAlignment(JTextField.RIGHT);
+			}
+		}
+	}
+	//正负监听器
+	class ZhengFuListener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			num1=Double.parseDouble(textfield.getText());
+			if(num1>0)
+				textfield.setText("-"+num1);
+			else if(num1<0)
+				textfield.setText(""+-1*num1);
+			else {
+				
+			}
+		}
+	
+	}
+	//平方根监视器
+	class SqrtListener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			num1=Double.parseDouble(textfield.getText());
+			textfield.setText(""+Math.sqrt(num1));
+		}
+		
+	}
+	//平方监视器
+	class PFListener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			num1=Double.parseDouble(textfield.getText());
+			textfield.setText(""+num1*num1);
+		}
+	}
+	//倒数监视器
+	class DSListener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			num1=Double.parseDouble(textfield.getText());
+			textfield.setText(""+1/num1);
+		}
+		
+	}
+	//CE监视器
+	class CEListener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			textfield.setText("");
+		}
+		
+	}
+	//退格键监视器
+	class BackSpaceListener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			string1=textfield.getText();
+			string1=string1.substring(0,string1.length()-1);
+			textfield.setText(string1);
+		}
+		
+	}
+	//C清除键监视器
+	class CListener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			oper='\0';
+			textfield.setText("");
+		}
+		
+	}
+	//操作符监听器
+	class OperListener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			num1=Double.parseDouble(textfield.getText());
+			oper=e.getActionCommand().charAt(0);
+			textfield.setText("");
+		}
+		
+	}
+	//等于监听器
+	class EqualListener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			double result=0;
+			num2=Double.parseDouble(textfield.getText());
+			switch(oper) {
+				case '+':result=num1+num2;break;
+				case '-':result=num1-num2;break;
+				case '*':result=num1*num2;break;
+				case '/':if(num2!=0) {
+							result=num1/num2;
+							break;
+				}
+				else {
+					textfield.setText("警告：除数不能为0");
+					return ;
+				}
+				case '%':result=num1%num2;break;
+			}
+			textfield.setText(""+result);
+		}
+		
+	}
+	//M+监听器
+	class M1Listener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			string1=textfield.getText();
+			num3=Double.parseDouble(textfield.getText());
+			figure=figure+num3;
+			textfield.setText(string1);
+		}
+		
+	}
+	//M-监听器
+	class M2Listener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			string1=textfield.getText();
+			num3=Double.parseDouble(textfield.getText());
+			figure=figure-num3;
+			textfield.setText(string1);
+		}
+		
+	}
+	//MR监听器
+	class M3Listener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			textfield.setText(""+figure);
+		}
+		
+	}
+	//MC监听器
+	class M4Listener implements ActionListener{
+
+		@Override
+		public void actionPerformed(ActionEvent e) {
+			// TODO 自动生成的方法存根
+			figure=0;
+		}
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/src/java2022spring/Test.java b/src/java2022spring/MainClass.java
similarity index 51%
rename from src/java2022spring/Test.java
rename to src/java2022spring/MainClass.java
index 24deb29bfc0e5f50fdedcd21b504e77b529d48b6..929863df71ad020018a15bac822476293bf8efdc 100644
--- a/src/java2022spring/Test.java
+++ b/src/java2022spring/MainClass.java
@@ -1,7 +1,9 @@
 package java2022spring;
 
-public class Test {
+public class MainClass {
+
 	public static void main(String[] args) {
-		System.out.println("Hello world!");
+		Calculate f=new Calculate();
 	}
+
 }