瀏覽代碼

切换正式环境,安卓303版本上线。
移除越南的入口

liukai 2 月之前
父節點
當前提交
2963c451d6

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

@@ -52,8 +52,8 @@ android {
         applicationId "com.guadou.yyemployer"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 302          //Android打包上线记得要加固并重新签名再传
-        versionName "3.0.2"
+        versionCode 303
+        versionName "3.0.3"
 
         multiDexEnabled true
 

+ 5 - 1
app/pubspec_overrides.yaml

@@ -1,11 +1,15 @@
-# melos_managed_dependency_overrides: cpt_auth,cpt_job,cpt_labour,cpt_report,cs_resources,domain,initializer,plugin_basic,plugin_platform,router,shared,widgets
+# melos_managed_dependency_overrides: cpt_auth,cpt_job,cpt_labour,cpt_report,cs_resources,domain,initializer,plugin_basic,plugin_platform,router,shared,widgets,cpt_job_sg,cpt_labour_sg
 dependency_overrides:
   cpt_auth:
     path: ../packages/cpt_auth
   cpt_job:
     path: ../packages/cpt_job
+  cpt_job_sg:
+    path: ../packages/cpt_job_sg
   cpt_labour:
     path: ../packages/cpt_labour
+  cpt_labour_sg:
+    path: ../packages/cpt_labour_sg
   cpt_report:
     path: ../packages/cpt_report
   cs_resources:

+ 4 - 0
melos.yaml

@@ -56,6 +56,10 @@ scripts:
     run: cd "$MELOS_ROOT_PATH/app" && flutter build apk
     description: 编译安卓Release的APK格式安装包.
 
+  build_aab:
+    run: cd "$MELOS_ROOT_PATH/app" && flutter build appbundle
+    description: 编译安卓Release的APK格式安装包.
+
   resource_get:
     run: |
       cd "$MELOS_ROOT_PATH/packages/cs_domain/" && flutter pub get

+ 29 - 29
packages/cpt_auth/lib/modules/select_country/select_country_page.dart

@@ -124,35 +124,35 @@ class SelectCountryPage extends BaseStatelessPage<SelectCountryController> {
                       }),
 
                       //越南的选项
-                      Container(
-                        width: double.infinity,
-                        margin: const EdgeInsets.only(top: 13.5, left: 20, right: 20),
-                        padding: const EdgeInsets.symmetric(vertical: 13, horizontal: 17),
-                        decoration: BoxDecoration(
-                          color: const Color(0xFF4DCFF6).withOpacity(0.2), // 设置背景颜色和不透明度
-                          borderRadius: BorderRadius.circular(5.0), // 设置圆角
-                        ),
-                        child: Row(
-                          children: [
-                            const MyAssetImage(Assets.cptAuthVnIcon, width: 50, height: 33),
-                            MyTextView(
-                              "Vietnam".tr,
-                              marginLeft: 17,
-                              textColor: ColorConstants.white,
-                              isFontMedium: true,
-                              fontSize: 18,
-                            ).expanded(),
-                            Obx(() {
-                              return Visibility(
-                                visible: ConfigService.to.selectCountry.value == 0,
-                                child: const MyAssetImage(Assets.cptAuthCheckedIcon, width: 22, height: 22),
-                              );
-                            }),
-                          ],
-                        ),
-                      ).onTap(() {
-                        ConfigService.to.selectCountry.value = 0;
-                      }),
+                      // Container(
+                      //   width: double.infinity,
+                      //   margin: const EdgeInsets.only(top: 13.5, left: 20, right: 20),
+                      //   padding: const EdgeInsets.symmetric(vertical: 13, horizontal: 17),
+                      //   decoration: BoxDecoration(
+                      //     color: const Color(0xFF4DCFF6).withOpacity(0.2), // 设置背景颜色和不透明度
+                      //     borderRadius: BorderRadius.circular(5.0), // 设置圆角
+                      //   ),
+                      //   child: Row(
+                      //     children: [
+                      //       const MyAssetImage(Assets.cptAuthVnIcon, width: 50, height: 33),
+                      //       MyTextView(
+                      //         "Vietnam".tr,
+                      //         marginLeft: 17,
+                      //         textColor: ColorConstants.white,
+                      //         isFontMedium: true,
+                      //         fontSize: 18,
+                      //       ).expanded(),
+                      //       Obx(() {
+                      //         return Visibility(
+                      //           visible: ConfigService.to.selectCountry.value == 0,
+                      //           child: const MyAssetImage(Assets.cptAuthCheckedIcon, width: 22, height: 22),
+                      //         );
+                      //       }),
+                      //     ],
+                      //   ),
+                      // ).onTap(() {
+                      //   ConfigService.to.selectCountry.value = 0;
+                      // }),
 
                       //韩国的选项
                       // Container(

+ 1 - 1
packages/cs_domain/lib/constants/api_constants.dart

@@ -2,7 +2,7 @@
 
 class ApiConstants {
   //当前服务器环境
-  static const isServerRelease = false;
+  static const isServerRelease = true;
 
   //越南的域名
   static const baseUrl = isServerRelease ? 'https://vietnam.casualabour.com' : 'http://vietnam-dev.casualabour.com';

+ 3 - 3
packages/cs_plugin_basic/lib/service/app_config_service.dart

@@ -21,8 +21,8 @@ import '../constants/app_constant.dart';
 class ConfigService extends GetxService {
   static ConfigService get to => Get.find();
 
-  //选择的国家
-  RxInt selectCountry = 0.obs;  //0 越南  1 新加坡  2 韩国
+  //选择的国家,默认新加坡
+  RxInt selectCountry = 1.obs;  //0 越南  1 新加坡  2 韩国
 
   // 设备信息
   /// android 设备信息
@@ -98,7 +98,7 @@ class ConfigService extends GetxService {
     super.onReady();
 
     //赋值选中的国家
-    int country = SPUtil.getInt(AppConstant.storageSelectedCountry, defValue: 0) ?? 0;
+    int country = SPUtil.getInt(AppConstant.storageSelectedCountry, defValue: 1) ?? 1;
     selectCountry.value = country;
 
     //打印应用与设备的信息

+ 1 - 1
packages/cs_plugin_basic/lib/service/http_provider_injection.dart

@@ -12,7 +12,7 @@ class HttpProviderInjection {
   static void putHttpProviderByCountry() {
     //根据选中的国家赋值Api
     String baseUrl;
-    int country = SPUtil.getInt(AppConstant.storageSelectedCountry, defValue: 0) ?? 0;
+    int country = SPUtil.getInt(AppConstant.storageSelectedCountry, defValue: 1) ?? 1;
     if (country == 1) {
       //新加坡
       baseUrl = ApiConstants.sgBaseUrl;