Merge branch 'yihong0618:master' into master

Author: tiny656

README-CN.md

@@ -1234,7 +1234,6 @@ python3 run_page/auto_share_sync.py --api_key xxxxxxxxx --base_url xxxxxxxx --da
 4. 为 GitHub Actions 添加代码提交权限，访问仓库的 `Settings > Actions > General`页面，找到 `Workflow permissions` 的设置项，将选项配置为 `Read and write permissions`，支持 CI 将运动数据更新后提交到仓库中。
 
 5. 如果想把你的 running_page 部署在 xxx.github.io 而不是 xxx.github.io/run_page 亦或是想要添加自定义域名于 GitHub Pages，需要做三点
-
    - 修改你的 fork 的 running_page 仓库改名为 xxx.github.io, xxx 是你 github 的 username
    - 修改 gh-pages.yml 中的 Build 模块，删除 `${{ github.event.repository.name }}` 改为`run: PATH_PREFIX=/ pnpm build` 即可
    - 修改 src/static/site-metadata.ts 中 `siteUrl: ''` 或是添加你的自定义域名，`siteUrl: '[your_own_domain]'`，即可

README.md

@@ -1007,7 +1007,6 @@ For more display effects, see:
 4. make sure you have write permissions in Workflow permissions settings.
 
 5. If you want to deploy your running_page to xxx.github.io instead of xxx.github.io/running_page or redirect your GitHub Pages to a custom domain, you need to do three things:
-
    - Rename your forked running_page repository to `xxx.github.io`, where xxx is your GitHub username
    - Modify the Build module in gh-pages.yml, remove `${{ github.event.repository.name }}` and change to `run: PATH_PREFIX=/ pnpm build`
    - In `src/static/site-metadata.ts`, set siteUrl: '' or your custom domain URL

run_page/gpxtrackposter/track.py

@@ -216,15 +216,16 @@ def _load_gpx_data(self, gpx):
         self.start_time, self.end_time = gpx.get_time_bounds()
         if self.start_time is None or self.end_time is None:
             # may be it's treadmill run, so we just use the start and end time of the extensions
-            self.start_time = datetime.datetime.fromisoformat(
-                self._load_gpx_extensions_item(gpx, "start_time")
-            )
-            self.end_time = datetime.datetime.fromisoformat(
-                self._load_gpx_extensions_item(gpx, "end_time")
-            )
-            self.start_time_local, self.end_time_local = parse_datetime_to_local(
-                self.start_time, self.end_time, None
-            )
+            start_time_str = self._load_gpx_extensions_item(gpx, "start_time")
+            end_time_str = self._load_gpx_extensions_item(gpx, "end_time")
+            if start_time_str:
+                self.start_time = datetime.datetime.fromisoformat(start_time_str)
+            if end_time_str:
+                self.end_time = datetime.datetime.fromisoformat(end_time_str)
+            if self.start_time and self.end_time:
+                self.start_time_local, self.end_time_local = parse_datetime_to_local(
+                    self.start_time, self.end_time, None
+                )
         # use timestamp as id
         self.run_id = self.__make_run_id(self.start_time)
         if self.start_time is None:

run_page/keep_sync.py

@@ -213,7 +213,7 @@ def get_all_keep_tracks(
                 )
                 tracks.append(track)
             except Exception as e:
-                print(f"Something wrong paring keep id {run}" + str(e))
+                print(f"Something wrong paring keep id {run}: " + str(e))
     return tracks
 
 
@@ -232,7 +232,10 @@ def parse_points_to_gpx(run_points_data, start_time, sport_type):
     points_dict_list = []
     # early timestamp fields in keep's data stands for delta time, but in newly data timestamp field stands for exactly time,
     # so it doesn't need to plus extra start_time
