Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] 에러 수정 ( 작업중) #110

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions lib/modules/payment/view/payment_detail_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,24 @@ class PaymentDetailScreen extends GetView<PaymentDetailController> {
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),
),
),
);
Expand Down
4 changes: 2 additions & 2 deletions lib/provider/api/payment_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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]),
Expand Down
10 changes: 6 additions & 4 deletions lib/util/method/dynamic_link.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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});
}
}
Expand Down
26 changes: 13 additions & 13 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"