Merge remote-tracking branch 'origin/main'

.idea/.gitignore

@@ -0,0 +1,3 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml

.idea/jzq.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jzq.iml" filepath="$PROJECT_DIR$/.idea/jzq.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

BaseConversion.java

@@ -0,0 +1,58 @@
+import java.util.Scanner;
+
+public class BaseConversion {
+
+    // 将任意R进制数转换为十进制数
+    public static int convertToDecimal(String numStr, int base) {
+        return Integer.parseInt(numStr, base);
+    }
+
+    // 将十进制数转换为任意R进制数
+    public static String convertFromDecimal(int num, int base) {
+        if (num == 0) {
+            return "0";
+        }
+        StringBuilder result = new StringBuilder();
+        while (num > 0) {
+            int remainder = num % base;
+            if (remainder < 10) {
+                result.append(remainder);
+            } else {
+                result.append((char) ('A' + (remainder - 10))); // A-F 对应 10-15
+            }
+            num /= base;
+        }
+        return result.reverse().toString(); // 反转结果
+    }
+
+    // 将一个R进制数转换为另一个R进制数
+    public static String convertBase(String numStr, int fromBase, int toBase) {
+        int decimalNumber = convertToDecimal(numStr, fromBase);
+        return convertFromDecimal(decimalNumber, toBase);
+    }
+
+    public static void main(String[] args) {
+        Scanner scanner = new Scanner(System.in);
+
+        System.out.print("请输入要转换的数字: ");
+        String numStr = scanner.nextLine();
+
+        System.out.print("请输入源进制 (2-16): ");
+        int fromBase = scanner.nextInt();
+
+        System.out.print("请输入目标进制 (2-16): ");
+        int toBase = scanner.nextInt();
+
+        // 验证进制范围
+        if (fromBase < 2 || fromBase > 16 || toBase < 2 || toBase > 16) {
+            System.out.println("进制必须在 2 到 16 之间。");
+        } else {
+            String result = convertBase(numStr, fromBase, toBase);
+            System.out.println(numStr + " 从 " + fromBase + " 进制转换到 " + toBase + " 进制的结果是: " + result);
+        }
+
+        scanner.close();
+
+        //This is a test
+    }
+}

out/production/jzq/.idea/.gitignore

@@ -0,0 +1,3 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml

out/production/jzq/.idea/jzq.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

out/production/jzq/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

out/production/jzq/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jzq.iml" filepath="$PROJECT_DIR$/.idea/jzq.iml" />
+    </modules>
+  </component>
+</project>

out/production/jzq/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

out/production/jzq/README.md

@@ -0,0 +1,2 @@
+# jzq
+