From 65cb3afa04d68cb5b70a647208a14b75b5720a22 Mon Sep 17 00:00:00 2001 From: AKIRA TAKEDA Date: Tue, 22 Mar 2022 13:22:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=82=BF=E3=83=83=E3=83=97=E6=99=82=E3=81=AE?= =?UTF-8?q?=E9=81=B7=E7=A7=BB=E5=85=88URL=E4=BF=AE=E6=AD=A3(=E5=8B=95?= =?UTF-8?q?=E4=BD=9C=E7=A2=BA=E8=AA=8D=E6=9C=AA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agileworks/model/ApiApprovalResponse.kt | 3 +- .../jp/atled/agileworks/widget/AwAppWidget.kt | 3 +- .../widget/AwAppWidgetRemoteViewsFactory.kt | 33 ++++++++++--------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt b/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt index d0a3ea59..1cc81b00 100644 --- a/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt +++ b/app/src/main/java/jp/atled/agileworks/model/ApiApprovalResponse.kt @@ -15,6 +15,7 @@ data class ApprovalInfo( val count: Int ) { companion object { + // ToDo API修正待ち(通知メッセージは削除) // 通知メッセージ const val NOTIFICATION_MESSAGE = "MESSAGE" // 下書き @@ -29,7 +30,7 @@ data class ApprovalInfo( const val CHECK_REPORT = "CHECK_REPORT" // 督促あり const val DEMAND = "DEMAND" - // ToDo API修正待ち + // ToDo API修正待ち(回付予定) // 回付予定 //const val CIRCULATION = "CIRCULATION" // 共有した diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt index e0b19c0b..64bb29ec 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt @@ -106,6 +106,7 @@ class AwAppWidget : AwAppWidgetBase( R.layout.aw_app_widget, // 全種類 (明示的に指定しない設計にしたかったが、通信不能時にもサイズ決定したい都合上こうしている) arrayOf( + // ToDo API修正待ち(通知メッセージは削除) ApprovalInfo.NOTIFICATION_MESSAGE, ApprovalInfo.DRAFT, ApprovalInfo.REQUEST_APPLICATION, @@ -113,7 +114,7 @@ class AwAppWidget : AwAppWidgetBase( ApprovalInfo.REMAND, ApprovalInfo.CHECK_REPORT, ApprovalInfo.DEMAND, - // ToDo API修正待ち + // ToDo API修正待ち(回付予定) //ApprovalInfo.CIRCULATION, ApprovalInfo.SHARE, ApprovalInfo.SHARED)) diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt index 230d1036..ddc391db 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt @@ -173,30 +173,31 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent? } private fun getTransitionDestinationUrl(approvalInfoCode: String): String { - val baseUrl = AwApp.Baseurl() + "Broker/Mobile" + val baseUrl = AwApp.Baseurl() + "Broker/Mobile#docList_" val debugUrl = AwApp.Baseurl() + "Broker/Document" // ToDo 仮URL設定用 削除予定 // ToDo URL設定(エイトレッドさん検討中) // 仮URL設定(仕事画面に遷移する) when (approvalInfoCode) { + // ToDo API修正待ち(通知メッセージは削除) //ApprovalInfo.NOTIFICATION_MESSAGE -> {return "$baseUrl#" } // 通知メッセージ ApprovalInfo.NOTIFICATION_MESSAGE -> {return "$debugUrl?DocId=171" } // 通知メッセージ - ApprovalInfo.DRAFT -> {return "$baseUrl#work" } // 下書き - ApprovalInfo.REQUEST_APPLICATION -> {return "$baseUrl#agileWorksSearch" } // 申請依頼 - //ApprovalInfo.REQUEST_APPROVAL -> {return "$baseUrl#" } // 承認依頼 - ApprovalInfo.REQUEST_APPROVAL -> {return "$debugUrl?DocId=166" } // 承認依頼 - //ApprovalInfo.REMAND -> {return "$baseUrl#" } // 差戻し - ApprovalInfo.REMAND -> {return "$debugUrl?DocId=164" } // 差戻し - //ApprovalInfo.CHECK_REPORT -> {return "$baseUrl#" } // 報告確認 - ApprovalInfo.CHECK_REPORT -> {return "$debugUrl?DocId=167" } // 報告確認 - //ApprovalInfo.DEMAND -> {return "$baseUrl#" } // 督促あり - ApprovalInfo.DEMAND -> {return "$debugUrl?DocId=168" } // 督促あり + ApprovalInfo.DRAFT -> {return baseUrl + "Draft" } // 下書き + ApprovalInfo.REQUEST_APPLICATION -> {return baseUrl + "RequestApplication" } // 申請依頼 + ApprovalInfo.REQUEST_APPROVAL -> {return baseUrl + "RequestApproval" } // 承認依頼 + //ApprovalInfo.REQUEST_APPROVAL -> {return "$debugUrl?DocId=166" } // 承認依頼 + ApprovalInfo.REMAND -> {return baseUrl + "Remand" } // 差戻し + //ApprovalInfo.REMAND -> {return "$debugUrl?DocId=164" } // 差戻し + ApprovalInfo.CHECK_REPORT -> {return baseUrl + "CheckReport" } // 報告確認 + //ApprovalInfo.CHECK_REPORT -> {return "$debugUrl?DocId=167" } // 報告確認 + ApprovalInfo.DEMAND -> {return baseUrl + "HasDemand" } // 督促あり + //ApprovalInfo.DEMAND -> {return "$debugUrl?DocId=168" } // 督促あり // ToDo API修正待ち - //ApprovalInfo.CIRCULATION -> {return "$baseUrl#" } // 回付予定 - //ApprovalInfo.SHARE -> {return "$baseUrl#" } // 共有した - ApprovalInfo.SHARE -> {return "$debugUrl?DocId=169" } // 共有した - //ApprovalInfo.SHARED -> {return "$baseUrl#" } // 共有された - ApprovalInfo.SHARED -> {return "$debugUrl?DocId=170" } // 共有された + //ApprovalInfo.CIRCULATION -> {return baseUrl + "FuturePass" } // 回付予定 + ApprovalInfo.SHARE -> {return baseUrl + "Share" } // 共有した + //ApprovalInfo.SHARE -> {return "$debugUrl?DocId=169" } // 共有した + ApprovalInfo.SHARED -> {return baseUrl + "Shared" } // 共有された + //ApprovalInfo.SHARED -> {return "$debugUrl?DocId=170" } // 共有された else -> {return ""} } } -- GitLab From fb166af775921f72f8b4c064fa472ff65de4170c Mon Sep 17 00:00:00 2001 From: AKIRA TAKEDA Date: Wed, 23 Mar 2022 14:18:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E9=81=B7=E7=A7=BB=E5=85=88=E7=A2=BA?= =?UTF-8?q?=E8=AA=8D=20=E4=B8=8D=E8=A6=81=E3=82=B3=E3=83=BC=E3=83=89?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agileworks/widget/AwAppWidgetRemoteViewsFactory.kt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt index ddc391db..8e6eddb4 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt @@ -176,28 +176,19 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent? val baseUrl = AwApp.Baseurl() + "Broker/Mobile#docList_" val debugUrl = AwApp.Baseurl() + "Broker/Document" // ToDo 仮URL設定用 削除予定 - // ToDo URL設定(エイトレッドさん検討中) - // 仮URL設定(仕事画面に遷移する) when (approvalInfoCode) { // ToDo API修正待ち(通知メッセージは削除) - //ApprovalInfo.NOTIFICATION_MESSAGE -> {return "$baseUrl#" } // 通知メッセージ ApprovalInfo.NOTIFICATION_MESSAGE -> {return "$debugUrl?DocId=171" } // 通知メッセージ ApprovalInfo.DRAFT -> {return baseUrl + "Draft" } // 下書き ApprovalInfo.REQUEST_APPLICATION -> {return baseUrl + "RequestApplication" } // 申請依頼 ApprovalInfo.REQUEST_APPROVAL -> {return baseUrl + "RequestApproval" } // 承認依頼 - //ApprovalInfo.REQUEST_APPROVAL -> {return "$debugUrl?DocId=166" } // 承認依頼 ApprovalInfo.REMAND -> {return baseUrl + "Remand" } // 差戻し - //ApprovalInfo.REMAND -> {return "$debugUrl?DocId=164" } // 差戻し ApprovalInfo.CHECK_REPORT -> {return baseUrl + "CheckReport" } // 報告確認 - //ApprovalInfo.CHECK_REPORT -> {return "$debugUrl?DocId=167" } // 報告確認 ApprovalInfo.DEMAND -> {return baseUrl + "HasDemand" } // 督促あり - //ApprovalInfo.DEMAND -> {return "$debugUrl?DocId=168" } // 督促あり // ToDo API修正待ち //ApprovalInfo.CIRCULATION -> {return baseUrl + "FuturePass" } // 回付予定 ApprovalInfo.SHARE -> {return baseUrl + "Share" } // 共有した - //ApprovalInfo.SHARE -> {return "$debugUrl?DocId=169" } // 共有した ApprovalInfo.SHARED -> {return baseUrl + "Shared" } // 共有された - //ApprovalInfo.SHARED -> {return "$debugUrl?DocId=170" } // 共有された else -> {return ""} } } -- GitLab