From 7c157b8a357000ccb79c7f0aba549c8ec852daa5 Mon Sep 17 00:00:00 2001 From: S-6203-ATLED Date: Tue, 10 May 2022 16:01:07 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#77=20QR=E3=82=B3=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AE=E8=AA=AD=E3=81=BF=E5=8F=96=E3=82=8B=E3=82=AD=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E3=80=81mobile=5Fsystem=5Furl?= =?UTF-8?q?=E3=81=8C=E8=AA=AD=E3=81=BF=E5=8F=96=E3=82=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=ABsystem=5Furl=E3=82=92=E8=AA=AD?= =?UTF-8?q?=E3=81=BF=E5=8F=96=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jp/atled/agileworks/view/ui/login/LoginQr.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt index 4104990e..481649fc 100644 --- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt +++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt @@ -7,7 +7,8 @@ import com.squareup.moshi.Moshi @JsonClass(generateAdapter= true) data class Qr ( - @field:Json(name = "system_url") val url: String + @field:Json(name = "system_url") val system_url: String, + @field:Json(name = "mobile_system_url") val mobile_system_url: String ) object LoginQr { @@ -17,7 +18,12 @@ object LoginQr { .build().adapter(Qr::class.java) return try { val qr = adapter.fromJson(json) - qr?.url + if(qr?.mobile_system_url.isNullOrEmpty()){ + qr?.system_url + } + else { + qr?.mobile_system_url + } } catch (e: Exception) { val m = Throwable().stackTrace[0] Log.e("Qr json parse: ", "${m}: ${e}") -- GitLab From 53f5fd9992439a0b133a20c103a8b92906170d87 Mon Sep 17 00:00:00 2001 From: S-6203-ATLED Date: Tue, 10 May 2022 16:56:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#77=20QR=E3=82=B3=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AE=E8=AA=AD=E3=81=BF=E5=8F=96=E3=82=8B=E3=82=AD=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E3=80=81mobile=5Fsystem=5Furl?= =?UTF-8?q?=E3=81=8C=E8=AA=AD=E3=81=BF=E5=8F=96=E3=82=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=ABsystem=5Furl=E3=82=92=E8=AA=AD?= =?UTF-8?q?=E3=81=BF=E5=8F=96=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt index 481649fc..846e256c 100644 --- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt +++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginQr.kt @@ -18,10 +18,9 @@ object LoginQr { .build().adapter(Qr::class.java) return try { val qr = adapter.fromJson(json) - if(qr?.mobile_system_url.isNullOrEmpty()){ + if(qr?.mobile_system_url.isNullOrEmpty()) { qr?.system_url - } - else { + } else { qr?.mobile_system_url } } catch (e: Exception) { -- GitLab