From 3b5d8bfaf6358a9060308c90f88f864f6a8a693a Mon Sep 17 00:00:00 2001
From: yzb <3294956026@qq.com>
Date: Thu, 10 Oct 2024 16:43:02 +0800
Subject: [PATCH 1/4] demo1

---
 demo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo.java b/demo.java
index 475c5af..10b4467 100644
--- a/demo.java
+++ b/demo.java
@@ -1,5 +1,5 @@
 public class demo {
     public static void main(String[] args) {
-        System.out.println("Hello World");
+        System.out.println("Hello");
     }
 }
-- 
2.34.1


From 7c290bf0afc29b341ca028f8fe3fbe4dcb43a65e Mon Sep 17 00:00:00 2001
From: yzb <3294956026@qq.com>
Date: Thu, 10 Oct 2024 17:01:37 +0800
Subject: [PATCH 2/4] demo2

---
 demo.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/demo.java b/demo.java
index 10b4467..d7a2bd3 100644
--- a/demo.java
+++ b/demo.java
@@ -1,5 +1,48 @@
+import java.util.Scanner;
+
 public class demo {
+
+    // 将R进制数转换为10进制
+    public static int toDecimal(String number, int base) {
+        return Integer.parseInt(number, base);
+    }
+
+    // 将10进制数转换为R进制数
+    public static String fromDecimal(int number, int base) {
+        StringBuilder sb = new StringBuilder();
+        while (number > 0) {
+            int remainder = number % base;
+            // 对于大于9的数字，用字母表示
+            if (remainder >= 10) {
+                sb.append((char) ('A' + remainder - 10));
+            } else {
+                sb.append(remainder);
+            }
+            number /= base;
+        }
+        return sb.reverse().toString(); // 反转字符串以得到正确的顺序
+    }
+
     public static void main(String[] args) {
-        System.out.println("Hello");
+        Scanner scanner = new Scanner(System.in);
+
+        // 输入源进制和目标进制
+        System.out.print("请输入进制: ");
+        int sourceBase = scanner.nextInt();
+        System.out.print("请输入目标进制: ");
+        int targetBase = scanner.nextInt();
+
+        // 输入源进制数
+        System.out.print("请输入进制数字: ");
+        String sourceNumber = scanner.next();
+
+        // 转换过程
+        int decimalValue = toDecimal(sourceNumber, sourceBase);
+        String targetNumber = fromDecimal(decimalValue, targetBase);
+
+        // 输出结果
+        System.out.printf("转换结果: %s(%d) -> %s(%d)\n", sourceNumber, sourceBase, targetNumber, targetBase);
+
+        scanner.close();
     }
 }
-- 
2.34.1


From 6b4f8416477b79f1b6cd34cc1f29d6e2b255dd93 Mon Sep 17 00:00:00 2001
From: yzb <3294956026@qq.com>
Date: Thu, 10 Oct 2024 17:02:03 +0800
Subject: [PATCH 3/4] yzb

---
 demo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo.java b/demo.java
index d7a2bd3..cf31e98 100644
--- a/demo.java
+++ b/demo.java
@@ -33,7 +33,7 @@ public class demo {
         int targetBase = scanner.nextInt();
 
         // 输入源进制数
-        System.out.print("请输入进制数字: ");
+        System.out.print("请输入数字: ");
         String sourceNumber = scanner.next();
 
         // 转换过程
-- 
2.34.1


From 61e8573756f3f09dbf103811705017dfef9b274a Mon Sep 17 00:00:00 2001
From: yzb <3294956026@qq.com>
Date: Thu, 10 Oct 2024 17:04:49 +0800
Subject: [PATCH 4/4] yzb

---
 demo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo.java b/demo.java
index cf31e98..70942b0 100644
--- a/demo.java
+++ b/demo.java
@@ -41,7 +41,7 @@ public class demo {
         String targetNumber = fromDecimal(decimalValue, targetBase);
 
         // 输出结果
-        System.out.printf("转换结果: %s(%d) -> %s(%d)\n", sourceNumber, sourceBase, targetNumber, targetBase);
+        System.out.printf("转换结果: %s\n", targetNumber);
 
         scanner.close();
     }
-- 
2.34.1