-    if run_points_data[0]["timestamp"] > TIMESTAMP_THRESHOLD_IN_DECISECOND:
+    if (
+        run_points_data
+        and run_points_data[0]["timestamp"] > TIMESTAMP_THRESHOLD_IN_DECISECOND
+    ):
         start_time = 0
 
     for point in run_points_data:

src/components/ActivityList/index.tsx

@@ -26,6 +26,7 @@ interface Activity {
   type: string;
   location_country?: string;
   elevation_gain?: number; // Optional if elevation gain is not used
+  average_heartrate?: number; // Add heart rate support
 }
 
 interface ActivitySummary {
@@ -37,6 +38,8 @@ interface ActivitySummary {
   maxDistance: number;
   maxSpeed: number;
   location: string;
+  totalHeartRate: number; // Add heart rate statistics
+  heartRateCount: number;
 }
 
 interface DisplaySummary {
@@ -48,6 +51,7 @@ interface DisplaySummary {
   maxSpeed: number;
   location: string;
   totalElevationGain?: number;
+  averageHeartRate?: number; // Add heart rate display
 }
 
 interface ChartData {
@@ -139,6 +143,12 @@ const ActivityCard: React.FC<ActivityCardProps> = ({
           <strong>{ACTIVITY_TOTAL.TOTAL_TIME_TITLE}:</strong>{' '}
           {formatTime(summary.totalTime)}
         </p>
+        {summary.averageHeartRate !== undefined && (
+          <p>
+            <strong>{ACTIVITY_TOTAL.AVERAGE_HEART_RATE_TITLE}:</strong>{' '}
+            {summary.averageHeartRate.toFixed(0)} bpm
+          </p>
+        )}
         {interval !== 'day' && (
           <>
             <p>
@@ -257,6 +267,8 @@ const ActivityList: React.FC = () => {
             maxDistance: 0,
             maxSpeed: 0,
             location: '',
+            totalHeartRate: 0,
+            heartRateCount: 0,
           };
 
         const distanceKm = activity.distance / 1000; // Convert to kilometers
@@ -271,6 +283,12 @@ const ActivityList: React.FC = () => {
           acc[key].totalElevationGain += activity.elevation_gain;
         }
 
+        // Heart rate statistics
+        if (activity.average_heartrate) {
+          acc[key].totalHeartRate += activity.average_heartrate;
+          acc[key].heartRateCount += 1;
+        }
+
         acc[key].count += 1;
 
         // Accumulate daily distances
@@ -354,6 +372,10 @@ const ActivityList: React.FC = () => {
                   totalElevationGain: SHOW_ELEVATION_GAIN
                     ? summary.totalElevationGain
                     : undefined,
+                  averageHeartRate:
+                    summary.heartRateCount > 0
+                      ? summary.totalHeartRate / summary.heartRateCount
+                      : undefined,
                 }}
                 dailyDistances={summary.dailyDistances}
                 interval={interval}

src/utils/const.ts

@@ -88,6 +88,7 @@ const TOTAL_DISTANCE_TITLE = IS_CHINESE ? '总距离' : 'Total Distance';
 const TOTAL_ELEVATION_GAIN_TITLE = IS_CHINESE
   ? '总海拔爬升'
   : 'Total Elevation Gain';
+const AVERAGE_HEART_RATE_TITLE = IS_CHINESE ? '平均心率' : 'Average Heart Rate';
 const YEARLY_TITLE = IS_CHINESE ? 'Year' : 'Yearly';
 const MONTHLY_TITLE = IS_CHINESE ? 'Month' : 'Monthly';
 const WEEKLY_TITLE = IS_CHINESE ? 'Week' : 'Weekly';
@@ -121,6 +122,7 @@ const ACTIVITY_TOTAL = {
   AVERAGE_SPEED_TITLE,
   TOTAL_DISTANCE_TITLE,
   TOTAL_ELEVATION_GAIN_TITLE,
+  AVERAGE_HEART_RATE_TITLE,
   YEARLY_TITLE,
   MONTHLY_TITLE,
   WEEKLY_TITLE,