update icon, info trip

app.json

@@ -23,7 +23,8 @@
     },
     "web": {
       "output": "static",
-      "favicon": "./assets/images/favicon.png"
+      "favicon": "./assets/images/favicon.png",
+      "bundler": "metro"
     },
     "plugins": [
       "expo-router",

app/(tabs)/index.tsx

@@ -1,32 +1,125 @@
 import { showToastError } from "@/config";
-import { fetchGpsData } from "@/controller/DeviceController";
+import {
+  queryAlarm,
+  queryGpsData,
+  queryTrackPoints,
+} from "@/controller/DeviceController";
+import { getShipIcon } from "@/services/map_service";
+import { Image as ExpoImage } from "expo-image";
 import { useState } from "react";
-import { StyleSheet, Text, TouchableOpacity } from "react-native";
+import { StyleSheet, Text, TouchableOpacity, View } from "react-native";
 
-import MapView, { Marker } from "react-native-maps";
+import MapView, { Circle, Marker } from "react-native-maps";
 import { SafeAreaProvider } from "react-native-safe-area-context";
 
 export default function HomeScreen() {
   const [gpsData, setGpsData] = useState<Model.GPSResonse | null>(null);
-
-  // useEffect(() => {
-  //   getGpsData();
-  // }, []);
-
+  const [alarmData, setAlarmData] = useState<Model.AlarmResponse | null>(null);
+  const [trackPoints, setTrackPoints] = useState<Model.ShipTrackPoint[] | null>(
+    null
+  );
   const getGpsData = async () => {
     try {
-      const response = await fetchGpsData();
+      const response = await queryGpsData();
       console.log("GpsData: ", response.data);
-
+      console.log(
+        "Heading value:",
+        response.data?.h,
+        "Type:",
+        typeof response.data?.h
+      );
       setGpsData(response.data);
     } catch (error) {
+      console.error("Error fetching GPS data:", error);
       showToastError("Lỗi", "Không thể lấy dữ liệu GPS");
     }
   };
 
+  const getAlarmData = async () => {
+    try {
+      const response = await queryAlarm();
+      console.log("AlarmData: ", response.data);
+      setAlarmData(response.data);
+    } catch (error) {
+      console.error("Error fetching Alarm Data: ", error);
+      showToastError("Lỗi", "Không thể lấy dữ liệu báo động");
+    }
+  };
+
+  const getShipTrackPoints = async () => {
+    try {
+      const response = await queryTrackPoints();
+      console.log(
+        "TrackPoints Data: ",
+        response.data[response.data.length - 1]
+      );
+      setTrackPoints(response.data);
+    } catch (error) {
+      console.error("Error fetching TrackPoints Data: ", error);
+      showToastError("Lỗi", "Không thể lấy lịch sử di chuyển");
+    }
+  };
+
+  const handleMapReady = () => {
+    console.log("Map loaded successfully!");
+    getGpsData();
+    getAlarmData();
+    getShipTrackPoints();
+  };
+
+  // Tính toán region để bao phủ cả GPS và track points
+  const getMapRegion = () => {
+    if (!gpsData && (!trackPoints || trackPoints.length === 0)) {
+      return {
+        latitude: 15.70581,
+        longitude: 116.152685,
+        latitudeDelta: 2,
+        longitudeDelta: 2,
+      };
+    }
+
+    let minLat = gpsData?.lat ?? 90;
+    let maxLat = gpsData?.lat ?? -90;
+    let minLon = gpsData?.lon ?? 180;
+    let maxLon = gpsData?.lon ?? -180;
+
+    // Bao gồm track points
+    if (trackPoints) {
+      trackPoints.forEach((point) => {
+        minLat = Math.min(minLat, point.lat);
+        maxLat = Math.max(maxLat, point.lat);
+        minLon = Math.min(minLon, point.lon);
+        maxLon = Math.max(maxLon, point.lon);
+      });
+    }
+
+    const latDelta = Math.max(maxLat - minLat, 0.01) * 1.2; // Padding 20%
+    const lonDelta = Math.max(maxLon - minLon, 0.01) * 1.2;
+
+    console.log("Map region:", {
+      minLat,
+      maxLat,
+      minLon,
+      maxLon,
+      latDelta,
+      lonDelta,
+    });
+
+    return {
+      latitude: (minLat + maxLat) / 2,
+      longitude: (minLon + maxLon) / 2,
+      latitudeDelta: latDelta,
+      longitudeDelta: lonDelta,
+    };
+  };
+
   return (
     <SafeAreaProvider style={styles.container}>
       <MapView
+        onMapReady={handleMapReady}
+        onPoiClick={(point) => {
+          console.log("Poi clicked: ", point.nativeEvent);
+        }}
         style={styles.map}
         initialRegion={{
           latitude: 15.70581,
@@ -34,20 +127,65 @@ export default function HomeScreen() {
           latitudeDelta: 2,
           longitudeDelta: 2,
         }}
-        mapType="none"
+        region={getMapRegion()}
+        // userInterfaceStyle="dark"
+        showsBuildings={false}
+        showsIndoors={false}
+        loadingEnabled={true}
+        mapType="standard"
       >
+        {trackPoints &&
+          trackPoints.length > 0 &&
+          trackPoints.map((point, index) => {
+            // console.log(`Rendering circle ${index}:`, point);
+            return (
+              <Circle
+                key={index}
+                center={{
+                  latitude: point.lat,
+                  longitude: point.lon,
+                }}
+                zIndex={50}
+                radius={20} // Tăng từ 50 → 1000m
+                fillColor="rgba(241, 12, 65, 0.8)" // Tăng opacity từ 0.06 → 0.8
+                strokeColor="rgba(221, 240, 15, 0.8)"
+                strokeWidth={2}
+              />
+            );
+          })}
         {gpsData && (
           <Marker
             coordinate={{
               latitude: gpsData.lat,
               longitude: gpsData.lon,
             }}
-            title="Device Location"
-            description={`Lat: ${gpsData.lat}, Lon: ${gpsData.lon}`}
-          />
+            title="Tàu của mình"
+            zIndex={100}
+          >
+            <View
+              style={{
+                transform: [
+                  {
+                    rotate: `${
+                      typeof gpsData.h === "number" && !isNaN(gpsData.h)
+                        ? gpsData.h
+                        : 0
+                    }deg`,
+                  },
+                ],
+                alignItems: "center",
+                justifyContent: "center",
+              }}
+            >
+              <ExpoImage
+                source={getShipIcon(alarmData?.level || 0, gpsData.fishing)}
+                style={{ width: 32, height: 32 }}
+              />
+            </View>
+          </Marker>
         )}
       </MapView>
-      <TouchableOpacity style={styles.button} onPress={getGpsData}>
+      <TouchableOpacity style={styles.button} onPress={handleMapReady}>
         <Text style={styles.buttonText}>Get GPS Data</Text>
       </TouchableOpacity>
     </SafeAreaProvider>

app/(tabs)/tripInfo.tsx

@@ -1,22 +1,22 @@
 import { ThemedText } from "@/components/themed-text";
-import { ThemedView } from "@/components/themed-view";
 import TripCostTable from "@/components/tripInfo/TripCostTable";
-import { StyleSheet } from "react-native";
+import { StyleSheet, View } from "react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
 
 export default function TripInfoScreen() {
   return (
-    <ThemedView style={styles.container}>
-      <ThemedText type="title">Thông Tin Chuyến Đi</ThemedText>
-      <TripCostTable />
-    </ThemedView>
+    <SafeAreaView>
+      <View style={styles.container}>
+        <ThemedText type="title">Thông Tin Chuyến Đi</ThemedText>
+        <TripCostTable />
+      </View>
+    </SafeAreaView>
   );
 }
 
 const styles = StyleSheet.create({
   container: {
-    flex: 1,
     alignItems: "center",
-    justifyContent: "center",
     padding: 20,
   },
 });

app/_layout.tsx

@@ -11,7 +11,7 @@ import Toast from "react-native-toast-message";
 
 import { setRouterInstance } from "@/config/auth";
 import { useColorScheme } from "@/hooks/use-color-scheme";
-
+import "../global.css";
 export default function RootLayout() {
   const colorScheme = useColorScheme();
   const router = useRouter();

app/auth/login.tsx

@@ -73,8 +73,8 @@ export default function LoginScreen() {
       console.log("Login thành công với data:", response.data);
       if (response?.data.token) {
         // Lưu token vào storage nếu cần (thêm logic này sau)
-        console.log("Login Token:", response.data.token);
-
+        console.log("Login Token ");
+        
         await setStorageItem(TOKEN, response.data.token);
         console.log("Token:", response.data.token);
         router.replace("/(tabs)");

babel.config.js

@@ -0,0 +1,9 @@
+module.exports = function (api) {
+  api.cache(true);
+  return {
+    presets: [
+      ["babel-preset-expo", { jsxImportSource: "nativewind" }],
+      "nativewind/babel",
+    ],
+  };
+};

components/themed-text.tsx

@@ -1,31 +1,34 @@
-import { StyleSheet, Text, type TextProps } from 'react-native';
+import { StyleSheet, Text, type TextProps } from "react-native";
 
-import { useThemeColor } from '@/hooks/use-theme-color';
+import { useThemeColor } from "@/hooks/use-theme-color";
 
 export type ThemedTextProps = TextProps & {
   lightColor?: string;
   darkColor?: string;
-  type?: 'default' | 'title' | 'defaultSemiBold' | 'subtitle' | 'link';
+  type?: "default" | "title" | "defaultSemiBold" | "subtitle" | "link";
+  className?: string;
 };
 
 export function ThemedText({
   style,
+  className = "",
   lightColor,
   darkColor,
-  type = 'default',
+  type = "default",
   ...rest
 }: ThemedTextProps) {
-  const color = useThemeColor({ light: lightColor, dark: darkColor }, 'text');
+  const color = useThemeColor({ light: lightColor, dark: darkColor }, "text");
 
   return (
     <Text
+      className={className}
       style={[
         { color },
-        type === 'default' ? styles.default : undefined,
-        type === 'title' ? styles.title : undefined,
-        type === 'defaultSemiBold' ? styles.defaultSemiBold : undefined,
-        type === 'subtitle' ? styles.subtitle : undefined,
-        type === 'link' ? styles.link : undefined,
+        type === "default" ? styles.default : undefined,
+        type === "title" ? styles.title : undefined,
+        type === "defaultSemiBold" ? styles.defaultSemiBold : undefined,
+        type === "subtitle" ? styles.subtitle : undefined,
+        type === "link" ? styles.link : undefined,
         style,
       ]}
       {...rest}
@@ -41,20 +44,20 @@ const styles = StyleSheet.create({
   defaultSemiBold: {
     fontSize: 16,
     lineHeight: 24,
-    fontWeight: '600',
+    fontWeight: "600",
   },
   title: {
     fontSize: 32,
-    fontWeight: 'bold',
+    fontWeight: "bold",
     lineHeight: 32,
   },
   subtitle: {
     fontSize: 20,
-    fontWeight: 'bold',
+    fontWeight: "bold",
   },
   link: {
     lineHeight: 30,
     fontSize: 16,
-    color: '#0a7ea4',
+    color: "#0a7ea4",
   },
 });

components/themed-view.tsx

@@ -1,14 +1,30 @@
-import { View, type ViewProps } from 'react-native';
+import { View, type ViewProps } from "react-native";
 
-import { useThemeColor } from '@/hooks/use-theme-color';
+import { useThemeColor } from "@/hooks/use-theme-color";
 
 export type ThemedViewProps = ViewProps & {
   lightColor?: string;
   darkColor?: string;
+  className?: string;
 };
 
-export function ThemedView({ style, lightColor, darkColor, ...otherProps }: ThemedViewProps) {
-  const backgroundColor = useThemeColor({ light: lightColor, dark: darkColor }, 'background');
+export function ThemedView({
+  style,
+  className = "",
+  lightColor,
+  darkColor,
+  ...otherProps
+}: ThemedViewProps) {
+  const backgroundColor = useThemeColor(
+    { light: lightColor, dark: darkColor },
+    "background"
+  );
 
-  return <View style={[{ backgroundColor }, style]} {...otherProps} />;
+  return (
+    <View
+      className={className}
+      style={[{ backgroundColor }, style]}
+      {...otherProps}
+    />
+  );
 }

components/tripInfo/TripCostTable.tsx

@@ -1,6 +1,16 @@
-import React from "react";
-import { FlatList, ListRenderItem, Text, View } from "react-native";
-import styles from "./TripCostTable.styles";
+import { IconSymbol } from "@/components/ui/icon-symbol";
+import React, { useRef, useState } from "react";
+import {
+  Animated,
+  FlatList,
+  ListRenderItem,
+  Platform,
+  Text,
+  TouchableOpacity,
+  UIManager,
+  View,
+} from "react-native";
+import styles from "./style/TripCostTable.styles";
 
 // ---------------------------
 // 🧩 Interface
@@ -55,7 +65,18 @@ const data: CostItem[] = [
 // ---------------------------
 // 💰 Component chính
 // ---------------------------
+
 const TripCostTable: React.FC = () => {
+  // Enable LayoutAnimation for Android
+  if (
+    Platform.OS === "android" &&
+    UIManager.setLayoutAnimationEnabledExperimental
+  ) {
+    UIManager.setLayoutAnimationEnabledExperimental(true);
+  }
+
+  const [collapsed, setCollapsed] = useState(true);
+  const animatedHeight = useRef(new Animated.Value(0)).current;
   const tongCong = data.reduce((sum, item) => sum + item.tongChiPhi, 0);
 
   const renderItem: ListRenderItem<CostItem> = ({ item }) => (
@@ -67,32 +88,80 @@ const TripCostTable: React.FC = () => {
     </View>
   );
 
+  const contentHeight = 220; // Chiều cao cố định cho bảng, có thể điều chỉnh
+  const handleToggle = () => {
+    if (collapsed) {
+      Animated.timing(animatedHeight, {
+        toValue: contentHeight,
+        duration: 350,
+        useNativeDriver: false,
+      }).start();
+    } else {
+      Animated.timing(animatedHeight, {
+        toValue: 0,
+        duration: 350,
+        useNativeDriver: false,
+      }).start();
+    }
+    setCollapsed((prev) => !prev);
+  };
+
   return (
     <View style={styles.container}>
-      <Text style={styles.title}>Chi phí chuyến đi</Text>
+      <TouchableOpacity
+        activeOpacity={0.7}
+        onPress={handleToggle}
+        style={{
+          flexDirection: "row",
+          justifyContent: "space-between",
+          alignItems: "center",
+          marginBottom: collapsed ? 0 : 12,
+        }}
+      >
+        <Text style={styles.title}>Chi phí chuyến đi</Text>
+        {collapsed && (
+          <Text
+            style={[
+              styles.title,
+              { color: "#ff6600", fontWeight: "bold", marginLeft: 8 },
+            ]}
+          >
+            {tongCong.toLocaleString()}
+          </Text>
+        )}
+        <IconSymbol
+          name={collapsed ? "arrowshape.down.fill" : "arrowshape.up.fill"}
+          size={15}
+          color="#000000"
+        />
+      </TouchableOpacity>
 
-      {/* Header */}
-      <View style={[styles.row, styles.header]}>
-        <Text style={[styles.cell, styles.left, styles.headerText]}>Loại</Text>
-        <Text style={[styles.cell, styles.headerText]}>Tổng chi phí</Text>
-      </View>
+      <Animated.View style={{ height: animatedHeight, overflow: "hidden" }}>
+        {/* Header */}
+        <View style={[styles.row, styles.header]}>
+          <Text style={[styles.cell, styles.left, styles.headerText]}>
+            Loại
+          </Text>
+          <Text style={[styles.cell, styles.headerText]}>Tổng chi phí</Text>
+        </View>
 
-      {/* Body */}
-      <FlatList
-        data={data}
-        renderItem={renderItem}
-        keyExtractor={(item) => item.id}
-      />
+        {/* Body */}
+        <FlatList
+          data={data}
+          renderItem={renderItem}
+          keyExtractor={(item) => item.id}
+        />
 
-      {/* Footer */}
-      <View style={[styles.row, styles.footer]}>
-        <Text style={[styles.cell, styles.left, styles.footerText]}>
-          Tổng cộng
-        </Text>
-        <Text style={[styles.cell, styles.total]}>
-          {tongCong.toLocaleString()}
-        </Text>
-      </View>
+        {/* Footer */}
+        <View style={[styles.row]}>
+          <Text style={[styles.cell, styles.left, styles.footerText]}>
+            Tổng cộng
+          </Text>
+          <Text style={[styles.cell, styles.total]}>
+            {tongCong.toLocaleString()}
+          </Text>
+        </View>
+      </Animated.View>
     </View>
   );
 };

components/tripInfo/style/TripCostTable.styles.ts

@@ -12,11 +12,14 @@ const styles = StyleSheet.create({
     shadowRadius: 4,
     elevation: 2,
   },
+  icon: {
+    fontSize: 10,
+  },
   title: {
     fontSize: 18,
     fontWeight: "700",
     textAlign: "center",
-    marginBottom: 12,
+    // marginBottom: 12,
   },
   row: {
     flexDirection: "row",
@@ -52,7 +55,7 @@ const styles = StyleSheet.create({
     color: "#007bff",
   },
   total: {
-    color: "#007bff",
+    color: "#ff6600",
     fontWeight: "700",
   },
 });

components/ui/icon-symbol.tsx

@@ -23,6 +23,8 @@ const MAPPING = {
   "chevron.right": "chevron-right",
   "ferry.fill": "directions-boat",
   "map.fill": "map",
+  "arrowshape.down.fill": "arrow-drop-down",
+  "arrowshape.up.fill": "arrow-drop-up",
 } as IconMapping;
 
 /**

config/axios.ts

@@ -30,13 +30,13 @@ const api: AxiosInstance = axios.create({
   },
 });
 
+console.log("🚀 Axios baseURL:", api.defaults.baseURL);
+
 // Interceptor cho request (thêm token nếu cần)
 api.interceptors.request.use(
   async (config) => {
     // Thêm auth token nếu có
     const token = await getStorageItem(TOKEN);
-    console.log("Request Token: ", token);
-
     if (token) {
       config.headers.Authorization = `${token}`;
     }
@@ -53,7 +53,13 @@ api.interceptors.response.use(
     return response;
   },
   (error) => {
-    // Xử lý lỗi chung, ví dụ: redirect login nếu 401
+    if (!error.response) {
+      const networkErrorMsg =
+        error.message || "Network error - please check connection";
+      showToastError("Lỗi kết nối", networkErrorMsg);
+      return Promise.reject(error);
+    }
+
     const { status, statusText, data } = error.response;
 
     // Ưu tiên: codeMessage → backend message → statusText
@@ -62,8 +68,10 @@ api.interceptors.response.use(
       data?.message ||
       statusText ||
       "Unknown error";
-    showToastError(errMsg);
-    if (error.response?.status === 401) {
+
+    showToastError(`Lỗi ${status}`, errMsg);
+
+    if (status === 401) {
       // handle401();
     }
     return Promise.reject(error);

controller/DeviceController.ts

@@ -1,6 +1,18 @@
 import { api } from "@/config";
-import { API_GET_GPS } from "@/constants";
+import {
+  API_GET_ALARMS,
+  API_GET_GPS,
+  API_PATH_SHIP_TRACK_POINTS,
+} from "@/constants";
 
-export async function fetchGpsData() {
+export async function queryGpsData() {
   return api.get<Model.GPSResonse>(API_GET_GPS);
 }
+
+export async function queryAlarm() {
+  return api.get<Model.AlarmResponse>(API_GET_ALARMS);
+}
+
+export async function queryTrackPoints() {
+  return api.get<Model.ShipTrackPoint[]>(API_PATH_SHIP_TRACK_POINTS);
+}

controller/typings.d.ts

@@ -14,4 +14,23 @@ declare namespace Model {
     h: number;
     fishing: boolean;
   }
+  interface Alarm {
+    name: string;
+    t: number; // timestamp (epoch seconds)
+    level: number;
+    id: string;
+  }
+
+  interface AlarmResponse {
+    alarms: Alarm[];
+    level: number;
+  }
+
+  interface ShipTrackPoint {
+    time: number;
+    lon: number;
+    lat: number;
+    s: number;
+    h: number;
+  }
 }

global.css

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

metro.config.js

@@ -0,0 +1,6 @@
+const { getDefaultConfig } = require("expo/metro-config");
+const { withNativeWind } = require("nativewind/metro");
+
+const config = getDefaultConfig(__dirname);
+
+module.exports = withNativeWind(config, { input: "./global.css" });

nativewind-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="nativewind/types" />

package.json

@@ -29,13 +29,14 @@
     "expo-symbols": "~1.0.7",
     "expo-system-ui": "~6.0.8",
     "expo-web-browser": "~15.0.8",
+    "nativewind": "^4.2.1",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "react-native": "0.81.5",
     "react-native-gesture-handler": "~2.28.0",
     "react-native-maps": "^1.20.1",
     "react-native-reanimated": "~4.1.1",
-    "react-native-safe-area-context": "~5.6.0",
+    "react-native-safe-area-context": "5.4.0",
     "react-native-screens": "~4.16.0",
     "react-native-toast-message": "^2.3.3",
     "react-native-web": "~0.21.0",
@@ -45,6 +46,8 @@
     "@types/react": "~19.1.0",
     "eslint": "^9.25.0",
     "eslint-config-expo": "~10.0.0",
+    "prettier-plugin-tailwindcss": "^0.5.11",
+    "tailwindcss": "^3.4.17",
     "typescript": "~5.9.2"
   },
   "private": true

services/map_service.ts

@@ -0,0 +1,30 @@
+import shipAlarmIcon from "../assets/icons/ship_alarm.png";
+import shipAlarmFishingIcon from "../assets/icons/ship_alarm_fishing.png";
+import shipOnlineIcon from "../assets/icons/ship_online.png";
+import shipOnlineFishingIcon from "../assets/icons/ship_online_fishing.png";
+import shipUndefineIcon from "../assets/icons/ship_undefine.png";
+import shipWarningIcon from "../assets/icons/ship_warning.png";
+import shipWarningFishingIcon from "../assets/icons/ship_warning_fishing.png";
+import shipSosIcon from "../assets/icons/sos_icon.png";
+
+export const getShipIcon = (type: number, isFishing: boolean) => {
+  console.log("type, isFishing", type, isFishing);
+
+  if (type === 1 && !isFishing) {
+    return shipWarningIcon;
+  } else if (type === 2 && !isFishing) {
+    return shipAlarmIcon;
+  } else if (type === 0 && !isFishing) {
+    return shipOnlineIcon;
+  } else if (type === 1 && isFishing) {
+    return shipWarningFishingIcon;
+  } else if (type === 2 && isFishing) {
+    return shipAlarmFishingIcon;
+  } else if (type === 0 && isFishing) {
+    return shipOnlineFishingIcon;
+  } else if (type === 3) {
+    return shipSosIcon;
+  } else {
+    return shipUndefineIcon;
+  }
+};

tailwind.config.js

@@ -0,0 +1,13 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: [
+    "./app/**/*.{js,jsx,ts,tsx}",
+    "./components/**/*.{js,jsx,ts,tsx}",
+    "./screens/**/*.{js,jsx,ts,tsx}",
+  ],
+  presets: [require("nativewind/preset")],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+};

tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "expo/tsconfig.base",
   "compilerOptions": {
     "strict": true,
+    "jsx": "react-jsx",
     "paths": {
       "@/*": [
         "./*"
@@ -12,6 +13,7 @@
     "**/*.ts",
     "**/*.tsx",
     ".expo/types/**/*.ts",
-    "expo-env.d.ts"
+    "expo-env.d.ts",
+    "nativewind-env.d.ts"
   ]
-}
+}