Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

ERM Channel updates

Browse Source
pull/4/head
haroon amjad 2 years ago
parent 59116b700a
commit 1a8db3b0ee
4 changed files with 65 additions and 46 deletions
Show Stats Download Patch File Download Diff File

2
android/build.gradle
Unescape Escape View File

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlin_version = '1.6.0' ext.kotlin_version = '1.7.20'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()

6
lib/api/dashboard_api_client.dart
Unescape Escape View File

@ -201,13 +201,15 @@ class DashboardApiClient {
}, url, postParams); }, url, postParams);
} }
Future setAdvertisementViewed(String masterID, int advertisementId) async { Future setAdvertisementViewed(String masterID, int advertisementId, String ackValue) async {
String url = "${ApiConsts.cocRest}Mohemm_ITG_UpdateAdvertisementAsViewed"; String url = "${ApiConsts.cocRest}Mohemm_ITG_UpdateAdvertisementAsViewed";
Map<String, dynamic> postParams = { Map<String, dynamic> postParams = {
"ItgNotificationMasterId": masterID, "ItgNotificationMasterId": masterID,
"EmployeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER.toString(), "EmployeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER.toString(),
"ItgAdvertisement": {"advertisementId": advertisementId, "acknowledgment": true} //Mobile Id "ItgAdvertisementId": advertisementId,
"ItgAcknowledgment": ackValue,
// "ItgAdvertisement": {"ItgAdvertisementId": advertisementId, "ItgAcknowledgment": ackValue} //Mobile Id
}; };
postParams.addAll(AppState().postParamsJson); postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject((json) { return await ApiClient().postJsonForObject((json) {

9
lib/models/itg/advertisement.dart
Unescape Escape View File

@ -10,6 +10,9 @@ class Advertisement {
this.pageSize, this.pageSize,
this.pageNo, this.pageNo,
this.languageId, this.languageId,
this.isOptional,
this.skipButtonTextEn,
this.skipButtonTextAr,
}); });
final int? advertisementId; final int? advertisementId;
@ -22,6 +25,9 @@ class Advertisement {
final dynamic pageSize; final dynamic pageSize;
final dynamic pageNo; final dynamic pageNo;
final dynamic languageId; final dynamic languageId;
final bool? isOptional;
final String? skipButtonTextEn;
final String? skipButtonTextAr;
factory Advertisement.fromJson(Map<String, dynamic> json) => Advertisement( factory Advertisement.fromJson(Map<String, dynamic> json) => Advertisement(
advertisementId: json["advertisementId"] == null ? null : json["advertisementId"], advertisementId: json["advertisementId"] == null ? null : json["advertisementId"],
@ -34,6 +40,9 @@ class Advertisement {
pageSize: json["pageSize"], pageSize: json["pageSize"],
pageNo: json["pageNo"], pageNo: json["pageNo"],
languageId: json["languageId"], languageId: json["languageId"],
isOptional: json["isOptional"] == null ? null : json["isOptional"],
skipButtonTextEn: json["skipBtnTextEn"] == null ? null : json["skipBtnTextEn"],
skipButtonTextAr: json["skipBtnTextAr"] == null ? null : json["skipBtnTextAr"],
); );
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() => {

94
lib/ui/landing/itg/its_add_screen_video_image.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_countdown_timer/index.dart'; import 'package:flutter_countdown_timer/index.dart';
import 'package:lottie/lottie.dart'; import 'package:lottie/lottie.dart';
import 'package:mohem_flutter_app/api/dashboard_api_client.dart'; import 'package:mohem_flutter_app/api/dashboard_api_client.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/lottie_consts.dart'; import 'package:mohem_flutter_app/classes/lottie_consts.dart';
import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/classes/utils.dart';
@ -15,6 +16,7 @@ import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/main.dart'; import 'package:mohem_flutter_app/main.dart';
import 'package:mohem_flutter_app/models/itg/advertisement.dart' as ads; import 'package:mohem_flutter_app/models/itg/advertisement.dart' as ads;
import 'package:mohem_flutter_app/widgets/button/default_button.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:video_player/video_player.dart'; import 'package:video_player/video_player.dart';
@ -86,11 +88,6 @@ class _ITGAdsScreenState extends State<ITGAdsScreen> {
Future<VideoPlayerController> createVideoPlayer(String encodedBytes) async { Future<VideoPlayerController> createVideoPlayer(String encodedBytes) async {
try { try {
// Uint8List decodedBytes = base64Decode(encodedBytes.split("base64,").last);
// Directory appDocumentsDirectory = await getApplicationDocumentsDirectory(); // 1
// File file = Io.File("${appDocumentsDirectory.path}/myAdsVideo.mp4");
// file.writeAsBytesSync(decodedBytes);
// VideoPlayerController controller = VideoPlayerController.file(file);
VideoPlayerController controller = VideoPlayerController.network(advertisementData!.viewAttachFileColl!.first.base64String!); VideoPlayerController controller = VideoPlayerController.network(advertisementData!.viewAttachFileColl!.first.base64String!);
await controller.initialize(); await controller.initialize();
await controller.play(); await controller.play();
@ -113,8 +110,6 @@ class _ITGAdsScreenState extends State<ITGAdsScreen> {
@override @override
void dispose() { void dispose() {
if (_controller != null) _controller.dispose(); if (_controller != null) _controller.dispose();
// player.stop();
// player.dispose();
super.dispose(); super.dispose();
} }
@ -158,41 +153,54 @@ class _ITGAdsScreenState extends State<ITGAdsScreen> {
), ),
50.height, 50.height,
ValueListenableBuilder<bool>( ValueListenableBuilder<bool>(
valueListenable: hasTimerEnded, valueListenable: hasTimerEnded,
builder: (context, val, child) { builder: (context, val, child) {
if (hasTimerEndedBool) { if (hasTimerEndedBool) {
return Container( return Row(
padding: const EdgeInsets.all(16), decoration: Utils.containerRadius(MyColors.white, 10), child: const Icon(Icons.thumb_up, color: MyColors.gradiantEndColor)) mainAxisAlignment: MainAxisAlignment.center,
.onPress(() { children: [
try { Container(
DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!).then((value) { padding: const EdgeInsets.all(16), decoration: Utils.containerRadius(MyColors.white, 10), child: const Icon(Icons.thumb_up, color: MyColors.gradiantEndColor))
logger.d(value); .onPress(() {
try {
Navigator.pop(context); Navigator.pop(context);
}); DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Like").then((value) {
} catch (ex) { logger.d(value);
logger.wtf(ex); });
Utils.handleException(ex, context, null); } catch (ex) {
} logger.wtf(ex);
}); Utils.handleException(ex, context, null);
} else { }
return Container(); }),
} 20.width,
}), Container(
padding: const EdgeInsets.all(16), decoration: Utils.containerRadius(MyColors.white, 10), child: const Icon(Icons.thumb_down, color: MyColors.gradiantEndColor))
// DefaultButton(LocaleKeys.home.tr(), () async { .onPress(() {
// DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!).then((value) { try {
// logger.d(value); Navigator.pop(context);
// }); DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Dislike").then((value) {
// }).paddingOnly(left: 50, right: 50) logger.d(value);
});
// ElevatedButton( } catch (ex) {
// onPressed: () async { logger.wtf(ex);
// // DashboardApiClient().setAdvertisementViewed(widget.addMasterId, widget.advertisement!.advertisementId!).then((value) { Utils.handleException(ex, context, null);
// // logger.d(value); }
// // }); }),
// }, ],
// child: const Text("Go To Dashboard"), );
// ) } else {
return Container();
}
},
),
20.height,
if (advertisementData?.isOptional ?? false)
DefaultButton(AppState().isArabic(context) ? advertisementData?.skipButtonTextAr ?? "Skip" : advertisementData?.skipButtonTextEn ?? "Skip", () async {
Navigator.pop(context);
DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Skip").then((value) {
logger.d(value);
});
}).paddingOnly(left: 100, right: 100)
], ],
); );
} else { } else {
@ -212,9 +220,9 @@ class _ITGAdsScreenState extends State<ITGAdsScreen> {
Container(padding: const EdgeInsets.all(16), decoration: Utils.containerRadius(MyColors.white, 10), child: const Icon(Icons.thumb_up, color: MyColors.gradiantEndColor)).onPress( Container(padding: const EdgeInsets.all(16), decoration: Utils.containerRadius(MyColors.white, 10), child: const Icon(Icons.thumb_up, color: MyColors.gradiantEndColor)).onPress(
() { () {
try { try {
DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!).then((value) { Navigator.pop(context);
DashboardApiClient().setAdvertisementViewed(masterID!, advertisementData!.advertisementId!, "Like").then((value) {
logger.d(value); logger.d(value);
Navigator.pop(context);
}); });
} catch (ex) { } catch (ex) {
logger.wtf(ex); logger.wtf(ex);

Write Preview
Loading…
Cancel
Save