sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade packages

Browse Source
This commit is contained in:
sainw
2024-01-23 14:35:09 +06:30
parent e99689a10d
commit dde24bb248
10 changed files with 752 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -54,3 +54,4 @@ android/app/src/prod/res/values/strings.xml
.gradle/buildOutputCleanup/buildOutputCleanup.lock
.gradle/buildOutputCleanup/cache.properties
.gradle/vcs-1/gc.properties
android/key.keystore

4
android/app/src/dev/AndroidManifest.xml
View File

@@ -8,7 +8,8 @@
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<application
android:name=".Application"
android:name=".Application"
android:exported="true"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher">
<activity
@@ -16,6 +17,7 @@
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:hardwareAccelerated="true"
android:exported="true"
android:windowSoftInputMode="adjustResize">
<!-- This keeps the window background of the activity showing
until Flutter renders its first frame. It can be removed if

2
android/app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mokkon.fcs.fcs">
<application
android:exported="true"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
@@ -8,6 +9,7 @@
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:exported="true"
android:windowSoftInputMode="adjustResize">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user

4
lib/config.dart
View File

@@ -27,8 +27,8 @@ class Config {
required String reportURL,
required String reportProjectID,
required String bucketName,
Color color: Colors.blue,
Level level: Level.SEVERE}) {
Color color= Colors.blue,
Level level= Level.SEVERE}) {
_instance = Config._internal(flavor, FlavorNames[flavor.index], color,
apiURL, reportURL, level, reportProjectID, bucketName);

23
lib/helpers/api_helper.dart
View File

@@ -2,7 +2,7 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:device_info/device_info.dart';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:dio/dio.dart';
import 'package:fcs/domain/vo/status.dart';
import 'package:logging/logging.dart';
@@ -65,7 +65,7 @@ Future<dynamic> requestDownloadAPI(String path, method,
DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
String deviceName = "${androidInfo.model}(${androidInfo.id})";
log.info("device:${androidInfo.androidId},deviceName:$deviceName");
log.info("device:${androidInfo.id},deviceName:$deviceName");
var bytes = utf8.encode(payload);
var base64Str = base64.encode(bytes);
@@ -84,9 +84,8 @@ Future<dynamic> requestDownloadAPI(String path, method,
if (token != null) {
request.headers.set("Token", token);
}
if (androidInfo.androidId != null) {
request.headers.set("Device", androidInfo.androidId + ":" + deviceName);
}
request.headers.set("Device", androidInfo.id + ":" + deviceName);
request.headers.set("payload", escapePayload);
var response = await request.close();
print("headers:${response.headers}");
@@ -107,7 +106,7 @@ Future<dynamic> requestDownloadPDFAPI(String path, method,
DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
String deviceName = "${androidInfo.model}(${androidInfo.id})";
log.info("device:${androidInfo.androidId},deviceName:$deviceName");
log.info("device:${androidInfo.id},deviceName:$deviceName");
var bytes = utf8.encode(payload);
var base64Str = base64.encode(bytes);
@@ -124,9 +123,8 @@ Future<dynamic> requestDownloadPDFAPI(String path, method,
if (token != null) {
request.headers.set("Token", token);
}
if (androidInfo.androidId != null) {
request.headers.set("Device", androidInfo.androidId + ":" + deviceName);
}
request.headers.set("Device", androidInfo.id + ":" + deviceName);
request.headers.set("payload", escapePayload);
var response = await request.close();
print("headers:${response.headers}");
@@ -157,7 +155,7 @@ Future<dynamic> requestDownload(String path, method,
DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
String deviceName = "${androidInfo.model}(${androidInfo.id})";
log.info("device:${androidInfo.androidId},deviceName:$deviceName");
log.info("device:${androidInfo.id},deviceName:$deviceName");
var bytes = utf8.encode(payload);
var base64Str = base64.encode(bytes);
@@ -173,9 +171,8 @@ Future<dynamic> requestDownload(String path, method,
if (token != null) {
request.headers.set("Token", token);
}
if (androidInfo.androidId != null) {
request.headers.set("Device", androidInfo.androidId + ":" + deviceName);
}
request.headers.set("Device", androidInfo.id + ":" + deviceName);
request.headers
.set(HttpHeaders.contentTypeHeader, 'application/json; charset=utf-8');
request.headers.set("payload", escapePayload);

5
lib/helpers/dev_info.dart
View File

@@ -1,6 +1,7 @@
import 'package:device_info/device_info.dart';
import 'dart:io' show Platform;
import 'package:device_info_plus/device_info_plus.dart';
class DevInfo {
bool? isAndroid;
bool? isIOS;
@@ -18,7 +19,7 @@ class DevInfo {
if (Platform.isAndroid) {
AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
_instance!.deviceID = androidInfo.androidId;
_instance!.deviceID = androidInfo.id;
_instance!.id = androidInfo.id;
_instance!.model = androidInfo.model;
} else if (Platform.isIOS) {

80
lib/pages/term/term_edit.dart
View File

@@ -9,7 +9,7 @@ import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:zefyrka/zefyrka.dart';
// import 'package:zefyrka/zefyrka.dart';
// import 'package:zefyr/zefyr.dart';
typedef void ProfileCallback();
@@ -23,8 +23,8 @@ class TermEdit extends StatefulWidget {
class _TermEditState extends State<TermEdit> {
/// Allows to control the editor and the document.
late ZefyrController _controllerEng;
late ZefyrController _controllerMm;
// late ZefyrController _controllerEng;
// late ZefyrController _controllerMm;
/// Zefyr editor like any other input field requires a focus node.
late FocusNode _focusNodeEng;
@@ -37,23 +37,23 @@ class _TermEditState extends State<TermEdit> {
_isLoading = false;
// Here we must load the document and pass it to Zefyr controller.
_controllerEng = ZefyrController(_loadDocument(widget.term!.termEng ?? ""));
_controllerMm = ZefyrController(_loadDocument(widget.term!.termMm ?? ""));
// _controllerEng = ZefyrController(_loadDocument(widget.term!.termEng ?? ""));
// _controllerMm = ZefyrController(_loadDocument(widget.term!.termMm ?? ""));
_focusNodeEng = FocusNode();
_focusNodeMm = FocusNode();
}
/// Loads the document to be edited in Zefyr.
NotusDocument _loadDocument(String data) {
late NotusDocument doc;
try {
doc = NotusDocument.fromJson(jsonDecode(data));
} catch (e) {}
if (doc == null) {
doc = NotusDocument();
}
return doc;
}
// NotusDocument _loadDocument(String data) {
// late NotusDocument doc;
// try {
// doc = NotusDocument.fromJson(jsonDecode(data));
// } catch (e) {}
// if (doc == null) {
// doc = NotusDocument();
// }
// return doc;
// }
@override
Widget build(BuildContext context) {
@@ -122,8 +122,8 @@ class _TermEditState extends State<TermEdit> {
height: MediaQuery.of(context).size.height - 200,
child: TabBarView(
children: [
textEditor(_controllerEng, _focusNodeEng),
textEditor(_controllerMm, _focusNodeMm),
// textEditor(_controllerEng, _focusNodeEng),
// textEditor(_controllerMm, _focusNodeMm),
],
),
),
@@ -135,24 +135,24 @@ class _TermEditState extends State<TermEdit> {
);
}
Widget textEditor(ZefyrController controller, FocusNode focusNode) {
return ListView(
children: [
Container(
height: MediaQuery.of(context).size.height - 200,
child: ZefyrEditor(
autofocus: false,
padding: EdgeInsets.all(16),
controller: controller,
focusNode: focusNode,
),
),
SizedBox(
height: 10,
)
],
);
}
// Widget textEditor(ZefyrController controller, FocusNode focusNode) {
// return ListView(
// children: [
// Container(
// height: MediaQuery.of(context).size.height - 200,
// child: ZefyrEditor(
// autofocus: false,
// padding: EdgeInsets.all(16),
// controller: controller,
// focusNode: focusNode,
// ),
// ),
// SizedBox(
// height: 10,
// )
// ],
// );
// }
_unfocus() {
FocusScope.of(context).unfocus();
@@ -163,11 +163,11 @@ class _TermEditState extends State<TermEdit> {
_isLoading = true;
});
try {
final contentsEng = jsonEncode(_controllerEng.document);
final contentsMm = jsonEncode(_controllerMm.document);
// print('contents => $contentsEng');
TermModel termModel = Provider.of<TermModel>(context, listen: false);
await termModel.saveTerm(Term(termEng: contentsEng, termMm: contentsMm));
// final contentsEng = jsonEncode(_controllerEng.document);
// final contentsMm = jsonEncode(_controllerMm.document);
// // print('contents => $contentsEng');
// TermModel termModel = Provider.of<TermModel>(context, listen: false);
// await termModel.saveTerm(Term(termEng: contentsEng, termMm: contentsMm));
} catch (e) {
showMsgDialog(context, "Error", e.toString());
} finally {

40
lib/pages/term/term_page.dart
View File

@@ -10,7 +10,7 @@ import 'package:fcs/pages/widgets/local_text.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:zefyrka/zefyrka.dart';
// import 'package:zefyrka/zefyrka.dart';
typedef void ProfileCallback();
@@ -23,9 +23,9 @@ class TermPage extends StatefulWidget {
}
class _TermPageState extends State<TermPage> {
late ZefyrController _controller;
// late ZefyrController _controller;
late FocusNode _focusNode;
late NotusDocument document = new NotusDocument();
// late NotusDocument document = new NotusDocument();
bool isLoading = false;
@override
@@ -34,18 +34,18 @@ class _TermPageState extends State<TermPage> {
_focusNode = FocusNode();
}
NotusDocument _loadDocument(Setting? setting) {
bool isEng = Provider.of<LanguageModel>(context).isEng;
String? term = isEng ? (setting!.termsEng ?? "") : (setting!.termsMm ?? "");
late NotusDocument doc;
try {
doc = NotusDocument.fromJson(jsonDecode(term));
} catch (e) {}
if (doc == null) {
doc = NotusDocument();
}
return doc;
}
// NotusDocument _loadDocument(Setting? setting) {
// bool isEng = Provider.of<LanguageModel>(context).isEng;
// String? term = isEng ? (setting!.termsEng ?? "") : (setting!.termsMm ?? "");
// late NotusDocument doc;
// try {
// doc = NotusDocument.fromJson(jsonDecode(term));
// } catch (e) {}
// if (doc == null) {
// doc = NotusDocument();
// }
// return doc;
// }
@override
Widget build(BuildContext context) {
@@ -85,11 +85,11 @@ class _TermPageState extends State<TermPage> {
]
: [],
),
body: ZefyrEditor(
padding: EdgeInsets.all(16),
controller: ZefyrController(_loadDocument(setting)),
focusNode: _focusNode,
),
// body: ZefyrEditor(
// padding: EdgeInsets.all(16),
// controller: ZefyrController(_loadDocument(setting)),
// focusNode: _focusNode,
// ),
);
}
}

1005
pubspec.lock
View File

File diff suppressed because it is too large Load Diff

8
pubspec.yaml
View File

@@ -4,7 +4,7 @@ publish_to: 'none'
version: 1.0.6+10
environment:
sdk: ">=2.12.0 <3.0.0"
sdk: '>=3.0.6 <4.0.0'
dependencies:
flutter:
@@ -34,11 +34,11 @@ dependencies:
font_awesome_flutter: ^10.6.0
photo_view: ^0.14.0
uuid: ^4.2.2
zefyrka: ^1.0.10
# zefyrka: ^1.0.10
path_provider: ^2.0.2
camera: ^0.10.5+8
url_launcher: ^6.0.9
device_info: ^2.0.2
device_info_plus: ^9.1.1
connectivity: ^3.0.6
logging: ^1.0.1
permission_handler: ^11.1.0
@@ -51,7 +51,7 @@ dependencies:
flutter_pdfview: ^1.2.1
flutter_local_notifications: ^16.3.0
share: ^2.0.4
cached_network_image: ^3.1.0
cached_network_image: ^3.3.1
flutter_cache_manager: ^3.1.2
flutter_vector_icons: ^2.0.0