.gitignore

@@ -74,6 +74,3 @@ yarn-error.log
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
-
-# Local SDK workspace
-sdk/

android/gradle.properties

@@ -42,3 +42,7 @@ hermesEnabled=true
 # This allows your app to draw behind system bars for an immersive UI.
 # Note: Only works with ReactActivity and should not be used with custom Activity.
 edgeToEdgeEnabled=false
+
+
+
+org.gradle.java.home=E:\\jdk\\jdk-17.0.12

src/DfuScreen.tsx

@@ -5,12 +5,10 @@ import { RootStackParamList } from "../App";
 import RNFS from "react-native-fs";
 import {
   startDfu,
-  getDfuTargetId,
   addDfuEventListener,
   DfuProgressEvent,
   DfuStateEvent,
 } from "@systemic-games/react-native-nordic-nrf5-dfu";
-import { useTranslation } from "react-i18next";
 import MyStatusbar from "./component/MyStatusbar";
 import MyHeader from "./component/MyHeader";
 
@@ -65,45 +63,42 @@ const trace = (step: string, payload?: unknown) => {
 export default function DfuScreen({ route, navigation }: Props) {
   const {
     deviceId,
-    systemId,
-    address,
     name,
     firmware: deviceFirmware,
   } = route.params;
-  const { t } = useTranslation();
 
   const [progress, setProgress] = useState(0);
-  const [state, setState] = useState(t("dfu.preparing"));
+  const [state, setState] = useState("准备中...");
   const [error, setError] = useState<string>();
-  const [latestVersion, setLatestVersion] = useState(t("dfu.reading"));
+  const [latestVersion, setLatestVersion] = useState("读取中...");
   const [isDfuRunning, setIsDfuRunning] = useState(false);
   const startedRef = useRef(false);
 
-  const mapDfuStateToLabel = (s: string): string => {
+  const mapDfuStateToChinese = (s: string): string => {
     switch (s) {
       case "connecting":
-        return t("dfu.stateConnecting");
+        return "连接中…";
       case "starting":
-        return t("dfu.stateStarting");
+        return "初始化中…";
       case "enablingDfuMode":
-        return t("dfu.stateEnablingDfuMode");
+        return "启用 DFU 模式…";
       case "uploading":
-        return t("dfu.stateUploading");
+        return "上传固件中…";
       case "validating":
-        return t("dfu.stateValidating");
+        return "校验固件…";
       case "disconnecting":
-        return t("dfu.stateDisconnecting");
+        return "断开连接…";
       case "completed":
-        return t("dfu.stateCompleted");
+        return "升级完成";
       case "aborted":
-        return t("dfu.stateAborted");
+        return "已取消";
       case "failed":
       case "dfu_failed":
-        return t("dfu.stateFailed");
+        return "升级失败";
       case "initializing":
-        return t("dfu.stateInitializing");
+        return "启动中…";
       case "errored":
-        return t("dfu.stateErrored");
+        return "升级出错！";
       default:
         return s;
     }
@@ -113,11 +108,11 @@ export default function DfuScreen({ route, navigation }: Props) {
     const unsubscribe = navigation.addListener("beforeRemove", (e) => {
       if (!isDfuRunning) return;
       e.preventDefault();
-      Alert.alert(t("dfu.pleaseWait"), t("dfu.doNotReturn"));
+      Alert.alert("请稍候", "正在升级，请勿返回或关闭应用！");
     });
 
     return unsubscribe;
-  }, [navigation, isDfuRunning, t]);
+  }, [navigation, isDfuRunning]);
 
   useEffect(() => {
     trace("screen mounted", {
@@ -157,30 +152,18 @@ export default function DfuScreen({ route, navigation }: Props) {
         setError(undefined);
 
         const rawDeviceId = String(deviceId ?? "").trim();
-        const rawSystemId = String(systemId ?? rawDeviceId).trim();
+        const safeDeviceId = rawDeviceId;
-        const rawAddress =
-          typeof address === "number"
-            ? address
-            : address !== undefined && address !== null
-            ? Number(address)
-            : undefined;
-        const safeDeviceId = getDfuTargetId({
-          systemId: rawSystemId,
-          address: Number.isFinite(rawAddress) ? rawAddress : undefined,
-        });
 
         const firmwareText = String(deviceFirmware ?? "").trim();
 
         trace("resolved input", {
           rawDeviceId,
-          rawSystemId,
-          rawAddress,
           safeDeviceId,
           firmwareText,
         });
 
         if (!safeDeviceId) {
-          throw new Error(t("dfu.invalidTargetDeviceId"));
+          throw new Error("无法生成 DFU 目标设备 ID");
         }
 
         const currentFw = parseFirmwareVersion(firmwareText);
@@ -195,9 +178,7 @@ export default function DfuScreen({ route, navigation }: Props) {
         trace("manifest fetch response", { status: manifestResp.status });
 
         if (!manifestResp.ok) {
-          throw new Error(
+          throw new Error(`manifest 下载失败，HTTP ${manifestResp.status}`);
-            t("dfu.manifestDownloadFailed", { status: manifestResp.status })
-          );
         }
 
         const manifestText = await manifestResp.text();
@@ -211,11 +192,7 @@ export default function DfuScreen({ route, navigation }: Props) {
         try {
           manifest = JSON.parse(manifestText) as { devices: DeviceInfo[] };
         } catch (e) {
-          throw new Error(
+          throw new Error("manifest 不是合法 JSON: " + manifestText.slice(0, 200));
-            t("dfu.manifestInvalidJson", {
-              preview: manifestText.slice(0, 200),
-            })
-          );
         }
 
         const deviceInfo = manifest.devices.find(
@@ -227,9 +204,9 @@ export default function DfuScreen({ route, navigation }: Props) {
         if (!deviceInfo) {
           setIsDfuRunning(false);
           Alert.alert(
-            t("dfu.cannotUpgrade"),
+            "无法升级",
-            t("dfu.hardwareNotFound", { hardware: currentFw.hardware }),
+            `未找到 hardware=${currentFw.hardware} 的固件`,
-            [{ text: t("dfu.confirm"), onPress: () => navigation.goBack() }]
+            [{ text: "确认", onPress: () => navigation.goBack() }]
           );
           return;
         }
@@ -241,17 +218,14 @@ export default function DfuScreen({ route, navigation }: Props) {
 
         if (latestFw.hardware !== currentFw.hardware) {
           throw new Error(
-            t("dfu.hardwareMismatch", {
+            `服务器固件硬件号不匹配：当前 ${currentFw.hardware}，服务器 ${latestFw.hardware}`
-              current: currentFw.hardware,
-              latest: latestFw.hardware,
-            })
           );
         }
 
         if (latestFw.iteration <= currentFw.iteration) {
           setIsDfuRunning(false);
-          Alert.alert(t("dfu.noNeedUpgrade"), t("dfu.alreadyLatest"), [
+          Alert.alert("无需升级", "已是最新固件，无需升级", [
-            { text: t("dfu.confirm"), onPress: () => navigation.goBack() },
+            { text: "确认", onPress: () => navigation.goBack() },
           ]);
           return;
         }
@@ -284,18 +258,14 @@ export default function DfuScreen({ route, navigation }: Props) {
         trace("firmware download result", downloadResult);
 
         if (downloadResult.statusCode !== 200) {
-          throw new Error(
+          throw new Error(`固件包下载失败，HTTP ${downloadResult.statusCode}`);
-            t("dfu.firmwareDownloadFailed", {
-              status: downloadResult.statusCode,
-            })
-          );
         }
 
         const fileExists = await RNFS.exists(localPath);
         trace("firmware exists check", { fileExists });
 
         if (!fileExists) {
-          throw new Error(t("dfu.firmwareFileMissing", { path: localPath }));
+          throw new Error(`固件包下载后文件不存在: ${localPath}`);
         }
 
         const fileStat = await RNFS.stat(localPath);
@@ -303,9 +273,7 @@ export default function DfuScreen({ route, navigation }: Props) {
         trace("firmware stat", fileStat);
 
         if (!Number.isFinite(fileSize) || fileSize <= 0) {
-          throw new Error(
+          throw new Error(`固件包文件无效，大小为 ${fileStat.size}`);
-            t("dfu.firmwareFileInvalid", { size: String(fileStat.size) })
-          );
         }
 
         const dfuFilePath = "file://" + localPath;
@@ -342,9 +310,9 @@ export default function DfuScreen({ route, navigation }: Props) {
 
         trace("startDfu resolved successfully");
         setIsDfuRunning(false);
-        Alert.alert(t("dfu.upgradeSuccess"), t("dfu.upgradeSuccessMessage"), [
+        Alert.alert("升级成功", "升级成功，请重连设备", [
   {
-    text: t("dfu.confirm"),
+    text: "确认",
     onPress: () => {
       navigation.reset({
         index: 0,
@@ -361,21 +329,21 @@ export default function DfuScreen({ route, navigation }: Props) {
           error: err,
         });
         setIsDfuRunning(false);
-        setError(err?.message || t("dfu.dfuFailed"));
+        setError(err?.message || "DFU失败");
-        Alert.alert(t("dfu.upgradeFailed"), err?.message || t("dfu.dfuFailed"), [
+        Alert.alert("升级失败", err?.message || "DFU失败", [
-          { text: t("dfu.confirm"), onPress: () => navigation.goBack() },
+          { text: "确认", onPress: () => navigation.goBack() },
         ]);
       }
     };
 
     runDfu();
-  }, [deviceId, name, deviceFirmware, navigation, t]);
+  }, [deviceId, name, deviceFirmware, navigation]);
 
   return (
     <View style={styles.container}>
       <MyStatusbar backgroundColor="#FFFFFF" dark />
       <MyHeader
-        title={t("dfu.title")}
+        title="固件升级"
         textColor="#333"
         backgroundColor="#FFFFFF"
         navigation={navigation}
@@ -383,26 +351,20 @@ export default function DfuScreen({ route, navigation }: Props) {
 
       <View style={styles.content}>
         <View style={styles.row}>
-          <Text style={styles.titleText}>
+          <Text style={styles.titleText}>蓝牙名称: {name || "--"}</Text>
-            {t("dfu.bluetoothName")}: {name || "--"}
+        </View>
-          </Text>
+
+        <View style={styles.row}>
+          <Text style={styles.normalText}>最新版本: {latestVersion}</Text>
+        </View>
+
+        <View style={styles.row}>
+          <Text style={styles.normalText}>当前版本: {deviceFirmware || "--"}</Text>
         </View>
 
         <View style={styles.row}>
           <Text style={styles.normalText}>
-            {t("dfu.latestVersion")}: {latestVersion}
+            升级状态: {mapDfuStateToChinese(state)}
-          </Text>
-        </View>
-
-        <View style={styles.row}>
-          <Text style={styles.normalText}>
-            {t("dfu.currentVersion")}: {deviceFirmware || "--"}
-          </Text>
-        </View>
-
-        <View style={styles.row}>
-          <Text style={styles.normalText}>
-            {t("dfu.upgradeStatus")}: {mapDfuStateToLabel(state)}
           </Text>
         </View>
 

src/InfoScreen.tsx

@@ -217,34 +217,24 @@ export default function InfoScreen({ route, navigation }: Props) {
   };
 
   const readBatteryCharacteristic = async () => {
-    let lastValidBattery: number | null = null;
+    for (let attempt = 0; attempt < 3; attempt += 1) {
-
-    for (let attempt = 0; attempt < 4; attempt += 1) {
       try {
         const bytes = await readCharacteristicWithRetry("180f", "2a19", 1);
         const batteryValue = bytes[0];
 
-        if (
+        if (Number.isInteger(batteryValue) && batteryValue >= 0 && batteryValue <= 100) {
-          Number.isInteger(batteryValue) &&
+          return `${batteryValue}%`;
-          batteryValue >= 0 &&
-          batteryValue <= 100
-        ) {
-          if (lastValidBattery !== null && lastValidBattery === batteryValue) {
-            return `${batteryValue}%`;
-          }
-
-          lastValidBattery = batteryValue;
         }
       } catch {
         // Continue retrying with a short gap below.
       }
 
-      if (attempt < 3) {
+      if (attempt < 2) {
-        await sleep(220);
+        await sleep(180);
       }
     }
 
-    return lastValidBattery !== null ? `${lastValidBattery}%` : "未知";
+    return "未知";
   };
 
   const subscribePowerDataIfNeeded = async () => {

src/i18n/locales/en.json

@@ -189,16 +189,9 @@
     "doNotReturn": "Updating in progress, do not go back or close the app!",
     
     "cannotUpgrade": "Cannot Update",
-    "hardwareNotFound": "Firmware not found for hardware version {{hardware}}",
+    "hardwareNotFound": "Firmware not found for hardware version {hardware}",
     "noNeedUpgrade": "No Update Needed",
     "alreadyLatest": "Already the latest firmware, no update needed",
-    "invalidTargetDeviceId": "Unable to generate DFU target device ID",
-    "manifestDownloadFailed": "Manifest download failed, HTTP {{status}}",
-    "manifestInvalidJson": "Manifest is not valid JSON: {{preview}}",
-    "hardwareMismatch": "Firmware hardware mismatch: current {{current}}, server {{latest}}",
-    "firmwareDownloadFailed": "Firmware package download failed, HTTP {{status}}",
-    "firmwareFileMissing": "Firmware package file not found after download: {{path}}",
-    "firmwareFileInvalid": "Firmware package file is invalid, size {{size}}",
     
     "upgradeSuccess": "Update Successful",
     "upgradeSuccessMessage": "Update successful, please reconnect the device",

src/i18n/locales/zh.json

@@ -189,16 +189,9 @@
     "doNotReturn": "正在升级，请勿返回或关闭应用！",
     
     "cannotUpgrade": "无法升级",
-    "hardwareNotFound": "未找到硬件版本 {{hardware}} 的固件",
+    "hardwareNotFound": "未找到硬件版本 {hardware} 的固件",
     "noNeedUpgrade": "无需升级",
     "alreadyLatest": "已是最新固件，无需升级",
-    "invalidTargetDeviceId": "无法生成 DFU 目标设备 ID",
-    "manifestDownloadFailed": "manifest 下载失败，HTTP {{status}}",
-    "manifestInvalidJson": "manifest 不是合法 JSON: {{preview}}",
-    "hardwareMismatch": "服务器固件硬件号不匹配：当前 {{current}}，服务器 {{latest}}",
-    "firmwareDownloadFailed": "固件包下载失败，HTTP {{status}}",
-    "firmwareFileMissing": "固件包下载后文件不存在: {{path}}",
-    "firmwareFileInvalid": "固件包文件无效，大小为 {{size}}",
     
     "upgradeSuccess": "升级成功",
     "upgradeSuccessMessage": "升级成功，请重连设备",