From 16326638c96e8807c1dcbeb0574fc970220fb6e5 Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.71.54>
Date: Wed, 25 May 2022 18:36:16 +0800
Subject: [PATCH 01/12] JHGFKL

---
 src/java2022spring/NumberView.java | 118 +++++++++++++++++++++++++++++
 src/java2022spring/Test.java       |   3 +-
 2 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 src/java2022spring/NumberView.java

diff --git a/src/java2022spring/NumberView.java b/src/java2022spring/NumberView.java
new file mode 100644
index 0000000..c44e2ef
--- /dev/null
+++ b/src/java2022spring/NumberView.java
@@ -0,0 +1,118 @@
+//显示窗体
+package java2022spring;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.*;
+
+public class NumberView extends JFrame implements ActionListener{
+	public JPanel north=new JPanel();
+	public JPanel center=new JPanel();
+	public JTextField inpuText;
+	public JButton button;    
+	public String inputNumber1=null;
+	public String fuHao=null;
+	
+	public NumberView() {
+		init();
+		addNorthComponent();
+		addCentralButton();
+	}
+	//初始化方法
+	public void init(){
+		setTitle("计算器");
+		setBounds(650,330,500,400);
+		setLayout(new BorderLayout());
+		setResizable(false);
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+	}
+	//添加北面控件
+	public void addNorthComponent(){
+		inpuText=new JTextField();
+		inpuText.setPreferredSize(new Dimension(480,50));
+		north.add(inpuText);
+		add(north,BorderLayout.NORTH);
+	}
+	//添加中间按钮
+	public void addCentralButton() {
+		String[] BtText= {"%","√","X^2","1/X",
+						  "CE","C","<<<","+/-",
+						  "1", "2", "3", "+",
+						  "4", "5", "6", "-", 
+						  "7", "8", "9", "*", 
+						  "0", ".", "=", "/", };
+		String regex="[\\+\\-*/.=%√C]";             //
+		center.setLayout(new GridLayout(6,4));
+		for(int i=0;i<24;i++) {
+			button=new JButton(BtText[i]);
+			button.setText(BtText[i]);
+			if(BtText[i].matches(regex)||
+					BtText[i].equals("CE")||
+					BtText[i].equals("<<<")||
+					BtText[i].equals("+/-")||
+					BtText[i].equals("1/X")||
+					BtText[i].equals("X^2")) {
+				button.setFont(new Font("粗体",Font.BOLD,17));
+				button.setForeground(Color.red);
+			}
+
+			
+			/*matches() 方法用于检测字符串是否匹配给定的正则表达式。等同于如下代码
+			 * if(BtText[i].equals("+")||
+					BtText[i].equals("-")||
+					BtText[i].equals("*")||
+					BtText[i].equals("/")||
+					BtText[i].equals("=")||
+					BtText[i].equals("."))
+			{
+				button.setFont(new Font("粗体",Font.BOLD,20));
+				button.setForeground(Color.red);
+			}*/
+			button.addActionListener(this);
+			center.add(button);
+		}
+		add(center,BorderLayout.CENTER);
+	}
+	
+	public void actionPerformed(ActionEvent e) {
+		String str=e.getActionCommand();         				 //获取封装在事件中的“命令”字符串
+		if("0123456789.".indexOf(str)!=-1)   					//使数字和小数点显示在文本框上
+		{
+		this.inpuText.setText(inpuText.getText()+str);  		//保存前面点击的数字
+		this.inpuText.setHorizontalAlignment(JTextField.RIGHT); //将文本从文本框的右边开始显示
+		}
+		else if(str.matches("[\\+\\-*/.=%√C]{1}")||
+				str.equals("+")||str.equals("-")||str.equals("*")||str.equals("/"))
+		{
+			fuHao=str;                    			        //fuHao用来存放点击的运算符号
+			inputNumber1=this.inpuText.getText();          //inputNumber1用来存放之前点击的数字
+			this.inpuText.setText("");                    //运算符号不显示在文本框上
+		}
+		else if(str.equals("=")){
+			
+			Double Number1=Double.valueOf(inputNumber1);
+			Double Number2=Double.valueOf(this.inpuText.getText());
+			Double result=null;
+			switch(fuHao) {
+			case "+":
+				result=Number1 + Number2;
+				break;
+			case "-":
+				result=Number1 - Number2;
+				break;
+			case "*":
+				result=Number1 * Number2;
+				break;
+			case "/":
+				if(Number2!=0) {
+					result=Number1 / Number2;
+				}
+				break;
+			}
+			this.inpuText.setText(result.toString());
+		}
+	}
+}
+ 
\ No newline at end of file
diff --git a/src/java2022spring/Test.java b/src/java2022spring/Test.java
index 24deb29..4e2fe4b 100644
--- a/src/java2022spring/Test.java
+++ b/src/java2022spring/Test.java
@@ -2,6 +2,7 @@ package java2022spring;
 
 public class Test {
 	public static void main(String[] args) {
-		System.out.println("Hello world!");
+		NumberView carculator=new NumberView();
+		carculator.setVisible(true);
 	}
 }
-- 
Gitee


From 0b5a97871001ec635af418a0711f104996f672b7 Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.71.54>
Date: Wed, 25 May 2022 21:11:13 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2022spring/NumberView.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/java2022spring/NumberView.java b/src/java2022spring/NumberView.java
index c44e2ef..d7e2ef1 100644
--- a/src/java2022spring/NumberView.java
+++ b/src/java2022spring/NumberView.java
@@ -69,7 +69,8 @@ public class NumberView extends JFrame implements ActionListener{
 			{
 				button.setFont(new Font("粗体",Font.BOLD,20));
 				button.setForeground(Color.red);
-			}*/
+			}此处借鉴了视频  https://www.bilibili.com/video/BV1d54y1s7uC?p=6  中的处理方法
+			*/
 			button.addActionListener(this);
 			center.add(button);
 		}
@@ -83,8 +84,10 @@ public class NumberView extends JFrame implements ActionListener{
 		this.inpuText.setText(inpuText.getText()+str);  		//保存前面点击的数字
 		this.inpuText.setHorizontalAlignment(JTextField.RIGHT); //将文本从文本框的右边开始显示
 		}
