Feature/frb 80

.github/workflows/deploy_on_apk.yaml

@@ -0,0 +1,87 @@
+name: Android Build and Deploy
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    branches:
+      - main
+      - develop
+
+jobs:
+  build-android-app:
+    name: Build Android APK
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
+
+      - name: Create google-services.json directory
+        run: mkdir -p ./mobile/src/main # 상대 경로 사용 및 디렉토리 생성 보장
+
+      - name: Restore google-services.json from secret
+        run: |
+          echo "Attempting to write google-services.json..."
+          # 절대 경로 대신 상대 경로를 사용하는 것이 더 일반적입니다.
+          # GitHub Actions의 working-directory는 기본적으로 체크아웃된 리포지토리 루트입니다.
+          TARGET_FILE=""
+
+          # Secret 내용이 비어있는지 확인 (디버깅)
+          if [ -z "${{ secrets.GOOGLE_SERVICE_JSON }}" ]; then
+            echo "Error: Secret GOOGLE_SERVICE_JSON is empty or not set."
+            exit 1
+          fi
+
+          echo "${{ secrets.GOOGLE_SERVICE_JSON }}" > ./mobile/src/main/google-services.json
+
+          echo "google-services.json created. Verifying file:"
+          ls -l ./mobile/src/main/google-services.json # 파일 존재 및 크기 확인
+          echo "First 5 lines of google-services.json:"
+          head -n 5 ./mobile/src/main/google-services.json # 파일 내용 앞부분 확인 (Secret 내용 노출 주의, 디버깅 후 민감하면 cat 전체 대신 head 사용)
+          # 파일이 비어있지 않은지 확인
+          if [ ! -s ./mobile/src/main/google-services.json ]; then
+            echo "Error: ./mobile/src/main/google-services.json is empty after writing from secret."
+            exit 1
+          fi
+        # shell: bash # 명시적으로 bash 사용 (기본값이지만)
+
+      # IOT 인증서 파일 생성 부분 (기존과 동일하게 유지하되, 경로 일관성을 위해 상대경로로 변경 가능)
+      - name: Write PEM files from secrets
+        run: |
+          mkdir -p ./mobile/src/main/assets
+
+          # IOT Certificate
+          if [ -z "${{ secrets.IOT_CERTIFICATE }}" ]; then echo "Error: Secret IOT_CERTIFICATE is empty."; exit 1; fi
+          echo "${{ secrets.IOT_CERTIFICATE }}" > ./mobile/src/main/assets/c060311b74ab5d78e0c9918acc72ebeb07d4d48accfab78d7296dae0e3718872-certificate.pem.crt
+          chmod 600 ./mobile/src/main/assets/c060311b74ab5d78e0c9918acc72ebeb07d4d48accfab78d7296dae0e3718872-certificate.pem.crt
+          ls -l ./mobile/src/main/assets/c060311b74ab5d78e0c9918acc72ebeb07d4d48accfab78d7296dae0e3718872-certificate.pem.crt
+
+          # Private PEM
+          if [ -z "${{ secrets.PRIVATE_PEM }}" ]; then echo "Error: Secret PRIVATE_PEM is empty."; exit 1; fi
+          echo "${{ secrets.PRIVATE_PEM }}" > ./mobile/src/main/assets/c060311b74ab5d78e0c9918acc72ebeb07d4d48accfab78d7296dae0e3718872-private.pem.crt
+          chmod 600 ./mobile/src/main/assets/c060311b74ab5d78e0c9918acc72ebeb07d4d48accfab78d7296dae0e3718872-private.pem.crt
+          ls -l ./mobile/src/main/assets/c060311b74ab5d78e0c9918acc72ebeb07d4d48accfab78d7296dae0e3718872-private.pem.crt
+
+      - name: Build Debug APK
+        # 모듈 이름을 명시하는 것이 더 정확할 수 있습니다.
+        # 예: ./gradlew :mobile:assembleDebug 또는 ./gradlew mobile:assembleDebug
+        run: ./gradlew :mobile:assembleDebug # 또는 프로젝트 구조에 맞게 수정
+
+      - name: Upload Debug APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: debug-apk
+          # 모듈 이름이 'mobile'이므로 경로도 mobile로 시작해야 할 가능성이 높습니다.
+          path: mobile/build/outputs/apk/debug/mobile-debug.apk # 실제 APK 경로 확인 필요

mobile/src/main/java/com/f2r/mobile/worker/WearableListener.kt

@@ -19,7 +19,9 @@ private const val BIO_DATA_PATH = "/bio_data" // 생체 데이터 경로
 private const val MOBILE_PREFS_NAME = "MobileAppPrefs"
 private const val KEY_STORED_WEARABLE_ID = "storedWearableDeviceId" // 모바일 앱에 저장할 웨어러블 ID 키
 
