glglove 3 일 전
부모
커밋
7b909aaff7
5개의 변경된 파일26개의 추가작업 그리고 15개의 파일을 삭제
  1. 2 3
      app/android/app/build.gradle
  2. 8 5
      app/ios/Runner/Base.lproj/Main.storyboard
  3. 4 4
      app/ios/Runner/Info.plist
  4. 6 1
      app/lib/main.dart
  5. 6 2
      app/lib/modules/splash/splash_controller.dart

+ 2 - 3
app/android/app/build.gradle

@@ -43,7 +43,6 @@ android {
     }
 
     lintOptions {
-        // 如打包出现Failed to transform libs.jar to match attributes
         checkReleaseBuilds false
     }
 
@@ -51,8 +50,8 @@ android {
         applicationId "com.guadou.yyemployer"
         minSdkVersion 21
         targetSdkVersion 35
-        versionCode 306
-        versionName "3.0.6"
+        versionCode 307
+        versionName "3.0.7"
 
         multiDexEnabled true
 

+ 8 - 5
app/ios/Runner/Base.lproj/Main.storyboard

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Flutter View Controller-->
@@ -14,13 +16,14 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="-26" y="-76"/>
         </scene>
     </scenes>
 </document>

+ 4 - 4
app/ios/Runner/Info.plist

@@ -22,8 +22,6 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>&quot;YY Employers&quot; wants to access your Microphone to sign in or sign out</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -75,10 +73,12 @@
 	<string>YY Employers needs your location to recommend nearby jobs</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>YY Employers needs your location to recommend nearby jobs.</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>"YY Employers" wants to access your Microphone to sign in or sign out</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>&quot;YY Employers&quot; wants to access your photos for image upload, image saving and other functions.</string>
+	<string>"YY Employers" wants to access your photos for image upload, image saving and other functions.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>&quot;YY Employers&quot; wants to access your photos for image upload, image saving and other functions.</string>
+	<string>"YY Employers" wants to access your photos for image upload, image saving and other functions.</string>
 	<key>NSUserTrackingUsageDescription</key>
 	<string>This identifier will be used to deliver personalized job to you.</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>

+ 6 - 1
app/lib/main.dart

@@ -6,6 +6,8 @@ import 'package:cpt_nl/router/nl_router.dart';
 import 'package:cpt_nl/router/nl_service_impl.dart';
 import 'package:cpt_sg/router/sg_router.dart';
 import 'package:cpt_sg/router/sg_service_impl.dart';
+import 'package:cpt_th/router/th_router.dart';
+import 'package:cpt_th/router/th_service_impl.dart';
 import 'package:cpt_uk/router/uk_router.dart';
 import 'package:cpt_vn/router/vn_router.dart';
 import 'package:cpt_uk/router/uk_service_impl.dart';
@@ -19,6 +21,7 @@ import 'package:router/componentRouter/auth_service.dart';
 import 'package:router/componentRouter/ms_service.dart';
 import 'package:router/componentRouter/nl_service.dart';
 import 'package:router/componentRouter/sg_service.dart';
+import 'package:router/componentRouter/th_service.dart';
 import 'package:router/componentRouter/vn_service.dart';
 import 'package:cpt_vn/router/vn_service_impl.dart';
 import 'package:cs_resources/local/theme/theme_config.dart';
@@ -49,6 +52,7 @@ void main() async {
     Get.lazyPut<SGService>(() => SGServiceImpl());
     Get.lazyPut<MSService>(() => MSServiceImpl());
     Get.lazyPut<NLService>(() => NLServiceImpl());
+    Get.lazyPut<THService>(() => THServiceImpl());
   });
 
   runApp(MyApp());
@@ -126,7 +130,7 @@ class MyApp extends StatelessWidget {
           //默认路由与路由表的加载
           initialRoute: RouterPath.splash,
           getPages: PageRouter.routes + BasicPageRouter.routes + AuthPageRouter.routes + UKPageRouter.routes
-              + VNPageRouter.routes + SGPageRouter.routes + NLPageRouter.routes + MSPageRouter.routes,
+              + VNPageRouter.routes + SGPageRouter.routes + NLPageRouter.routes + MSPageRouter.routes + THPageRouter.routes,
           //对原生导航的兼容;SmartDialog路由配置生命周期处理
           navigatorObservers: [GetXRouterObserver(), FlutterSmartDialog.observer, routeObserver],
           //默认页面动画
@@ -149,6 +153,7 @@ class MyApp extends StatelessWidget {
           supportedLocales: const [
             Locale('en', 'US'),
             Locale('zh', ''),
+            Locale('th', 'TH'),
           ],
           translations: TranslationService(),
           //SmartDialog初始化默认Loading与Toast

+ 6 - 2
app/lib/modules/splash/splash_controller.dart

@@ -6,6 +6,7 @@ import 'package:plugin_basic/constants/app_constant.dart';
 import 'package:plugin_basic/service/app_config_service.dart';
 import 'package:plugin_basic/service/user_service.dart';
 import 'package:plugin_platform/engine/sp/sp_util.dart';
+import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:router/componentRouter/component_router_service.dart';
 import 'package:shared/utils/device_utils.dart';
 import 'package:shared/utils/log_utils.dart';
@@ -52,12 +53,15 @@ void _gotoNextPage() async {
     } else if (ConfigService.to.selectCountry.value == 2) {
       //去英国首页
       ComponentRouterServices.ukService.startUKMainPage();
-    }else if (ConfigService.to.selectCountry.value == 3) {
+    } else if (ConfigService.to.selectCountry.value == 3) {
       //去马来首页
       ComponentRouterServices.msService.startMSMainPage();
-    }else if (ConfigService.to.selectCountry.value == 4) {
+    } else if (ConfigService.to.selectCountry.value == 4) {
       //去荷兰首页
       ComponentRouterServices.nlService.startNLMainPage();
+    } else if (ConfigService.to.selectCountry.value == 5) {
+      //去泰国首页
+      ComponentRouterServices.thService.startTHMainPage();
     } else {
       //去越南首页
       ComponentRouterServices.vnService.startVNMainPage();