yangyang 2 vuotta sitten
vanhempi
commit
aa63b93ac3

+ 8 - 2
lib/common/style/gsy_style.dart

@@ -164,8 +164,8 @@ class GSYConstant {
   );
 
   static const normalTextActionWhiteBold = TextStyle(
-    color: GSYColors.actionBlue,
-    fontSize: normalTextSize,
+    color: Colors.blue,
+    fontSize: middleTextWhiteSize,
     fontWeight: FontWeight.bold,
   );
 
@@ -174,6 +174,12 @@ class GSYConstant {
     fontSize: normalTextSize,
   );
 
+  static const smallTextLight = TextStyle(
+    color: GSYColors.primaryLightValue,
+    fontSize: smallTextSize,
+  );
+
+
   static const normalTextBigWhiteBold = TextStyle(
     color: GSYColors.actionBlue,
     fontSize: bigTextSize,

+ 3 - 2
lib/model/patrol_response_entity.dart

@@ -39,7 +39,7 @@ class PatrolJobDeviceData with JsonConvert<PatrolJobDeviceData>{
   late String deviceKey;
   late String itemCompleteTime;
   late String itemPerson;
-  PatrolJobDeviceData(this.name,this.showName,this.deviceKey,this.itemCompleteTime,this.itemPerson);
+  PatrolJobDeviceData(this.name,this.showName,this.deviceKey,this.itemCompleteTime,this.itemPerson,this.id);
 }
 
 class PatrolJobDetailData with JsonConvert<PatrolJobDetailData>{
@@ -61,7 +61,8 @@ class PatrolJobDetailData with JsonConvert<PatrolJobDetailData>{
 class PatrolJobItemData with JsonConvert<PatrolJobItemData>{
   late String name;
   late String result;
-  PatrolJobItemData(this.name,this.result);
+  late int id;
+  PatrolJobItemData(this.name,this.result,this.id);
 }
 
 class PatrolJobImageData with JsonConvert<PatrolJobImageData>{

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 355 - 156
lib/page/patrol/patrol_job_detail.dart