This commit is contained in:
tzw
2024-01-23 15:30:45 +06:30
17 changed files with 323 additions and 490 deletions

1
.gitignore vendored
View File

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

View File

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

View File

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

View File

@@ -33,6 +33,9 @@ import 'package:provider/provider.dart';
import 'pages/delivery/model/delivery_model.dart'; import 'pages/delivery/model/delivery_model.dart';
class App extends StatefulWidget { class App extends StatefulWidget {
final String title;
const App({super.key, required this.title});
@override @override
_AppState createState() => _AppState(); _AppState createState() => _AppState();
} }
@@ -136,22 +139,8 @@ class _AppState extends State<App> {
builder: (context, value, child) { builder: (context, value, child) {
return CupertinoApp( return CupertinoApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
title: 'FCS', theme: CupertinoThemeData(),
// theme: CupertinoThemeData( title: widget.title,
// textTheme: CupertinoTextThemeData(
// navActionTextStyle: TextStyle(color: Colors.white),
// navTitleTextStyle: TextStyle(
// color: Colors.white,
// fontSize: value.isEng ? 20 : 18,
// fontWeight: FontWeight.w600),
// navLargeTitleTextStyle: TextStyle(
// color: Colors.white,
// fontSize: value.isEng ? 40 : 24,
// fontWeight: FontWeight.w600),
// primaryColor: primaryColor,
// textStyle: TextStyle(color: Colors.white),
// actionTextStyle: TextStyle(color: Colors.white),
// )),
routes: route(context), routes: route(context),
localizationsDelegates: [ localizationsDelegates: [
_newLocaleDelegate, _newLocaleDelegate,

View File

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

View File

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

View File

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

View File

@@ -20,5 +20,5 @@ Future<void> main() async {
reportProjectID: "fcs-dev", reportProjectID: "fcs-dev",
bucketName: "gs://fcs-dev1-us", bucketName: "gs://fcs-dev1-us",
level: Level.ALL); level: Level.ALL);
runApp(App()); runApp(App(title:"FCS - Dev"));
} }

View File

@@ -14,5 +14,5 @@ void main() {
apiURL: "http://192.168.1.155:7777", apiURL: "http://192.168.1.155:7777",
bucketName: "gs://fcs-dev1-us", bucketName: "gs://fcs-dev1-us",
level: Level.ALL); level: Level.ALL);
runApp(App()); runApp(App(title: "FCS - Dev local",));
} }

View File

@@ -14,5 +14,5 @@ void main() {
reportProjectID: "fcs-prod", reportProjectID: "fcs-prod",
bucketName: "gs://fcs-prod1", bucketName: "gs://fcs-prod1",
level: Level.ALL); level: Level.ALL);
runApp(App()); runApp(App(title:"FCS"));
} }

View File

@@ -1,113 +0,0 @@
import 'package:flutter/material.dart';
void main() {
runApp(MyApp());
}
class MyApp extends StatelessWidget {
// This widget is the root of your application.
@override
Widget build(BuildContext context) {
return MaterialApp(
title: 'Flutter Demo',
theme: ThemeData(
// This is the theme of your application.
//
// Try running your application with "flutter run". You'll see the
// application has a blue toolbar. Then, without quitting the app, try
// changing the primarySwatch below to Colors.green and then invoke
// "hot reload" (press "r" in the console where you ran "flutter run",
// or simply save your changes to "hot reload" in a Flutter IDE).
// Notice that the counter didn't reset back to zero; the application
// is not restarted.
primarySwatch: Colors.blue,
),
home: MyHomePage(title: 'Flutter Demo Home Page'),
);
}
}
class MyHomePage extends StatefulWidget {
MyHomePage({Key? key, required this.title}) : super(key: key);
// This widget is the home page of your application. It is stateful, meaning
// that it has a State object (defined below) that contains fields that affect
// how it looks.
// This class is the configuration for the state. It holds the values (in this
// case the title) provided by the parent (in this case the App widget) and
// used by the build method of the State. Fields in a Widget subclass are
// always marked "final".
final String title;
@override
_MyHomePageState createState() => _MyHomePageState();
}
class _MyHomePageState extends State<MyHomePage> {
int _counter = 0;
void _incrementCounter() {
setState(() {
// This call to setState tells the Flutter framework that something has
// changed in this State, which causes it to rerun the build method below
// so that the display can reflect the updated values. If we changed
// _counter without calling setState(), then the build method would not be
// called again, and so nothing would appear to happen.
_counter++;
});
}
@override
Widget build(BuildContext context) {
// This method is rerun every time setState is called, for instance as done
// by the _incrementCounter method above.
//
// The Flutter framework has been optimized to make rerunning build methods
// fast, so that you can just rebuild anything that needs updating rather
// than having to individually change instances of widgets.
return Scaffold(
appBar: AppBar(
// Here we take the value from the MyHomePage object that was created by
// the App.build method, and use it to set our appbar title.
title: Text(widget.title),
),
body: Center(
// Center is a layout widget. It takes a single child and positions it
// in the middle of the parent.
child: Column(
// Column is also a layout widget. It takes a list of children and
// arranges them vertically. By default, it sizes itself to fit its
// children horizontally, and tries to be as tall as its parent.
//
// Invoke "debug painting" (press "p" in the console, choose the
// "Toggle Debug Paint" action from the Flutter Inspector in Android
// Studio, or the "Toggle Debug Paint" command in Visual Studio Code)
// to see the wireframe for each widget.
//
// Column has various properties to control how it sizes itself and
// how it positions its children. Here we use mainAxisAlignment to
// center the children vertically; the main axis here is the vertical
// axis because Columns are vertical (the cross axis would be
// horizontal).
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(
'You have pushed the button this many times:',
),
Text(
'$_counter',
style: Theme.of(context).textTheme.headline4,
),
],
),
),
floatingActionButton: FloatingActionButton(
onPressed: _incrementCounter,
tooltip: 'Increment',
child: Icon(Icons.add),
), // This trailing comma makes auto-formatting nicer for build methods.
);
}
}

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -1,30 +0,0 @@
// This is a basic Flutter widget test.
//
// To perform an interaction with a widget in your test, use the WidgetTester
// utility that Flutter provides. For example, you can send tap and scroll
// gestures. You can also use WidgetTester to find child widgets in the widget
// tree, read text, and verify that the values of widget properties are correct.
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:fcs/main.dart';
void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async {
// Build our app and trigger a frame.
await tester.pumpWidget(MyApp());
// Verify that our counter starts at 0.
expect(find.text('0'), findsOneWidget);
expect(find.text('1'), findsNothing);
// Tap the '+' icon and trigger a frame.
await tester.tap(find.byIcon(Icons.add));
await tester.pump();
// Verify that our counter has incremented.
expect(find.text('0'), findsNothing);
expect(find.text('1'), findsOneWidget);
});
}