-		else if(str.matches("[\\+\\-*/.=%√C]{1}")||
-				str.equals("+")||str.equals("-")||str.equals("*")||str.equals("/"))
+		else if(str.equals("%")||str.equals("√")||str.equals("X^2")||
+				str.equals("1/X")||str.equals("CE")||str.equals("C") ||
+				str.equals("<<<")||str.equals("+/-")||str.equals("+")||
+				str.equals("-")||str.equals("*")||str.equals("/"))
 		{
 			fuHao=str;                    			        //fuHao用来存放点击的运算符号
 			inputNumber1=this.inpuText.getText();          //inputNumber1用来存放之前点击的数字
-- 
Gitee


From f8068d1c572cfe6297fea69651bb1291a09d4dc1 Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.122.54>
Date: Sat, 28 May 2022 19:44:46 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=B0=86=E7=B1=BBNumberView=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=B8=BACalculator=E3=80=82=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E5=AE=9E=E7=8E=B0=E4=BA=86=E7=B1=BB=E4=BC=BC=E4=BA=8E?=
 =?UTF-8?q?"win10"=E8=AE=A1=E7=AE=97=E5=99=A8=E7=9A=84=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=85=B6=E4=B8=AD=E5=8A=A0=E5=87=8F?=
 =?UTF-8?q?=E4=B9=98=E9=99=A4=E3=80=81=E5=8F=96X=E7=9A=84y=E6=AC=A1?=
 =?UTF-8?q?=E6=96=B9=E3=80=81=E6=B1=82=E4=BD=99=E6=95=B0=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=AD=89=E5=8F=B7=E6=89=8D=E8=83=BD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=BB=93=E6=9E=9C=EF=BC=8C=E8=80=8C=E5=8E=BB=E5=B9=B3?=
 =?UTF-8?q?=E6=96=B9=E8=B7=9F=E3=80=81=E5=8F=96=E5=B9=B3=E6=96=B9=E3=80=81?=
 =?UTF-8?q?=E5=8F=96=E8=B4=9F=E6=95=B0=E3=80=81=E5=8F=96=E5=80=92=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=82=B9=E5=87=BB=E7=AD=89=E5=8F=B7?=
 =?UTF-8?q?=E3=80=82=E4=B8=8B=E4=B8=80=E6=AD=A5=E8=A6=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A7=91=E5=AD=A6=E8=AE=A1=E7=AE=97=E5=99=A8=E7=9A=84=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=AE=9E=E7=8E=B0=E6=A0=87=E5=87=86=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=99=A8=E5=92=8C=E7=A7=91=E5=AD=A6=E8=AE=A1=E7=AE=97=E5=99=A8?=
 =?UTF-8?q?=E7=9A=84=E5=88=87=E6=8D=A2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{NumberView.java => Calculator.java}      | 89 ++++++++++++++-----
 src/java2022spring/Test.java                  |  2 +-
 2 files changed, 69 insertions(+), 22 deletions(-)
 rename src/java2022spring/{NumberView.java => Calculator.java} (57%)

diff --git a/src/java2022spring/NumberView.java b/src/java2022spring/Calculator.java
similarity index 57%
rename from src/java2022spring/NumberView.java
rename to src/java2022spring/Calculator.java
index d7e2ef1..8dc9eda 100644
--- a/src/java2022spring/NumberView.java
+++ b/src/java2022spring/Calculator.java
@@ -7,7 +7,8 @@ import java.awt.event.ActionListener;
 
 import javax.swing.*;
 
-public class NumberView extends JFrame implements ActionListener{
+
+public class Calculator extends JFrame implements ActionListener{
 	public JPanel north=new JPanel();
 	public JPanel center=new JPanel();
 	public JTextField inpuText;
@@ -15,7 +16,7 @@ public class NumberView extends JFrame implements ActionListener{
 	public String inputNumber1=null;
 	public String fuHao=null;
 	
-	public NumberView() {
+	public Calculator() {
 		init();
 		addNorthComponent();
 		addCentralButton();
@@ -25,6 +26,7 @@ public class NumberView extends JFrame implements ActionListener{
 		setTitle("计算器");
 		setBounds(650,330,500,400);
 		setLayout(new BorderLayout());
+		
 		setResizable(false);
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 	}
@@ -37,22 +39,23 @@ public class NumberView extends JFrame implements ActionListener{
 	}
 	//添加中间按钮
 	public void addCentralButton() {
-		String[] BtText= {"%","√","X^2","1/X",
-						  "CE","C","<<<","+/-",
-						  "1", "2", "3", "+",
+		String[] BtText= {"%","X^Y","X^2","1/X",
+						  "AC","<<<","√","/",
+						  "1", "2", "3", "*",
 						  "4", "5", "6", "-", 
-						  "7", "8", "9", "*", 
-						  "0", ".", "=", "/", };
-		String regex="[\\+\\-*/.=%√C]";             //
+						  "7", "8", "9", "+", 
+						  "+/-", "0", ".", "=", };
+		String regex="[\\+\\-*/.=%√]";             //
 		center.setLayout(new GridLayout(6,4));
 		for(int i=0;i<24;i++) {
 			button=new JButton(BtText[i]);
 			button.setText(BtText[i]);
 			if(BtText[i].matches(regex)||
-					BtText[i].equals("CE")||
+					BtText[i].equals("AC")||
 					BtText[i].equals("<<<")||
 					BtText[i].equals("+/-")||
 					BtText[i].equals("1/X")||
+					BtText[i].equals("X^Y")||
 					BtText[i].equals("X^2")) {
 				button.setFont(new Font("粗体",Font.BOLD,17));
 				button.setForeground(Color.red);
@@ -69,7 +72,7 @@ public class NumberView extends JFrame implements ActionListener{
 			{
 				button.setFont(new Font("粗体",Font.BOLD,20));
 				button.setForeground(Color.red);
-			}此处借鉴了视频  https://www.bilibili.com/video/BV1d54y1s7uC?p=6  中的处理方法
+			}第47行和第52行借鉴了视频  https://www.bilibili.com/video/BV1d54y1s7uC?p=6  中的处理方法
 			*/
 			button.addActionListener(this);
 			center.add(button);
@@ -79,15 +82,15 @@ public class NumberView extends JFrame implements ActionListener{
 	
 	public void actionPerformed(ActionEvent e) {
 		String str=e.getActionCommand();         				 //获取封装在事件中的“命令”字符串
+		Double result=null;
 		if("0123456789.".indexOf(str)!=-1)   					//使数字和小数点显示在文本框上
 		{
 		this.inpuText.setText(inpuText.getText()+str);  		//保存前面点击的数字
 		this.inpuText.setHorizontalAlignment(JTextField.RIGHT); //将文本从文本框的右边开始显示
 		}
-		else if(str.equals("%")||str.equals("√")||str.equals("X^2")||
-				str.equals("1/X")||str.equals("CE")||str.equals("C") ||
-				str.equals("<<<")||str.equals("+/-")||str.equals("+")||
-				str.equals("-")||str.equals("*")||str.equals("/"))
+		else if(str.equals("/") ||str.equals("+")||
+				str.equals("-")||str.equals("*")||
+				str.equals("X^Y")||str.equals("%"))
 		{
 			fuHao=str;                    			        //fuHao用来存放点击的运算符号
 			inputNumber1=this.inpuText.getText();          //inputNumber1用来存放之前点击的数字
@@ -97,25 +100,69 @@ public class NumberView extends JFrame implements ActionListener{
 			
 			Double Number1=Double.valueOf(inputNumber1);
 			Double Number2=Double.valueOf(this.inpuText.getText());
-			Double result=null;
+			
 			switch(fuHao) {
-			case "+":
+			case "+"://加法
 				result=Number1 + Number2;
 				break;
-			case "-":
+			case "-"://减法
 				result=Number1 - Number2;
 				break;
-			case "*":
+			case "*"://乘法
 				result=Number1 * Number2;
 				break;
-			case "/":
+			case "/"://除法
 				if(Number2!=0) {
 					result=Number1 / Number2;
 				}
+			case "X^Y"://取x的y次方
+				result=Math.pow(Number1, Number2);
 				break;
-			}
+			case "%"://求余数
+				result=Number1%Number2;
+				}
 			this.inpuText.setText(result.toString());
+		    }
+			//取平方根
+			else if(str.equals("√")) {
+				result=Double.parseDouble(inpuText.getText());
+				result=Math.sqrt(result);
+				this.inpuText.setText(result.toString());
+			}
+		 	//取平方
+			else if(str.equals("X^2")) {
+				result=Double.parseDouble(inpuText.getText());
+				result=Math.pow(result, 2);
+				this.inpuText.setText(result.toString());
+			}
+			//取负数
+			else if(str.equals("+/-")) {
+				result=Double.parseDouble(inpuText.getText());
+				result=-1*result;;
+				this.inpuText.setText(result.toString());
+			}
+			//取倒数
+			else if(str.equals("1/X")) {
+				result=Double.parseDouble(inpuText.getText());
+				result=1/result;
+				this.inpuText.setText(result.toString());
+			}
+			//清除数值
+			else if(str.equals("AC")) {
+				this.inpuText.setText("");
+			}
+			//退格键
+			else if(str.equals("<<<")) {
+				
+				String str1=this.inpuText.getText();
+				if (this.inpuText.getText().length() > 1)
+					this.inpuText.setText(str1.substring(0, str1.length() - 1));
+				else {
+					this.inpuText.setText("");
+				}
+			
+			}
 		}
 	}
-}
+
  
\ No newline at end of file
diff --git a/src/java2022spring/Test.java b/src/java2022spring/Test.java
index 4e2fe4b..fd50615 100644
--- a/src/java2022spring/Test.java
+++ b/src/java2022spring/Test.java
@@ -2,7 +2,7 @@ package java2022spring;
 
 public class Test {
 	public static void main(String[] args) {
-		NumberView carculator=new NumberView();
+		Calculator carculator=new Calculator();
 		carculator.setVisible(true);
 	}
 }
-- 
Gitee


From 7b4f160585fb4be3ec9b55d66a40109daac05bf3 Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.122.54>
Date: Sun, 29 May 2022 13:54:42 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E8=BF=90=E7=AE=97=E7=AC=A6=E7=9A=84=E8=BF=90=E7=AE=97?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2022spring/Calculator.java | 328 ++++++++++++++++++++++-------
 1 file changed, 256 insertions(+), 72 deletions(-)

diff --git a/src/java2022spring/Calculator.java b/src/java2022spring/Calculator.java
index 8dc9eda..ded85d1 100644
--- a/src/java2022spring/Calculator.java
+++ b/src/java2022spring/Calculator.java
@@ -1,68 +1,144 @@
-//显示窗体
-package java2022spring;
 
+package java2022spring;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import javax.swing.*;
 
+import EXAM1.Calculator;
+
 
 public class Calculator extends JFrame implements ActionListener{
 	public JPanel north=new JPanel();
 	public JPanel center=new JPanel();
-	public JTextField inpuText;
+	public JTextField inputText1;
 	public JButton button;    
 	public String inputNumber1=null;
 	public String fuHao=null;
 	
+	public JMenuBar bar;// 鑿滃崟鏍�
+	public JMenu set;// 鑿滃崟鏍忎腑鐨勯」
+	public JMenuItem itemshelp[];// 鑿滃崟鏍忎笅鐨勫府鍔╅�夐」
+	
+	public void createmenu() {
+		// 鍒涘缓鑿滃崟鏍�
+		bar = new JMenuBar();
+		set = new JMenu("甯姪");
+
+		// 鑿滃崟閫夐」涓嬫坊鍔犻」
+		itemshelp = new JMenuItem[3];
+		// 鑿滃崟椤规瘡椤逛笅鍔犲叆閫夐」
+
+		itemshelp[0] = new JMenuItem("浣跨敤璇存槑");
+		itemshelp[1] = new JMenuItem("寮�鍙戣��");
+		itemshelp[2] = new JMenuItem("璀﹀憡");
+
+
+		// 鍒涘缓浣跨敤璇存槑
+		itemshelp[0].addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+				JOptionPane.showMessageDialog(null,
+						"鏈绠楀櫒鍩烘湰瀹炵幇浜哱"win10\"鏍囧噯璁＄畻鍣ㄥ拰绉戝璁＄畻鍣ㄤ腑鐨勮繍绠楋紝浣嗘垜鍋氫簡涓�浜涙敼鍔紝娓呴櫎杩愮畻缁撴灉鐢�(AC)缁熶竴浠ｆ浛锛孿r\n"
+						+"鍏朵腑鍔犲噺涔橀櫎銆佸彇X鐨剏娆℃柟锛圶^Y锛夈�佹眰浣欐暟锛圡od锛夌殑杩愮畻闇�瑕佺偣鍑荤瓑鍙锋墠鑳芥樉绀虹粨鏋�,鑰屽彇骞虫柟璺�(鈭�)銆佸彇骞虫柟锛圶^2锛塡r\n"
+						+"鍙栬礋鏁�(+/-)銆佸彇鍊掓暟(1/X)銆佸彇鑷劧瀵规暟e鐨剎娆℃柟(e^x)銆佸彇浠�10涓哄簳鐨勫鏁帮紙lg锛夈�佸彇浠ヨ嚜鐒跺鏁颁负搴曠殑瀵规暟锛坙n锛夈�佹眰闃朵箻(n!)銆乗r\n"
+						+ "锛圗xp锛夈�佹眰涓夎鍑芥暟浠ュ強鍙嶄笁瑙掑嚱鏁扮殑杩愮畻绗︿笉闇�瑕佺偣鍑荤瓑鍙�,\r\n"
+						+ "鍙渶瑕佺偣鍑绘暟瀛楃劧鍚庣偣鍑讳笂杩拌繍绠楃鍙峰嵆鍙樉绀哄嚭缁撴灉",
+						"甯姪", JOptionPane.PLAIN_MESSAGE);
+			}
+		});
+
+		// 鍒涘缓寮�鍙戣�呬俊鎭�
+		itemshelp[1].addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+				JOptionPane.showMessageDialog(null, "寮�鍙戣��:xiaozihuo\nQQ:1213013981\n閭锛歺iaozihuo@foxmail.com", "寮�鍙戣��",
+						JOptionPane.PLAIN_MESSAGE);
+			}
+		});
+
+		// 鍒涘缓璀﹀憡
+		itemshelp[2].addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent evt) {
+				JOptionPane.showMessageDialog(null, "濡傛灉璁＄畻鍣ㄦ寜鍔ㄤ换浣曟寜閿兘鏃犲弽搴�,鐐瑰嚮娓呴櫎(AC)鎸夐敭.", "璀﹀憡", JOptionPane.PLAIN_MESSAGE);
+			}
+		});
+
+		// 灏嗗垱寤虹殑閫夐」鍔犲叆鍒拌彍鍗曟爮涓�
+		for (int i = 0; i < 3; i++) {
+			set.add(itemshelp[i]);
+			set.add(new JSeparator());
+		}
+
+		bar.add(set);
+		Calculator.this.setJMenuBar(bar);
+	}
+	
+	
 	public Calculator() {
 		init();
 		addNorthComponent();
 		addCentralButton();
+		createmenu();
 	}
