diff --git a/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt b/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt index cdf7f3d..1167e50 100644 --- a/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt +++ b/app/src/main/java/com/example/hpostesting/data/model/login/LoginRequest.kt @@ -8,5 +8,6 @@ data class LoginRequest( val mode: String? = "", val password: String? = "", val serialNumber: String? = "", - val username: String? = "" + val username: String? = "", + val version: String? = "2.1.26" ) \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt index 972ec55..5d63c5b 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt @@ -58,9 +58,8 @@ class DashboardActivity : AppCompatActivity() { hemocubeViewModel.deviceUpdate.observe(this) { result -> when (result) { is Result.Success -> { - // Handle success - val apkUrl = result.data -// val apkUrl = "https://dl.dropboxusercontent.com/s/fi/1c3nn7t0co431hicl3hrt/app-debug.apk?rlkey=e4uf13ty1dpcked614vy1aaqp&dl=0" +// val apkUrl = result.data + val apkUrl = "https://dl.dropboxusercontent.com/s/fi/1c3nn7t0co431hicl3hrt/app-debug.apk?rlkey=e4uf13ty1dpcked614vy1aaqp&dl=0" initiateUpdate(apkUrl.toString()) Log.d("ApI", "APK URL: $apkUrl") Toast.makeText( diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt index ad16acc..a118fd0 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt @@ -52,6 +52,7 @@ class HomeFragment : Fragment() { private val viewModel: TestRightViewModel by activityViewModels() private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels() private lateinit var rvAdapter: UserListAdapter + private lateinit var sharedPreferences: SharedPreferences private var batLevel: Int = 0 // Initialize with a default value, or obtain the actual battery level private lateinit var adapter: OfflineUserListAdapter @@ -240,6 +241,8 @@ class HomeFragment : Fragment() { with(sharedPreference.edit()) { putString(Constants.ACCESS_TOKEN, response.data.data?.accessToken) putString(Constants.NATS_TOKEN, response.data.data?.deviceUser?.natsToken) + putString(Constants.DEVICE_ID, response.data.data?.deviceUser?.deviceId?.toString()) + apply() } } @@ -264,7 +267,7 @@ class HomeFragment : Fragment() { private fun createDeviceRequestData(): DeviceUpdateRequest { return DeviceUpdateRequest( - serial_no = Constants.serialNumber + serial_no = Constants.DEVICE_ID ) } diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt index 706b4c5..19158ec 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt @@ -34,6 +34,7 @@ import com.example.hpostesting.data.model.updates.DeviceUpdateRequest import com.example.hpostesting.data.repository.DatabaseRepository import com.example.hpostesting.data.repository.Repository import com.example.hpostesting.domain.LogFileManager +import com.example.hpostesting.presentation.hemocube.HemoCubeFragmentDirections.Companion import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import okhttp3.MediaType.Companion.toMediaTypeOrNull