diff --git a/src/java2022spring/Calculator.java b/src/java2022spring/Calculator.java
new file mode 100644
index 0000000000000000000000000000000000000000..a310092f176e7e66f775a64965bba440844d53ad
--- /dev/null
+++ b/src/java2022spring/Calculator.java
@@ -0,0 +1,236 @@
+package java2022spring;
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.*;
+class Calculator extends JFrame implements ActionListener{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7959852004624075564L;
+	private StringBuilder sBuilder = new StringBuilder();  //StringBuilder类,字符缓冲区
+	private JPanel contentPane;
+	private JTextField textField;
+	double a,b;
+	Double sum;
+	int i;
+	public Calculator()
+	{
+		contentPane=new JPanel();//创建内容面版
+		setContentPane(contentPane);
+		Font font=new Font("宋体",Font.BOLD,22);
+		JPanel panel1=new JPanel();//用于保存文本框
+		add(panel1,BorderLayout.NORTH);
+		textField=new JTextField();
+		panel1.add(textField);
+		textField.setColumns(20);
+		contentPane.setBackground(Color.white);//设置窗口背景色白色
+		JPanel panel2=new JPanel();//用于保存按钮
+		contentPane.add(panel2,BorderLayout.CENTER);
+		panel2.setLayout(new FlowLayout());
+		panel2.setLayout(new GridLayout(5,4));	//添加按钮
+		JButton button[]=new JButton[20];
+		button[0]=new JButton("C");		//清空
+		button[1]=new JButton("CE");	//清除之前输入的一个数据
+		button[2]=new JButton("%");		//取余
+		button[3]=new JButton("/");     //除法
+		button[4]=new JButton("7");
+		button[5]=new JButton("8");
+		button[6]=new JButton("9");
+		button[7]=new JButton("*");     //乘号
+		button[8]=new JButton("4");
+		button[9]=new JButton("5");
+		button[10]=new JButton("6");
+		button[11]=new JButton("—");
+		button[12]=new JButton("1");
+		button[13]=new JButton("2");
+		button[14]=new JButton("3");
+		button[15]=new JButton("+");
+		button[16]=new JButton("e");	 //乘方
+		button[17]=new JButton("0");
+		button[18]=new JButton(".");
+		button[19]=new JButton("="); 
+		for(int i=0;i<button.length;i++ )	//将组件加入容器
+			panel2.add(button[i]);
+		button[19].setBackground(Color.gray);//设置按钮的背景颜色为灰色
+		panel2.add(button[19]);
+		for(int i=0;i<button.length;i++)	//为每一个事件(按钮)添加监视器
+			button[i].addActionListener(this);
+		this.setVisible(true);
+		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); //点击X号可以关闭程序
+	}
+
+	public void actionPerformed(ActionEvent e) //事件处理
+	{
+		// TODO Auto-generated method stub
+		String q=e.getActionCommand();			//得到当前的按钮字符
+		
+		if(q.equals("0"))							//处理按钮 0~9
+		{
+			sBuilder.append("0");//append方法作用是在StringBuilder对象后追加字符
+			textField.setText(sBuilder.toString());	//显示之前所有输入的数据
+		}
+		else if(q.equals("1"))
+		{
+			sBuilder.append("1");				
+			textField.setText(sBuilder.toString());
+		}
+		else if(q.equals("2"))
+		{
+			sBuilder.append("2");		
+			textField.setText(sBuilder.toString());	 
+		}
+		else if(q.equals("3"))
+		{
+			sBuilder.append("3");		
+			textField.setText(sBuilder.toString());	
+		}
+		else if(q.equals("4"))
+		{
+			sBuilder.append("4");					
+			textField.setText(sBuilder.toString());	
+		}
+		else if(q.equals("5"))
+		{
+			sBuilder.append("5");				
+			textField.setText(sBuilder.toString());	
+		}
+		else if(q.equals("6"))
+		{
+			sBuilder.append("6");				
+			textField.setText(sBuilder.toString());	
+		}
+		else if(q.equals("7"))
+		{
+			sBuilder.append("7");					
+			textField.setText(sBuilder.toString());	
+		}
+		
+		else if(q.equals("8"))
+		{
+			sBuilder.append("8");						
+			textField.setText(sBuilder.toString());	
+		}
+		else if(q.equals("9"))
+		{
+			sBuilder.append("9");			
+			textField.setText(sBuilder.toString());	
+			}
+		
+		else if(q.equals("CE"))    				//处理"CE"按钮事件, 即清除当前的输入的数据
+		{
+			sBuilder.deleteCharAt(sBuilder.length() - 1);	//StringBuilder的实例化对象调用方法下标减1
+			textField.setText(sBuilder.toString());
+		}
+		else if(q.equals("C"))                   //处理"C"按钮事件,即清除之前的输入所有的数据
+		{
+			sBuilder = new StringBuilder();		   //重新创建以清除所有的数据
+			textField.setText(sBuilder.toString());
+		}
+		else if(q.equals("."))						
+		{
+			sBuilder.append(".");						
+			textField.setText(sBuilder.toString());	
+		}
+		
+		else if(q.equals("+"))	//处理+"按钮
+		{
+			a = Double.parseDouble(sBuilder.toString());	//将运算符之前的数据作为第一个操作数 a
+			i=0;
+			sBuilder = new StringBuilder();					//用来存储第二个操作数 b
+			textField.setText("+");
+		}
+		else if(q.equals("—"))		//处理"—"按钮
+		{
+			a = Double.parseDouble(sBuilder.toString());
+			i=1;
+			sBuilder = new StringBuilder();									
+			textField.setText("—");
+		}
+		else if(q.equals("*"))    	//处理"*"按钮乘法
+		{										
+			a = Double.parseDouble(sBuilder.toString());	
+			i=2;											
+			sBuilder = new StringBuilder();			
+			textField.setText("*");
+		}
+		else if(q.equals("/"))		//处理"/"按钮事件
+		{
+			i=3;										
+			a = Double.parseDouble(sBuilder.toString());	
+			sBuilder = new StringBuilder();				
+			textField.setText("/");
+		}
+		
+		else if(q.equals("%"))	//处理取余运算
+		{
+			a = Double.parseDouble(sBuilder.toString());	
+			i=4;											
+			sBuilder = new StringBuilder();		
+			textField.setText("%");
+		}
+		else if(q.equals("e"))	//处理乘方运算
+		{
+			a = Double.parseDouble(sBuilder.toString());	
+			i=5;								
+			sBuilder = new StringBuilder();	
+			textField.setText("e");
+		}
+		else if(q.equals("="))
+		{
+			b = Double.parseDouble(sBuilder.toString());
+			if (i == 0)			//加法 a+b
+				{
+					sum=a+b;
+					textField.setText(sum.toString());		//输出第二个已经输入的数
+					sBuilder = new StringBuilder();	
+					sBuilder.append(sum);
+				} 
+			else if (i == 1) 	//加法  a-b
+				{
+					sum = a - b;
+					textField.setText(sum.toString());
+					sBuilder = new StringBuilder();	
+					sBuilder.append(sum);
+				}
+			else if (i == 2) 	//乘法  a*b
+				{
+					sum = a * b;
+					textField.setText(sum.toString());
+					sBuilder = new StringBuilder();
+					sBuilder.append(sum);
+				} 
+			else if (i == 3) 	//除法 a/b
+				{
+					sum = a / b;
+					textField.setText(sum.toString());
+					sBuilder = new StringBuilder();
+					sBuilder.append(sum);
+				} 
+			else if (i == 4)	 //	取余   a%b
+				{
+					sum=a % b;
+					int m=(int)a;
+					int n=(int)b;
+					sum=(double)m % n;
+					textField.setText(sum.toString());
+					sBuilder = new StringBuilder();
+					sBuilder.append(sum);
+				} 
+			else if (i == 5) 	//	次幂 ,a是底数, b是指数
+			 {
+				sum=1.0;
+				 if(b==0)
+					 sum=1.0;
+				 else
+					 for(int i=1;i<=b;i++)
+					  sum=sum*a;
+					textField.setText(sum.toString());
+					sBuilder = new StringBuilder();
+					sBuilder.append(sum);
+				} 
+			 else 
+				textField.setText(sBuilder.toString());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/java2022spring/MainClass.java b/src/java2022spring/MainClass.java
new file mode 100644
index 0000000000000000000000000000000000000000..ac41b873a60026301faac764f9076b9b89482ec4
--- /dev/null
+++ b/src/java2022spring/MainClass.java
@@ -0,0 +1,8 @@
+package java2022spring;
+public class MainClass {
+		public static void main(String[] args) {
+			Calculator win=new Calculator();
+			win.setBounds(100,100,250,250);
+			win.setTitle("计算器");
+		}
+	}
\ No newline at end of file
diff --git a/src/java2022spring/Test.java b/src/java2022spring/Test.java
index 24deb29bfc0e5f50fdedcd21b504e77b529d48b6..b7c5556e7e3aa893fbb91a5cfbe0e09337498567 100644
--- a/src/java2022spring/Test.java
+++ b/src/java2022spring/Test.java
@@ -1,7 +1,6 @@
-package java2022spring;
-
-public class Test {
-	public static void main(String[] args) {
-		System.out.println("Hello world!");
-	}
-}
+package java2022spring;
+public class Test {
+	public static void main(String[] args) {
+		System.out.println("Hello world!");
+	}
+}
\ No newline at end of file
diff --git a/src/java2022spring/calculate.java b/src/java2022spring/calculate.java
new file mode 100644
index 0000000000000000000000000000000000000000..f567377d252ba64099f86963f5e9e25872c332ad
--- /dev/null
+++ b/src/java2022spring/calculate.java
@@ -0,0 +1,5 @@
+package java2022spring;
+import java.util.*;
+public class calculate {
+	
+}