-	//初始化方法
+	//鍒濆鍖栨柟娉�
 	public void init(){
-		setTitle("计算器");
-		setBounds(650,330,500,400);
+		setTitle("璁＄畻鍣�");
+		setBounds(500,230,700,600);
 		setLayout(new BorderLayout());
 		
 		setResizable(false);
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 	}
-	//添加北面控件
+	//娣诲姞鍖楅潰鎺т欢
 	public void addNorthComponent(){
-		inpuText=new JTextField();
-		inpuText.setPreferredSize(new Dimension(480,50));
-		north.add(inpuText);
+		inputText1=new JTextField();
+		inputText1.setBackground(Color.DARK_GRAY);
+		inputText1.setForeground(Color.WHITE);
+		inputText1.setPreferredSize(new Dimension(690,80));
+		inputText1.setFont(new Font("寰蒋闆呴粦", Font.BOLD, 20));
+		north.add(inputText1);
 		add(north,BorderLayout.NORTH);
 	}
-	//添加中间按钮
+	//娣诲姞涓棿鎸夐挳
 	public void addCentralButton() {
-		String[] BtText= {"%","X^Y","X^2","1/X",
-						  "AC","<<<","√","/",
-						  "1", "2", "3", "*",
-						  "4", "5", "6", "-", 
-						  "7", "8", "9", "+", 
-						  "+/-", "0", ".", "=", };
-		String regex="[\\+\\-*/.=%√]";             //
-		center.setLayout(new GridLayout(6,4));
-		for(int i=0;i<24;i++) {
+		String[] BtText= {"AC","<<<","sin","cos","tan",
+						  "Exp","Mod","arcsin","arccos","arctan",
+				  	      "X^Y", "10^X","X^2", "1/X", "Ans",
+						  "loga^b","ln","lg","鈭�","%",
+						  "蟺","1", "2", "3", "+",
+						  "e", "4", "5", "6", "-", 
+						  "n!","7","8","9","*", 
+						  "+/-", "/","0", ".", "=", };
+		String regex1="[\\+\\-*/.=%鈭毾�e]";  
+		String regex2="[0123456789]";//
+		center.setLayout(new GridLayout(8,5));
+		for(int i=0;i<40;i++) {
 			button=new JButton(BtText[i]);
 			button.setText(BtText[i]);
-			if(BtText[i].matches(regex)||
-					BtText[i].equals("AC")||
-					BtText[i].equals("<<<")||
-					BtText[i].equals("+/-")||
-					BtText[i].equals("1/X")||
-					BtText[i].equals("X^Y")||
-					BtText[i].equals("X^2")) {
-				button.setFont(new Font("粗体",Font.BOLD,17));
+			if( BtText[i].matches(regex1)||BtText[i].equals("loga^b")||BtText[i].equals("ln")||
+				BtText[i].equals("sin")||BtText[i].equals("lg")||BtText[i].equals("arctan")||
+				BtText[i].equals("<<<")||BtText[i].equals("cos")||BtText[i].equals("Exp")||
+				BtText[i].equals("+/-")||BtText[i].equals("tan")||BtText[i].equals("Mod")||
+				BtText[i].equals("1/X")||BtText[i].equals("arcsin")||BtText[i].equals("X^2")||
+				BtText[i].equals("X^Y")||BtText[i].equals("arccos")||BtText[i].equals("10^X")||
+				BtText[i].equals("Ans")||BtText[i].equals("n!")) 
+			{
+				button.setFont(new Font("寰蒋闆呴粦",Font.BOLD,20));
+				button.setForeground(Color.white);
+				button.setBackground(Color.darkGray);
+			}
+			if(BtText[i].matches(regex2)) {
+				button.setFont(new Font("寰蒋闆呴粦",Font.BOLD,20));
+				button.setForeground(Color.white);
+				button.setBackground(Color.black);
+			}
+			if(BtText[i].equals("AC")||BtText[i].equals("<<<")) {
+				button.setFont(new Font("寰蒋闆呴粦",Font.BOLD,20));
 				button.setForeground(Color.red);
+				button.setBackground(Color.darkGray);
 			}
-
 			
-			/*matches() 方法用于检测字符串是否匹配给定的正则表达式。等同于如下代码
+			/*matches() 鏂规硶鐢ㄤ簬妫�娴嬪瓧绗︿覆鏄惁鍖归厤缁欏畾鐨勬鍒欒〃杈惧紡銆傜瓑鍚屼簬濡備笅浠ｇ爜
 			 * if(BtText[i].equals("+")||
 					BtText[i].equals("-")||
 					BtText[i].equals("*")||
@@ -70,9 +146,9 @@ public class Calculator extends JFrame implements ActionListener{
 					BtText[i].equals("=")||
 					BtText[i].equals("."))
 			{
-				button.setFont(new Font("粗体",Font.BOLD,20));
+				button.setFont(new Font("绮椾綋",Font.BOLD,20));
 				button.setForeground(Color.red);
-			}第47行和第52行借鉴了视频  https://www.bilibili.com/video/BV1d54y1s7uC?p=6  中的处理方法
+			}绗�47琛屽拰绗�52琛屽�熼壌浜嗚棰�  https://www.bilibili.com/video/BV1d54y1s7uC?p=6  涓殑澶勭悊鏂规硶
 			*/
 			button.addActionListener(this);
 			center.add(button);
@@ -81,88 +157,196 @@ public class Calculator extends JFrame implements ActionListener{
 	}
 	
 	public void actionPerformed(ActionEvent e) {
-		String str=e.getActionCommand();         				 //获取封装在事件中的“命令”字符串
-		Double result=null;
-		if("0123456789.".indexOf(str)!=-1)   					//使数字和小数点显示在文本框上
+			String str=e.getActionCommand();         				 //鑾峰彇灏佽鍦ㄤ簨浠朵腑鐨勨�滃懡浠も�濆瓧绗︿覆
+			Double result=null;
+		if("0123456789.()".indexOf(str)!=-1)   					//浣挎暟瀛楀拰灏忔暟鐐规樉绀哄湪鏂囨湰妗嗕笂
 		{
-		this.inpuText.setText(inpuText.getText()+str);  		//保存前面点击的数字
-		this.inpuText.setHorizontalAlignment(JTextField.RIGHT); //将文本从文本框的右边开始显示
+		this.inputText1.setText(inputText1.getText()+str);  		//淇濆瓨鍓嶉潰鐐瑰嚮鐨勬暟瀛�
+		this.inputText1.setHorizontalAlignment(JTextField.RIGHT); //灏嗘枃鏈粠鏂囨湰妗嗙殑鍙宠竟寮�濮嬫樉绀�
 		}
 		else if(str.equals("/") ||str.equals("+")||
 				str.equals("-")||str.equals("*")||
-				str.equals("X^Y")||str.equals("%"))
+				str.equals("X^Y")||str.equals("Mod")||str.equals("loga^b"))
 		{
-			fuHao=str;                    			        //fuHao用来存放点击的运算符号
-			inputNumber1=this.inpuText.getText();          //inputNumber1用来存放之前点击的数字
-			this.inpuText.setText("");                    //运算符号不显示在文本框上
+			fuHao=str;                    			        //fuHao鐢ㄦ潵瀛樻斁鐐瑰嚮鐨勮繍绠楃鍙�
+			inputNumber1=this.inputText1.getText();          //inputNumber1鐢ㄦ潵瀛樻斁涔嬪墠鐐瑰嚮鐨勬暟瀛�
+			this.inputText1.setText("");                    //杩愮畻绗﹀彿鏄剧ず鍦ㄦ枃鏈涓�
 		}
 		else if(str.equals("=")){
 			
 			Double Number1=Double.valueOf(inputNumber1);
-			Double Number2=Double.valueOf(this.inpuText.getText());
+			Double Number2=Double.valueOf(this.inputText1.getText());
 			
 			switch(fuHao) {
-			case "+"://加法
+			case "+"://鍔犳硶
 				result=Number1 + Number2;
 				break;
-			case "-"://减法
+			case "-"://鍑忔硶
 				result=Number1 - Number2;
 				break;
-			case "*"://乘法
+			case "*"://涔樻硶
 				result=Number1 * Number2;
 				break;
-			case "/"://除法
+			case "/"://闄ゆ硶
 				if(Number2!=0) {
 					result=Number1 / Number2;
 				}
-			case "X^Y"://取x的y次方
+			case "X^Y"://鍙杧鐨剏娆℃柟
 				result=Math.pow(Number1, Number2);
 				break;
-			case "%"://求余数
-				result=Number1%Number2;
+			case "Mod"://姹備綑鏁�
+				result=Number1 % Number2;
+				break;
+			case "loga^b"://姹傚鏁�
+				result=log(Number1, Number2);
+				break;
 				}
-			this.inpuText.setText(result.toString());
+			this.inputText1.setText(result.toString());
 		    }
-			//取平方根
-			else if(str.equals("√")) {
-				result=Double.parseDouble(inpuText.getText());
+		//鍙栧钩鏂规牴
+			else if(str.equals("鈭�")) {
+				result=Double.parseDouble(inputText1.getText());
 				result=Math.sqrt(result);
-				this.inpuText.setText(result.toString());
+				this.inputText1.setText(result.toString());
 			}
-		 	//取平方
+		 //鍙栧钩鏂�
 			else if(str.equals("X^2")) {
-				result=Double.parseDouble(inpuText.getText());
+				result=Double.parseDouble(inputText1.getText());
 				result=Math.pow(result, 2);
-				this.inpuText.setText(result.toString());
+				this.inputText1.setText(result.toString());
 			}
-			//取负数
+		//鍙栬礋鏁帮細璇峰厛杈撳叆鏁板瓧锛屽啀鐐瑰嚮姝ょ鍙�
 			else if(str.equals("+/-")) {
-				result=Double.parseDouble(inpuText.getText());
+				result=Double.parseDouble(inputText1.getText());
 				result=-1*result;;
-				this.inpuText.setText(result.toString());
+				this.inputText1.setText(result.toString());
 			}
-			//取倒数
+		//鍙栧�掓暟
 			else if(str.equals("1/X")) {
-				result=Double.parseDouble(inpuText.getText());
+				result=Double.parseDouble(inputText1.getText());
 				result=1/result;
-				this.inpuText.setText(result.toString());
+				this.inputText1.setText(result.toString());
 			}
-			//清除数值
+		//娓呴櫎鏁板��
 			else if(str.equals("AC")) {
-				this.inpuText.setText("");
+				this.inputText1.setText("");
 			}
-			//退格键
+		//閫�鏍奸敭
 			else if(str.equals("<<<")) {
 				
-				String str1=this.inpuText.getText();
-				if (this.inpuText.getText().length() > 1)
-					this.inpuText.setText(str1.substring(0, str1.length() - 1));
+				String str1=this.inputText1.getText();
+				if (this.inputText1.getText().length() > 1)
+					this.inputText1.setText(str1.substring(0, str1.length() - 1));
 				else {
-					this.inpuText.setText("");
+					this.inputText1.setText("");
 				}
-			
+			}
+		//姹傛寮�
+			else if(str.equals("sin")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=Math.sin(result);
+				this.inputText1.setText(result.toString());
+			}
+		//姹備綑寮�
+			else if(str.equals("cos")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=Math.cos(result);
+				this.inputText1.setText(result.toString());
+			}
+		//姹傛鍒�
+			else if(str.equals("tan")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=Math.tan(result);
+				this.inputText1.setText(result.toString());
+			}
+		//姹傚弽姝ｅ鸡
+			else if(str.equals("arcsin")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=Math.asin(result);
+				this.inputText1.setText(result.toString());
+			}
+		//姹傚弽浣欏鸡
+			else if(str.equals("arccos")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=Math.acos(result);
+				this.inputText1.setText(result.toString());
+			}
+		//姹傚弽姝ｅ垏
+			else if(str.equals("arctan")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=Math.atan(result);
+			}
+		//姹�10鐨剎娆″箓
+			else if(str.equals("10^X")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=Math.pow(10, result);
+				this.inputText1.setText(result.toString());
+			}
+		//姹備互鑷劧瀵规暟e涓哄簳鐨勫鏁�
+			else if(str.equals("ln")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=Math.log(result);
+				this.inputText1.setText(result.toString());
+			}
+		//姹備互10涓哄簳鐨勫鏁�
+			else if(str.equals("lg")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=Math.log10(result);
+				this.inputText1.setText(result.toString());
+			}
+		//姹傞樁涔�
+			else if(str.equals("n!")) {
+				this.inputText1.setText(String.valueOf(this
+						.JieCheng((int) Double.parseDouble(this.inputText1.getText()))));
+			}
+		//鍙栁�
+			else if(str.equals("蟺")) {
+				this.inputText1.setText(String.valueOf(Math.PI));
+				this.inputText1.setHorizontalAlignment(JTextField.RIGHT);
+			}
+		//鍙栬嚜鐒跺鏁癳
+			else if(str.equals("e")) {
+				this.inputText1.setText(String.valueOf(Math.E));
+				this.inputText1.setHorizontalAlignment(JTextField.RIGHT);
+			}
+			//淇濆瓨涓婃璁＄畻鐨勭粨鏋�
+			else if(str.equals("Ans")) {
+				this.inputText1.setText(String.valueOf(inputNumber1));
+				this.inputText1.setHorizontalAlignment(JTextField.RIGHT); 
+			}
+		//璁＄畻e^x
+			else if(str.equals("Exp")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=Math.exp(result);
+				this.inputText1.setText(result.toString());
+			}
+		//鍙栫櫨鍒嗘暟
+			else if(str.equals("%")) {
+				result=Double.parseDouble(inputText1.getText());
+				result=result/100;
+				this.inputText1.setText(result.toString());
 			}
 		}
+	
+	
+	//鍒╃敤鎹㈠簳鍏紡姹備互m涓哄簳n鐨勫鏁�
+	public double log(Double m,Double n) {
+		return Math.log(n)/Math.log(m);
 	}
-
+	//姹傞樁涔樼殑鏂规硶
+	public int JieCheng(int b) {
+		int a = b;
+		if (b == 0)
+			return 1;
+		else if (b < 0) {
+			b = Math.abs(b);
+			for (int i = 1; i < b; i++)
+				a *= i;
+			return -1 * b;
+		} else
+			for (int i = 1; i < b; i++)
+				a *= i;
+		return a;
+	}
+}
  
\ No newline at end of file
-- 
Gitee


From 3f276a260172e47492f9d1a4facd65aed04132fb Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.122.54>
Date: Sun, 29 May 2022 13:57:10 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B9=B1=E7=A0=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .settings/org.eclipse.core.resources.prefs | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .settings/org.eclipse.core.resources.prefs

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..9e63aac
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//src/java2022spring/Calculator.java=UTF-8
-- 
Gitee


From 391dad746c56a2dfde4f28a07218a9890c4939d0 Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.122.54>
Date: Sun, 29 May 2022 14:03:11 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .settings/org.eclipse.core.resources.prefs |   2 +-
 src/java2022spring/Calculator.java         | Bin 11670 -> 20826 bytes
 src/java2022spring/Test.java               |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 9e63aac..c1e6e84 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,2 @@
 eclipse.preferences.version=1
-encoding//src/java2022spring/Calculator.java=UTF-8
+encoding//src/java2022spring/Calculator.java=UTF-16
diff --git a/src/java2022spring/Calculator.java b/src/java2022spring/Calculator.java
index ded85d140346d2f3823e5d32907b4c3194ecc6b6..f2f8ba2c4aedc162f2ebbae9d13f72c540a697fc 100644
GIT binary patch
literal 20826
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

literal 11670
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
NBoHZt79zn{`XB7uQx*UK

diff --git a/src/java2022spring/Test.java b/src/java2022spring/Test.java
index fd50615..b77de6c 100644
--- a/src/java2022spring/Test.java
+++ b/src/java2022spring/Test.java
@@ -2,7 +2,7 @@ package java2022spring;
 
 public class Test {
 	public static void main(String[] args) {
-		Calculator carculator=new Calculator();
-		carculator.setVisible(true);
+		Calculator calculator=new Calculator();
+		calculator.setVisible(true);
 	}
 }
-- 
Gitee


From 2581600880d5d2418f49d07a9eaba28e34712355 Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.122.54>
Date: Wed, 1 Jun 2022 10:25:05 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E5=9C=A8=E8=8F=9C=E5=8D=95=E6=A0=8F?=
 =?UTF-8?q?=E7=9A=84=E2=80=9C=E4=BD=BF=E7=94=A8=E8=AF=B4=E6=98=8E=E2=80=9D?=
 =?UTF-8?q?=E4=B8=80=E9=A1=B9=E5=AF=B9=E6=9C=AC=E8=AE=A1=E7=AE=97=E5=99=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BD=BF=E7=94=A8=E4=BD=9C=E4=BA=86=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=8C=E5=90=8C=E6=97=B6=E5=9C=A8=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A0=8F=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=8F=82=E8=80=83?=
 =?UTF-8?q?=E5=87=BA=E5=A4=84=E4=B8=80=E9=A1=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2022spring/Calculator.java | Bin 20826 -> 21754 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/java2022spring/Calculator.java b/src/java2022spring/Calculator.java
index f2f8ba2c4aedc162f2ebbae9d13f72c540a697fc..d052113b1aab11d0c7ea00bc83572fd3a58ee996 100644
GIT binary patch
delta 793
zcmZuv-%Aux6#m9`ZD-w9NexTHWy#Xqc4l|fbbTud1RLF*3KwPb*VIbOx;Wb;EVzb?
z=}S_VFbI-*2%?9CdGeu%ARhul0wY9vDgTDZi0#}-lOPV4bI*6rx##=txtmXgo#(=G
zrGq_Dt62W9n<<XRY{PLyXkh_oGkfQ$VTSWF_kzM!ohQ87+vx+*owx&jG@;W{OMNAN
zSxB8#w=twf5)UwJ7W#kanW76RjN>|nkialYxlXy09cc6)Lz679WtXoaVdyKA)ko*y
zqDbHeSEutlCXr!YG1I4gGN)pt_C*c+m|BSQAEUo)#K0KRvVak4VUW*Kn{-iBx3%}$
z+FqVnSXj?3s)rUae><}h{h901z9Yak#n8b4Oke<MHhrX;)w>6+8Fyoe_0qE?REiKG
zL5kHTcJ`#QH=a5{vA%dJguJ#iDdYkOk;&AT`_Qg$vwaxtwpXCcb*o<|g{Yz4y)hCy
zI+t8{eYG4h==3N$$&_%BSZ7H?(k%4kZ#MSU-_NSE^Q#Z<!G|QBWRZb^2<L-awy{^o
zyS(aYvk-S=OZAo1hFn5#S)1pq_pKRzn`67L3JSt=-NdL3trVT%5og8q&1`9xljWmp
zJp+F_|EKHl?hu2-(!eOv2-4DtnS={81A}<>V*DBbT*^4k5uj6wMDYY6V^o+TM51C|
zHbh8@$|U}P2&0uKwV<7LE%5y-ENb?|IaPC3jc7};+M<U`RrY1_9Z4PR<byKq#7|B=
zQzQ1h4fHz$@c$j4?Coa@-b?hUzj>LJD=({NgT6AWzF}PyB-S0QV~;vK?1fyz@<ET)
IB!&FH0b$YBqyPW_

delta 285
zcmeyhlJV9e#tp(OlUp?vCL6NMn|zujiqUwo8msnXMsAtOnXEUMc^SAi_pvE3O}@mT
zA=P`IK|@K3LDPUS_*z_X>dyZh3=s@*3`YMsCr5F}O*Y}QW=#e1D<+q47T5qKT^TAE
z3jT8%Fy=V<adut`{F_?f_cZua@L3qItfl`#_4H~rKi=sKos9)M1AkY027hPJ0U9UE
ztiYf&*@nxIQEBo8c9F?lT=AQqa_KN_=H-3BIC-T|1gkNFHG{%rK3Va}vceUcCkpe6
z%2n$ym@t@k_=NNTS*8p|9X<i_lS=&BI*-km2vj>oAc>Db!B4lWC6c9tEp=zk)y)eu
bZgT={(x1G*Sbnm#Eze|bBc9DCjSQ6lzmi>>

-- 
Gitee


From eed27fd204544f0dd84b51a4b91e4dab2ad20d88 Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.122.54>
Date: Wed, 1 Jun 2022 10:36:05 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=99=A4=E6=B3=95?=
 =?UTF-8?q?=E8=BF=90=E7=AE=97=E6=97=B6=EF=BC=8C=E8=8B=A5=E5=88=86=E6=AF=8D?=
 =?UTF-8?q?=E4=B8=BA0=EF=BC=8C=E5=88=99=E5=9C=A8=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A1=86=E8=BE=93=E5=87=BA=20=E5=88=86=E6=AF=8D=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2022spring/Calculator.java | Bin 21754 -> 21834 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/java2022spring/Calculator.java b/src/java2022spring/Calculator.java
index d052113b1aab11d0c7ea00bc83572fd3a58ee996..27a8f021018a02a62183954f18eddaf9372f42ea 100644
GIT binary patch
delta 41
xcmeyhlJV3k#tqAjCf~K;n#^dc&KJa%eb$e+;jf<+g8_rmWIbc!%_ofvl>l1u4#@xj

delta 18
acmX@Lit*P<#tqAjCeJky+stchs{{a3-3M;~

-- 
Gitee


From a13244a2f543ad9228da3cca1f42773810a32bd4 Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.122.54>
Date: Wed, 1 Jun 2022 10:56:01 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E5=AF=B9=E8=8F=9C=E5=8D=95=E6=A0=8F?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BD=BF=E7=94=A8=E8=AF=B4=E6=98=8E=E4=BD=9C?=
 =?UTF-8?q?=E4=BA=86=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2022spring/Calculator.java | Bin 21834 -> 22062 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/java2022spring/Calculator.java b/src/java2022spring/Calculator.java
index 27a8f021018a02a62183954f18eddaf9372f42ea..65b89a007402857ae894abc9802ae32759322d03 100644
GIT binary patch
delta 299
zcmX@LigDc<#tl&%lPfqZCP#6|P2RxaP;bB#Smvk85Wx_~5NW{3;LDKDkOHK0fOI-T
zB2YA`tfl`#_4MfsosEGW1v>+O`!V=wr560>3G4;&%6`O6sa6aA4&%dQ(-}he3U*d|
z27gcTZTK7bt9V1*<@7lQObjs$ML?X#pv1t-z{M~*lY>9SzdN$2voXhs!4Pb#5ztm+
z1}lV(3`Q{1QQZZymq7>O4hG}@JP<nrf5U9;URXUn@E62hkcWjDc!ICR6{qgZuw>9s
gl48&_VBD<48O}Jllgo*jlYw(`fwk!7`&`*x0InoyH~;_u

delta 66
zcmV-I0KNaNtO3fZ0kB#KlVAxRlUfKklduRt5CANI3{%!#b7i?`IRGdk8k4XJAps(@
Y5(-xVlhX$glWGe=lh+L^v)T((O72J%@c;k-

-- 
Gitee


From 50243505e1bb0f77d607f28d92851b67f5fddd1e Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.122.54>
Date: Sat, 4 Jun 2022 14:54:46 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=8F=E4=B8=AD=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2022spring/Calculator.java | Bin 22062 -> 21836 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/java2022spring/Calculator.java b/src/java2022spring/Calculator.java
index 65b89a007402857ae894abc9802ae32759322d03..50d94b4e74ddcabac19cd1d06c0e328585f262d7 100644
GIT binary patch
delta 28
hcmZ3thVjfQ#tkKcEcJnYT$Aqz=71TSPYI<s0|23M3W5Lt

delta 278
zcmX@JigDc<#tkKc^_|CNOk_}C$Y3Y|!UBe31}g@AAS?$%J%%KPOokjFhS7Qq$qe}n
zxj+?VK+zP2R3J~E!HFS^!4SwZWiVl=1hR@5%o$1<oEhwaCfYKXF(~-ymbFB(l(41l
z%(-g7#1O+!1jKm^N(__x1w-qx*q;QnHJ>4!0c2k>(BwQID-UQ}3D7n-pv}cV7Y6`U
zlrSU$aX!$l44`ZtP&N^0b_q~LGSGxnARpvLkSdTrih+DX1_K5opi9kxZnXfiOc<Df
L&fEM#FvS@F3lKQM

-- 
Gitee


From d80a327d8257a6f44e5d64fcc5cc3a62ba84a920 Mon Sep 17 00:00:00 2001
From: 86135 <86135@192.168.122.54>
Date: Mon, 6 Jun 2022 22:01:30 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=B4=9F?=
 =?UTF-8?q?=E6=95=B0=E4=B8=8D=E8=83=BD=E5=BC=80=E5=B9=B3=E6=96=B9=E3=80=81?=
 =?UTF-8?q?=E8=B4=9F=E6=95=B0=E4=B8=8D=E8=83=BD=E8=BF=9B=E8=A1=8C=E5=AF=B9?=
 =?UTF-8?q?=E6=95=B0=E8=BF=90=E7=AE=97=E7=9A=84=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2022spring/Calculator.java | Bin 21836 -> 21482 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/java2022spring/Calculator.java b/src/java2022spring/Calculator.java
index 50d94b4e74ddcabac19cd1d06c0e328585f262d7..62c417112d17437f8a5157b40188b335f728ac47 100644
GIT binary patch
delta 786
zcmX@Jit*KQ#to4slZ}mp1PvK%7z`LR8F(4E7&t+2vVgea<nu<{0&!DQ3;cK+{`y(<
z%BL1EC{32Lm7MHoB{ezSBxbUxxXk4FRu+>LO|K|sGNdtRFcdMQG88kEGUPCn;4~6s
z5Xi`Qh78N#?+_!|p*Dl<&9~)a)Sk>_raZaXTVnEDvtwY3Afg54>OfK1%_0`uj7Y*C
z?4>8yTmHfj;obbqN|teQp_|5JQya0#$=Vu|Yi+c^%FY{cO}=hZ1l95bNo$FnBG3-$
z$pZEVkwov=Lqw|_kVQQlA)-$lPa>(^<pgrO^yCO<WKlgAi0By?WYI;g5Yc<Cr;$w9
z=B5cYA<F$C@j)vE3)=qM9X^e(3eBQ_rWW*HsGg29kS#nQ&cEVuns{r(kgXwT#Trjl
zuupuvg2Da+h5LE0n#uZhT9fO&^N_^kCR_U`fca;A6DIRpuugvF6N)C!HF>hH2viLu
zT|mr}n|xYdYVvPC0jQkM<XZoGljSW9Sd|!*7_=v61b{p$JDDx;Em#F4HGz_iyfWA3
I*r4}J0G5jGpa1{>

delta 553
zcmaF0obk*m#to4slkb{jO*Ymx*qm$1#0cc@P4+kDnyhXvG1=DNZgQ@v-sFB~p2^|n
z$DndTlcOy}kmUF`cUkZ<PWJXUfGXyn{L1nzGJms{wJhW0dTWKru{IiD+Sfp6@>&}$
zkhPQl+7yB5_0~d@XBzQMo-M>RdB5!uxJ!20i6Pl0IQfm;ez@F2dsI0Q2ZS7_BeI<6
zWCzE?aDA3e$i5SvT;OyRE|=|$EO!GgKG#KJ^3wn@pxam{UvfDK6&IR((-mRQes|%?
zd~Ro9dW3Tr@)^<@G#H8)QW=UFN*Qt(N+w(RJAwmhzxyqiy2;_5QYe1x^9%%rlfh(r
zZ@J031{{;My~3d3CNg=oR~}T(4j9O4lV^JGg7P&cFZ2<CiX}`o^i6}Caobl5D(*8m
e*Y6(O-fn+{+xwmQC-3opj}&n{n|}wqX955oYR%IC

-- 
Gitee


From 09022d3cf119a9e17abf68816232fda6936d9ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=A7=E5=AD=90=E6=B4=BB0422?=
 <10933582+xiao-zihuo@user.noreply.gitee.com>
Date: Mon, 6 Jun 2022 14:07:07 +0000
Subject: [PATCH 12/12] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20.s?=
 =?UTF-8?q?ettings/org.eclipse.core.resources.prefs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .settings/org.eclipse.core.resources.prefs | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .settings/org.eclipse.core.resources.prefs

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index c1e6e84..0000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/java2022spring/Calculator.java=UTF-16
-- 
Gitee