打包区分ios新旧包

Application/Admin/Controller/AutoPackController.class.php

@@ -319,7 +319,7 @@ class AutoPackController extends Think
         $launchCountList = M('apply_launch', 'tab_')->field(['apply_id', 'count(*) count'])->where(['apply_id' => ['in', $applyIds]])->group('apply_id')->select();
         $launchCountList = index_by_column('apply_id', $launchCountList);
 
-        $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name', 'game_id'])->where(['game_id' => ['in', $gameIds]])->select();
+        $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name', 'game_id', 'is_new_sdk'])->where(['game_id' => ['in', $gameIds]])->select();
         $gameSources = index_by_column('game_id', $gameSources);
         $gameSourceService = new GameSourceService();
 

Application/Admin/Event/SourceEvent.class.php

@@ -96,7 +96,6 @@ class SourceEvent extends Controller
             }
         }
         $data['source_version'] = $game_source['source_version'] + 1;
-
         $version = '';
         $packageName = '';
         if ($data['file_type'] == 1) {

Application/Admin/View/GameSource/add.html

@@ -91,6 +91,14 @@
                         <input type="hidden" id="file_type"   name="file_type" value="" />
                     </td>
                   </tr>
+                  <tr id="is-new-sdk" style="display: none;">
+                    <td class="l">是否新包</td>
+                    <td class="r table_radio">
+                    <span class="form_radio">
+                        <label><input type="radio" class="inp_radio" checked value="1" name="is_new_sdk" > 是</label>
+                        <label><input type="radio" class="inp_radio" checked value="0" name="is_new_sdk" > 否</label>
+                    </td>
+                  </tr>
 
                   <tr class="picbox">
                     <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>上传原包</td>
@@ -420,8 +428,10 @@ $("#game_id").change(function(){
     $("#game_name").val($("#game_id option:selected").text());
     $("#file_type").val(type);
     if (type == 2){
+        $('#is-new-sdk').show();
         $('#apply_bz').show();
     }else{
+        $('#is-new-sdk').hide();
         $('#apply_bz').hide();
     }
     //if(type == 1){$('.pack_name_class').show();}else{$('.pack_name_class').hide();}

Application/Admin/View/GameSource/edit.html

@@ -78,7 +78,16 @@
                         </volist></span>
                     </td>
                   </tr>
-
+                  <?php if($data['file_type'] == 2):?>
+                  <tr>
+                    <td class="l">是否新包</td>
+                    <td class="r table_radio">
+                    <span class="form_radio">
+                        <label><input type="radio" value="1" name="is_new_sdk" <?php if($data['is_new_sdk']==='1'):?>checked<?php endif;?>> 是</label>
+                        <label><input type="radio" value="0" name="is_new_sdk" <?php if($data['is_new_sdk']==='0'):?>checked<?php endif;?>> 否</label>
+                    </td>
+                  </tr>
+                  <?php endif;?>
                   <tr>
                     <td class="l">上传原包</td>
                     <td class="r" colspan='1'>

Application/Base/Service/GameSourceService.class.php

@@ -92,7 +92,8 @@ class GameSourceService {
             return false;
         }
 
-        if (self::IS_FIXED_IOS13 && $game['sdk_version'] == 2) {
+        $isNewSdk = (isset($gameSource['is_new_sdk']) && $gameSource['is_new_sdk'] == 1);
+        if ($isNewSdk && $game['sdk_version'] == 2) {
             $channelFolder = $this->getChannelConfigFolder($zip, $packData);
             return $this->packChannelFolder($zip, $channelFolder);
         } else {

Data/update.sql

@@ -615,4 +615,6 @@ ALTER TABLE `tab_device_bans`
 MODIFY COLUMN `type`  tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '类型 0未知 1设备号 2IP 3落地页链接 4下载链接' AFTER `tag`;
 
 -- user表注册类型添加7虚拟
-ALTER TABLE `tab_user` MODIFY COLUMN `register_type` tinyint(2) DEFAULT '1' COMMENT '注册方式 0游客1账号 2 手机 3微信 4QQ 5百度 6微博 7虚拟'
+ALTER TABLE `tab_user` MODIFY COLUMN `register_type` tinyint(2) DEFAULT '1' COMMENT '注册方式 0游客1账号 2 手机 3微信 4QQ 5百度 6微博 7虚拟';
+
+ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)';