From c3a2d4d3aa468effff543805996d65525ea27de5 Mon Sep 17 00:00:00 2001 From: kimwest00 Date: Fri, 22 Dec 2023 17:30:29 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20Obx=20=EC=9C=84=EC=A0=AF=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/view/payment_detail_view.dart | 40 +++++++++---------- lib/provider/api/payment_api.dart | 4 +- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/lib/modules/payment/view/payment_detail_view.dart b/lib/modules/payment/view/payment_detail_view.dart index 3d69376..5c58dd7 100644 --- a/lib/modules/payment/view/payment_detail_view.dart +++ b/lib/modules/payment/view/payment_detail_view.dart @@ -16,28 +16,24 @@ class PaymentDetailScreen extends GetView { appBar: CommonAppBar.basic("상세 정보"), body: Padding( padding: EdgeInsets.symmetric(horizontal: 20.w).copyWith(top: 30.h), - child: Column( - children: [ - Expanded( - child: ListView.separated( - shrinkWrap: true, - itemBuilder: ((context, index) { - return PaymentListTile( - pay: controller.payList[index], - ); - }), - separatorBuilder: ((context, index) { - return Padding( - padding: EdgeInsets.symmetric(vertical: 22.h), - child: Divider( - color: AppColors.divider1, - thickness: 1.h, - ), - ); - }), - itemCount: controller.payList.length), - ), - ], + child: Obx( + ()=> ListView.separated( + shrinkWrap: true, + itemBuilder: ((context, index) { + return PaymentListTile( + pay: controller.payList[index], + ); + }), + separatorBuilder: ((context, index) { + return Padding( + padding: EdgeInsets.symmetric(vertical: 22.h), + child: Divider( + color: AppColors.divider1, + thickness: 1.h, + ), + ); + }), + itemCount: controller.payList.length), ), ), ); diff --git a/lib/provider/api/payment_api.dart b/lib/provider/api/payment_api.dart index 81ac88f..7a10626 100644 --- a/lib/provider/api/payment_api.dart +++ b/lib/provider/api/payment_api.dart @@ -46,9 +46,9 @@ class PaymentApi { }) async { try { Response response = await DioServices().to().get( - "/donations/pay/${regularPayId}", + "/donations/pay/$regularPayId", ); - // logger.d(response.data); + logger.d(response.data); return List.generate( response.data[RESULT].length, (index) => Pay.fromJson(response.data[RESULT][index]), From 423f0344bf056bade152096f8c0138449cb92c90 Mon Sep 17 00:00:00 2001 From: kimwest00 Date: Thu, 28 Dec 2023 02:19:31 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:#109=20deeplink=20=ED=98=95=EC=8B=9D?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/util/method/dynamic_link.dart | 10 ++++++---- pubspec.lock | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/lib/util/method/dynamic_link.dart b/lib/util/method/dynamic_link.dart index db47a39..11e0204 100644 --- a/lib/util/method/dynamic_link.dart +++ b/lib/util/method/dynamic_link.dart @@ -36,7 +36,7 @@ class DynamicLink { required int id, }) async { final dynamicLinkParams = DynamicLinkParameters( - link: Uri.parse("$dynamicBase/$screenName?id=$id"), + link: Uri.parse("$dynamicBase/$screenName/$id"), uriPrefix: dynamicBase, androidParameters: const AndroidParameters(packageName: "com.dev.match"), iosParameters: const IOSParameters(bundleId: "com.dev.match"), @@ -59,12 +59,14 @@ class DynamicLink { } static void _redirectScreen(PendingDynamicLinkData dynamicLinkData) { - logger.e(dynamicLinkData); + logger.e(dynamicLinkData.link); String link = dynamicLinkData.link.path; - int id = int.parse(dynamicLinkData.link.queryParameters["id"] ?? "-1"); + // logger.e(link); + int id = int.tryParse(link.split('/').last)??-1; + // int id = int.parse(dynamicLinkData.link.path[0] ?? "-1"); if (link.contains("project")) { Get.toNamed(Routes.project, arguments: {"projectId": id}); - }else if(link.contains("flame")){ + } else if (link.contains("flame")) { Get.toNamed(Routes.burning_match, arguments: {"donationId": id}); } } diff --git a/pubspec.lock b/pubspec.lock index 51bdc91..d879548 100755 --- a/pubspec.lock +++ b/pubspec.lock @@ -189,10 +189,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" contained_tab_bar_view: dependency: "direct main" description: @@ -801,10 +801,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -1150,18 +1150,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -1206,10 +1206,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" timeline_tile_nic: dependency: "direct main" description: @@ -1374,10 +1374,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1451,5 +1451,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0"