+
 class WearableListener : WearableListenerService() {
+    private lateinit var workerInfoSender: WorkerInfoSender
 
     override fun onDataChanged(dataEvents: DataEventBuffer) {
         Log.d(TAG, "onDataChanged received ${dataEvents.count} events")
@@ -63,6 +65,7 @@ class WearableListener : WearableListenerService() {
                         if (wearableIdForTopic == null) {
                             Log.e(TAG, "Wearable ID not found in SharedPreferences. Cannot create MQTT topic.")
                             // ID가 없으면 MQTT 전송을 시도하지 않거나, 기본 토픽 등을 사용할 수 있음
+                            workerInfoSender.requestWearableIdFromWear(this)
                             return@forEach // 또는 다른 오류 처리
                         }
 
@@ -111,4 +114,5 @@ class WearableListener : WearableListenerService() {
         super.onDestroy()
         Log.d(TAG, "WearableListenerService destroyed")
     }
+
 }

mobile/src/main/java/com/f2r/mobile/worker/WorkerInfoSender.kt

@@ -1,5 +1,6 @@
 package com.f2r.mobile.worker
 
+import android.content.Context
 import android.util.Log
 import androidx.lifecycle.LifecycleService
 import com.google.android.gms.common.api.ApiException
@@ -14,15 +15,29 @@ import kotlinx.coroutines.tasks.await
  * 모바일에 할당된 사용자 프로필을 워치에 1회 푸시해 매핑한다.
  * Hard-coded sample – replace with DB / API later.
  */
+
+private const val REQUEST_WEARABLE_ID_PATH = "/request_wearable_id"
+
 class WorkerInfoSender : LifecycleService() {
 
     private val scope = CoroutineScope(Dispatchers.IO)
     private val dataClient by lazy { Wearable.getDataClient(this) }
-
+    private val messageClient by lazy { Wearable.getMessageClient(this) }
     override fun onCreate() {
         super.onCreate()
         scope.launch { pushWorkerInfo() }
     }
+    fun requestWearableIdFromWear(context: Context) {
+        messageClient.sendMessage(
+            "wear_node_id", // Wear OS 기기의 노드 ID (연결된 노드에서 가져옴)
+            REQUEST_WEARABLE_ID_PATH,
+            null // 메시지에 추가 데이터가 필요하지 않으면 null
+        ).addOnSuccessListener {
+            Log.d("MobileApp", "Wearable ID request sent successfully.")
+        }.addOnFailureListener { e ->
+            Log.e("MobileApp", "Failed to send Wearable ID request.", e)
+        }
+    }
 
     private suspend fun pushWorkerInfo() {
         try {

mobile/src/main/java/com/iot/myapplication/FCMService.kt

@@ -7,29 +7,52 @@ import android.content.Context
 import android.os.Build
 import android.util.Log
 import com.f2r.mobile.worker.WorkerInfo
+import com.google.android.gms.wearable.CapabilityClient
+import com.google.android.gms.wearable.CapabilityInfo
+import com.google.android.gms.wearable.MessageClient
+import com.google.android.gms.wearable.Node
+import com.google.android.gms.wearable.NodeClient
+import com.google.android.gms.wearable.Wearable
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.retrofit.FCMTokenRegistDto
 import com.retrofit.RetrofitClient
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.tasks.await
+import kotlin.collections.forEach
 
 
 private const val TAG = "FCMService"
 private const val DEFAULT_CHANNEL_ID = "Monitory"
 private const val CHAT_CHANNEL_ID = "chat_channel"
+
+// Wear OS 앱과의 통신을 위한 경로 및 Capability 정의
+private const val WEAR_APP_CAPABILITY = "wear_app_capability" // Wear OS 앱의 AndroidManifest.xml에 정의된 capability와 일치해야 함
+private const val FCM_MESSAGE_PATH = "/fcm_message" // 모바일 -> 웨어러블 메시지 경로
 class FCMService : FirebaseMessagingService() {
+    private lateinit var messageClient: MessageClient
+    private lateinit var capabilityClient: CapabilityClient
+    private lateinit var nodeClient: NodeClient
+
     override fun onCreate() {
         super.onCreate()
         createNotificationChannels()
+        messageClient = Wearable.getMessageClient(this)
+        nodeClient = Wearable.getNodeClient(this)
+        capabilityClient = Wearable.getCapabilityClient(this)
     }
     override fun onNewToken(token: String) {
         super.onNewToken(token)
         Log.d(TAG, "Refreshed token: $token")
-        val workerId = WorkerInfo.toJson().getString("workerId")
-        CoroutineScope(Dispatchers.IO).launch {
-            RetrofitClient.instance.sendFCM(FCMTokenRegistDto(workerId, token))
+        try {
+            val workerId = WorkerInfo.toJson().getString("workerId")
+            CoroutineScope(Dispatchers.IO).launch {
+                RetrofitClient.instance.sendFCM(FCMTokenRegistDto(workerId, token))
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to get workerId for FCM token registration", e)
         }
     }
 
@@ -40,10 +63,50 @@ class FCMService : FirebaseMessagingService() {
         // 알림 데이터 처리
         val title = remoteMessage.notification?.title ?: remoteMessage.data["title"] ?: "알림"
         val body = remoteMessage.notification?.body ?: remoteMessage.data["body"] ?: "새로운 메시지가 도착했습니다."
-//
-//        val title = remoteMessage.data.get("title") ?: "알림"
-//        val body = remoteMessage.data.get("body") ?: "새로운 메시지가 도착했습니다."
+
+        // 1. 모바일 자체에 알림 표시 (기존 로직)
         showNotification(title, body)
+
+        // 2. Wear OS 기기로 메시지 전송
+        sendFcmDataToWearable(title, body)
+    }
+    private fun sendFcmDataToWearable(title: String, body: String) {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val connectedNodesList = nodeClient.connectedNodes.await()
+                if (connectedNodesList.isEmpty()) {
+                    Log.d(TAG, "NodeClient: No connected nodes found at all.")
+                } else {
+                    Log.d(TAG, "NodeClient: Found ${connectedNodesList.size} connected node(s):")
+                    connectedNodesList.forEach { node ->
+                        Log.d(TAG, "Node: ${node.displayName}, ID: ${node.id}, isNearby: ${node.isNearby}")
+                    }
+                }
+                if (connectedNodesList.isEmpty()) {
+                    Log.d(TAG, "No wearable device with '$WEAR_APP_CAPABILITY' capability found or connected.")
+                    return@launch
+                }
+
+                // 모든 연결된 노드에 메시지 전송 (보통은 하나의 웨어러블만 연결됨)
+                connectedNodesList.forEach { node ->
+                    // 메시지 페이로드 생성 (ByteArray로 변환)
+                    // 간단한 문자열 결합 또는 JSON/ProtoBuf 사용 가능
+                    val payloadString = "$title|$body" // 간단한 구분자 사용 예시
+                    val payload: ByteArray = payloadString.toByteArray(Charsets.UTF_8)
+
+                    messageClient.sendMessage(node.id, FCM_MESSAGE_PATH, payload)
+                        .addOnSuccessListener {
+                            Log.d(TAG, "FCM message sent to wearable (${node.displayName}): $payloadString")
+                        }
+                        .addOnFailureListener { e ->
+                            Log.e(TAG, "Failed to send FCM message to wearable (${node.displayName})", e)
+                        }
+                }
+                // ... 기존 capabilityClient 로직 ...
+            } catch (e: Exception) {
+                Log.e(TAG, "Error in NodeClient check or capability check", e)
+            }
+        }
     }
     private fun createNotificationChannels() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

mobile/src/main/java/com/iot/myapplication/Location.kt

@@ -1,6 +1,10 @@
 package com.iot.myapplication
 
+import com.google.gson.annotations.SerializedName
+
 data class Location(
+    @SerializedName("zoneId")
     val zoneId: String,
+    @SerializedName("zoneName")
     val zoneName: String,
 )

mobile/src/main/java/com/iot/myapplication/MainViewModel.kt

@@ -31,11 +31,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     private val _mqttPublishStatus = MutableLiveData<String>()
     val mqttPublishStatus: LiveData<String> = _mqttPublishStatus
 
+
     init {
         loadWorkerInfoDisplay()
         initializeMqttClient()
         fetchLocationFromServer()
-        fetchFcmToken()
+//        fetchFcmToken()
     }
 
     private fun initializeMqttClient(){
@@ -87,18 +88,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         }
     }
 
-    private fun fetchFcmToken() {
-        FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
-            if (task.isSuccessful) {
-                // FCM 토큰 가져오기 성공
-                val token = task.result
-                Log.d("FCMService", "FCM Token: $token")
-            } else {
-                // FCM 토큰 가져오기 실패
-                Log.e("FCMService", "Failed to fetch FCM token", task.exception)
-            }
-        }
-    }
     fun initializeAndStartService(){
         viewModelScope.launch {
             val serviceIntent = Intent(appContext, WorkerInfoSender::class.java)

mobile/src/main/java/com/retrofit/RetrofitClient.kt

@@ -1,5 +1,6 @@
 package com.retrofit
 
+import com.google.gson.GsonBuilder
 import okhttp3.ConnectionSpec
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -9,7 +10,7 @@ import software.amazon.awssdk.crt.BuildConfig
 
 object RetrofitClient {
     // 실제 운영 시에는 HTTPS URL 사용
-    private const val BASE_URL = "https://www.monitory.space/"
+    private const val BASE_URL = "https://api.monitory.space/"
     // 개발 시 로컬 HTTP 서버 테스트용 URL (주석 처리하여 선택)
 //     private const val BASE_URL = "http://10.0.2.2:8080/" // 에뮬레이터에서 호스트 PC의 localhost
 
@@ -46,11 +47,14 @@ object RetrofitClient {
         }
     }.build()
 
+    val gson = GsonBuilder()
+        .setLenient()
+        .create()
     val instance: ApiService by lazy {
         val retrofit = Retrofit.Builder()
             .baseUrl(BASE_URL)
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(gson))
             .build()
         retrofit.create(ApiService::class.java)
     }