From fdd23543208276479fdad99e6350edbcb1b50505 Mon Sep 17 00:00:00 2001 From: PGAN-MIS Date: Mon, 25 Sep 2023 09:43:03 +0800 Subject: [PATCH] commit before upgrade --- lib/bloc/user/user_bloc.dart | 2 -- lib/model/login_data/version_info.dart | 8 ++++---- .../login/components/update_required.dart | 4 ++-- lib/screens/unit2/login/login.dart | 4 ++-- lib/utils/global.dart | 12 ++++++++++++ lib/utils/request.dart | 1 - lib/utils/urls.dart | 4 ++-- pubspec.lock | 18 +----------------- pubspec.yaml | 8 ++++---- 9 files changed, 27 insertions(+), 34 deletions(-) diff --git a/lib/bloc/user/user_bloc.dart b/lib/bloc/user/user_bloc.dart index 475b451..3c80c9c 100644 --- a/lib/bloc/user/user_bloc.dart +++ b/lib/bloc/user/user_bloc.dart @@ -40,8 +40,6 @@ class UserBloc extends Bloc { final String? saved = CREDENTIALS?.get('saved'); username = CREDENTIALS?.get('username'); password = CREDENTIALS?.get('password'); - print(username); - print(password); if (saved != null) { save = true; add(UserLogin(username: username, password: password)); diff --git a/lib/model/login_data/version_info.dart b/lib/model/login_data/version_info.dart index 12ae4fb..fcd00fe 100644 --- a/lib/model/login_data/version_info.dart +++ b/lib/model/login_data/version_info.dart @@ -1,6 +1,6 @@ class VersionInfo { VersionInfo({ - this.version, + this.id, this.versionInfo, this.dateReleased, this.development, @@ -11,7 +11,7 @@ class VersionInfo { this.x8664DownloadUrl, }); - String? version; + String? id; String? versionInfo; DateTime? dateReleased; bool? development; @@ -22,7 +22,7 @@ class VersionInfo { String? x8664DownloadUrl; factory VersionInfo.fromJson(Map json) => VersionInfo( - version: json["version"], + id: json["id"], versionInfo: json["version_info"], dateReleased: DateTime.parse(json["date_released"]), development: json["development"], @@ -34,7 +34,7 @@ class VersionInfo { ); Map toJson() => { - "version": version, + "version": id, "version_info": versionInfo, "date_released": "${dateReleased!.year.toString().padLeft(4, '0')}-${dateReleased!.month.toString().padLeft(2, '0')}-${dateReleased!.day.toString().padLeft(2, '0')}", diff --git a/lib/screens/unit2/login/components/update_required.dart b/lib/screens/unit2/login/components/update_required.dart index a5ae6b0..0051a7e 100644 --- a/lib/screens/unit2/login/components/update_required.dart +++ b/lib/screens/unit2/login/components/update_required.dart @@ -168,9 +168,9 @@ class _UpdateState extends State { Future openFile() async { try { final filePath = await downloadFile(); - await openAPK(filePath); + await OpenFile.open(filePath); } catch (e) { - print(e.toString()); + throw e.toString(); } } diff --git a/lib/screens/unit2/login/login.dart b/lib/screens/unit2/login/login.dart index d11a2f4..d994c0f 100644 --- a/lib/screens/unit2/login/login.dart +++ b/lib/screens/unit2/login/login.dart @@ -108,7 +108,7 @@ class _UniT2LoginState extends State { }, builder: (context, state) { if (state is VersionLoaded) { return Builder(builder: (context) { - if (state.versionInfo?.version != state.apkVersion) { + if (state.versionInfo?.id == state.apkVersion) { return SizedBox( child: SingleChildScrollView( child: Stack( @@ -355,7 +355,7 @@ class _UniT2LoginState extends State { //New update available return Update( apkVersion: state.apkVersion!, - currenVersion: state.versionInfo!.version!, + currenVersion: state.versionInfo!.id!, ); } }); diff --git a/lib/utils/global.dart b/lib/utils/global.dart index adb63a6..481f7b9 100644 --- a/lib/utils/global.dart +++ b/lib/utils/global.dart @@ -20,6 +20,18 @@ const xClientSecret = "unitcYqAN7GGalyz"; String? globalSex; Profile? globalCurrentProfile; + +const String urlDownloadArmeabiv7aAPK = + "https://agusandelnorte.gov.ph/media/public/transparency/downloadables/UniT-App/v1.0.1/beta/unit_app_v1_0_1_beta_armeabi-v7a-release.apk?download"; + +const String urlDownloadX8664APK = +"https://agusandelnorte.gov.ph/media/public/transparency/downloadables/UniT-App/v1.0.1/beta/unit_app_v1_0_1_beta_x86_64-release.apk?download"; + +const String urlDownloadarm64v8aAPK = + "https://agusandelnorte.gov.ph/media/public/transparency/downloadables/UniT-App/v1.0.1/beta/unit_app_v1_0_1_beta_arm64-v8a-release.apk?download"; + + + //// hive boxes Box? CREDENTIALS; Box? SOS; \ No newline at end of file diff --git a/lib/utils/request.dart b/lib/utils/request.dart index 562a9fb..4a5345f 100644 --- a/lib/utils/request.dart +++ b/lib/utils/request.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:fluttertoast/fluttertoast.dart'; import 'package:http/http.dart'; import 'package:unit2/utils/text_container.dart'; import 'package:unit2/utils/urls.dart'; diff --git a/lib/utils/urls.dart b/lib/utils/urls.dart index 544a406..239fef0 100644 --- a/lib/utils/urls.dart +++ b/lib/utils/urls.dart @@ -5,8 +5,8 @@ class Url { String host() { // return '192.168.10.183:3000'; - return 'agusandelnorte.gov.ph'; - // return "192.168.10.219:3000"; + // return 'agusandelnorte.gov.ph'; + return "192.168.10.219:3000"; // return "192.168.10.241"; // return "192.168.10.221:3004"; // return "playweb.agusandelnorte.gov.ph"; diff --git a/pubspec.lock b/pubspec.lock index 3d36c10..85e7c78 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -25,14 +25,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" - animated_splash_screen: - dependency: "direct main" - description: - name: animated_splash_screen - sha256: f45634db6ec4e8cf034c53e03f3bd83898a16fe3c9286bf5510b6831dfcf2124 - url: "https://pub.dev" - source: hosted - version: "1.3.0" app_popup_menu: dependency: "direct main" description: @@ -981,14 +973,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.1" - page_transition: - dependency: transitive - description: - name: page_transition - sha256: dee976b1f23de9bbef5cd512fe567e9f6278caee11f5eaca9a2115c19dc49ef6 - url: "https://pub.dev" - source: hosted - version: "2.1.0" path: dependency: transitive description: @@ -1603,7 +1587,7 @@ packages: source: hosted version: "6.1.11" url_launcher_android: - dependency: "direct main" + dependency: transitive description: name: url_launcher_android sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330 diff --git a/pubspec.yaml b/pubspec.yaml index 167b593..e5f798d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -79,7 +79,7 @@ dependencies: platform_device_id: ^1.0.1 multi_dropdown: ^1.0.9 searchable_paginated_dropdown: ^1.2.0 - audioplayers: ^4.1.0 + audioplayers: ^5.1.0 assets_audio_player: ^3.0.6 flutter_speed_dial: ^6.2.0 im_stepper: ^1.0.1+1 @@ -93,11 +93,11 @@ dependencies: file_picker: ^5.3.1 expandable: ^5.0.1 flutter_simple_treeview: ^3.0.2 - syncfusion_flutter_pdfviewer: ^21.2.3 + syncfusion_flutter_pdfviewer: ^23.1.36 url_launcher: ^6.1.11 - url_launcher_android: ^6.0.38 share_plus: ^7.1.0 - animated_splash_screen: ^1.3.0 + device_info_plus: ^9.0.3 + better_open_file: ^3.6.4 dependency_overrides: intl: ^0.18.0