Merge branch 'feature-2511-opt-update-test' of http://120.24.213.56/ethan/appfra…

…me into feature-2511-opt-update-test

ios_build_pre.sh

@@ -4,23 +4,28 @@ if [ -z "$1" ]; then
   echo '需要指定环境变量'
   echo '需要指定环境变量'
 fi
 fi
 
 
-base_root='/Users/ethanlam/works/gitlab/flutter_pros/appframe.git/assets'
+env=$1
+
+base_root='/Users/ethanlam/works/gitlab/flutter_pros/appframe.git'
 cd $base_root
 cd $base_root
 
 
-if [ ! -z "$1" ]; then
+if [ ! -z "$env" ]; then
 # 首先下载同步最新的数据包
 # 首先下载同步最新的数据包
     rm -f assets/dist.zip
     rm -f assets/dist.zip
     cd assets
     cd assets
-    if [ "$1" == 'dev' ]; then
-        wget https://bxe.obs.cn-north-4.myhuaweicloud.com/fronts/material/xehybrid/assets/basepkg/base-dev.zip
+    if [ "$env" == 'dev' ]; then
+        rm -f $base_root/assets/base-dev.zip*
+        wget2 https://bxe.obs.cn-north-4.myhuaweicloud.com/fronts/material/xehybrid/assets/basepkg/base-dev.zip
         cp -f base-dev.zip $base_root/assets/dist.zip
         cp -f base-dev.zip $base_root/assets/dist.zip
         echo 'wget dev is done '
         echo 'wget dev is done '
     fi
     fi
-    if [ "$1" == 'pro' ]; then
-        wget https://bxe.obs.cn-north-4.myhuaweicloud.com/fronts/material/xehybrid/assets/basepkg/base-pro.zip
+    if [ "$env" == 'pro' ]; then
+        rm -f $base_root/assets/base-pro.zip*
+        wget2 https://bxe.obs.cn-north-4.myhuaweicloud.com/fronts/material/xehybrid/assets/basepkg/base-pro.zip
         cp -f base-pro.zip $base_root/assets/dist.zip
         cp -f base-pro.zip $base_root/assets/dist.zip
         echo 'wget pro is done '
         echo 'wget pro is done '
     fi
     fi
 fi
 fi
 
 
+
 echo 'done '
 echo 'done '

pub_ios.sh

+# 编译发布前需要执行的操作
+
+if [ -z "$1" ]; then
+  echo '需要指定环境变量'
+fi
+
+env=$1
+_rebuild_=$2
+_ver=`date  +%y%m%d%H%M`
+
+base_root='/Users/ethanlam/works/gitlab/flutter_pros/appframe.git'
+cd $base_root
+
+if [ ! -z "$env" ]; then
+# 首先下载同步最新的数据包
+    rm -f assets/dist.zip
+    cd assets
+    if [ "$env" == 'dev' ]; then
+        rm -f $base_root/assets/base-dev.zip*
+        wget2 https://bxe.obs.cn-north-4.myhuaweicloud.com/fronts/material/xehybrid/assets/basepkg/base-dev.zip 
+        cp -f base-dev.zip $base_root/assets/dist.zip
+        echo 'wget dev is done '
+    fi
+    if [ "$env" == 'pro' ]; then
+        rm -f $base_root/assets/base-pro.zip*
+        wget2 https://bxe.obs.cn-north-4.myhuaweicloud.com/fronts/material/xehybrid/assets/basepkg/base-pro.zip 
+        cp -f base-pro.zip $base_root/assets/dist.zip
+        echo 'wget pro is done '
+    fi
+fi
+
+cd $base_root
+
+if [ ! -z "$_rebuild_" ]; then
+    flutter clean 
+    flutter pub get
+fi
+
+cd ios
+
+#flutter build ios --build-number=$_ver
+#--dart-define=env=$env
+flutter build ipa --export-method ad-hoc --dart-define 'env='$env
+
+cd $base_root
+mkdir -p dist
+cp -f build/ios/ipa/banxiaoer.ipa dist/'banxiaoer_'$env'_'$_ver'.ipa'
+echo 'build and publish package is done '$env
+
+