feat(ui):华为目标值的获取和上传

xx

feat(ui):修复ohos目标写法

xx

(cherry picked from commit 3e164451)

# Conflicts:
#	lib/core/services/raw_data_service/platform_ohos/ohos_harmony_health_raw_data_sync_service_factory.dart

xx

feat(ui):首页提供的数据也从本地数据库取

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:doublefeel_flutter/core/logging/app_logger.dart';
 import 'package:doublefeel_flutter/core/logging/app_logger.dart';
 import 'package:doublefeel_flutter/core/network/api/health_api.dart';
 import 'package:doublefeel_flutter/core/network/api/health_api.dart';
 import 'package:doublefeel_flutter/core/network/api/harmony_api.dart';
 import 'package:doublefeel_flutter/core/network/api/harmony_api.dart';
+import 'package:doublefeel_flutter/core/network/dio_client.dart';
 import 'package:doublefeel_flutter/core/platform/pigeon_api_facade.dart';
 import 'package:doublefeel_flutter/core/platform/pigeon_api_facade.dart';
 import 'package:doublefeel_flutter/core/result/app_result.dart';
 import 'package:doublefeel_flutter/core/result/app_result.dart';
 import 'package:doublefeel_flutter/data/models/harmony/hm_health_data.dart';
 import 'package:doublefeel_flutter/data/models/harmony/hm_health_data.dart';
@@ -36,12 +37,25 @@ OhosHealthRawDataSyncService createDefaultOhosHealthRawDataSyncService({
     remoteDataSource: OhosHarmonyHealthRawDataRemoteDataSource(
     remoteDataSource: OhosHarmonyHealthRawDataRemoteDataSource(
       HarmonyApiOhosRawDataClient(
       HarmonyApiOhosRawDataClient(
         Get.find<HarmonyApi>(),
         Get.find<HarmonyApi>(),
-        healthApi: Get.isRegistered<HealthApi>() ? Get.find<HealthApi>() : null,
+        healthApi: _resolveHealthApi(),
       ),
       ),
     ),
     ),
   );
   );
 }
 }
 
 
+/// HealthApi is normally lazy-registered. Activity-goal synchronization can
+/// start before that lazy dependency is materialized, so construct the same
+/// lightweight API wrapper from the app-wide DioClient as a fallback.
+HealthApi? _resolveHealthApi() {
+  if (Get.isRegistered<HealthApi>()) {
+    return Get.find<HealthApi>();
+  }
+  if (Get.isRegistered<DioClient>()) {
+    return HealthApi(Get.find<DioClient>());
+  }
+  return null;
+}
+
 class HarmonyApiOhosRawDataClient implements OhosHarmonyRawDataClient {
 class HarmonyApiOhosRawDataClient implements OhosHarmonyRawDataClient {
   const HarmonyApiOhosRawDataClient(
   const HarmonyApiOhosRawDataClient(
     this._harmonyApi, {
     this._harmonyApi, {
@@ -130,12 +144,6 @@ class HarmonyApiOhosRawDataClient implements OhosHarmonyRawDataClient {
 
 
   @override
   @override
   Future<AppResult<V2ActivityTarget>> getActivityGoal() async {
   Future<AppResult<V2ActivityTarget>> getActivityGoal() async {
-    final useRemoteData = false;
-    if (!_preferNativeHealthData || useRemoteData) {
-      AppLogger.i('[OHOS_ACTIVITY_GOAL] source=remote native_enabled=false');
-      return _harmonyApi.getActivityGoal();
-    }
-
     try {
     try {
       final goal =
       final goal =
           await (_healthKitApi ?? AppHealthKitHostApi()).readActivityGoal();
           await (_healthKitApi ?? AppHealthKitHostApi()).readActivityGoal();
@@ -151,10 +159,9 @@ class HarmonyApiOhosRawDataClient implements OhosHarmonyRawDataClient {
             '[OHOS_ACTIVITY_GOAL] '
             '[OHOS_ACTIVITY_GOAL] '
             'source=native value=${_goalLogValue(nativeGoal)}',
             'source=native value=${_goalLogValue(nativeGoal)}',
           );
           );
-          if (useRemoteData || _preferNativeHealthData) {
-            // 上传目标值到服务器
-            unawaited(_uploadNativeActivityGoal(nativeGoal));
-          }
+          // Deliberately do not await: a failed request must not prevent the
+          // user from entering the app or the health-data sync from continuing.
+          unawaited(_uploadNativeActivityGoal(nativeGoal));
           return AppSuccess(nativeGoal);
           return AppSuccess(nativeGoal);
         }
         }
       }
       }

@@ -245,6 +245,18 @@ class LocalHealthDataSource implements HealthDataSource {
   Future<AppResult<V2ActivityTarget>> getV2ActivityTarget(
   Future<AppResult<V2ActivityTarget>> getV2ActivityTarget(
       int? queryUserId, int intDate) async {
       int? queryUserId, int intDate) async {
     try {
     try {
+      if (_isOhosPlatform) {
+        // The OHOS sync pipeline persists the native activity ring goal in
+        // the local activity_goal table. Prefer that exact value here instead
+        // of reconstructing it from a day's activity summary.
+        final storedGoal = await coreService.queryOhosActivityGoal(
+          refresh: false,
+        );
+        if (storedGoal != null) {
+          return AppSuccess(storedGoal);
+        }
+      }
+
       final day = LocalHealthDataConvert.dateFromKey(intDate);
       final day = LocalHealthDataConvert.dateFromKey(intDate);
       final queryStart = LocalHealthDataConvert.unixSeconds(day);
       final queryStart = LocalHealthDataConvert.unixSeconds(day);
       final queryEnd = LocalHealthDataConvert.unixSeconds(
       final queryEnd = LocalHealthDataConvert.unixSeconds(
@@ -256,13 +268,10 @@ class LocalHealthDataSource implements HealthDataSource {
       );
       );
       final resolvedActivity = _resolveActivityTarget(activity);
       final resolvedActivity = _resolveActivityTarget(activity);
       if (_isOhosPlatform) {
       if (_isOhosPlatform) {
-        final activityGoal = await coreService.queryOhosActivityGoal(
-          refresh: false,
-        );
         return AppSuccess(
         return AppSuccess(
           _ohosActivityTarget(
           _ohosActivityTarget(
             userId: queryUserId ?? 0,
             userId: queryUserId ?? 0,
-            remoteOrCachedTarget: activityGoal,
+            remoteOrCachedTarget: null,
             activity: resolvedActivity,
             activity: resolvedActivity,
             fallbackUpdateTime: queryEnd,
             fallbackUpdateTime: queryEnd,
           ),
           ),