Commit 60835acc09b17f2f42d38cc4444dc2e07dd99355

Authored by teemitop
1 parent bee316bc

apk上传区分制作商,以及推送区分制作商

@@ -396,6 +396,7 @@ class Template extends Common{ @@ -396,6 +396,7 @@ class Template extends Common{
396 foreach ($list as $key => $value) { 396 foreach ($list as $key => $value) {
397 $list[$key]['cdate'] = date("Y-m-d H:i:s",$value['cdate']); 397 $list[$key]['cdate'] = date("Y-m-d H:i:s",$value['cdate']);
398 $list[$key]['flag'] = $value['flag']==1 ? "手机" : ($value['flag']==2 ? '平板' : "一键订"); 398 $list[$key]['flag'] = $value['flag']==1 ? "手机" : ($value['flag']==2 ? '平板' : "一键订");
  399 + $list[$key]['make'] = $value['make']==1 ? "铱方" : "极钛";
399 } 400 }
400 $this->assign ( 'title','安卓包管理'); 401 $this->assign ( 'title','安卓包管理');
401 $result = ['code'=>0,'msg'=>'获取成功!','data'=>$list,'rel'=>1]; 402 $result = ['code'=>0,'msg'=>'获取成功!','data'=>$list,'rel'=>1];
@@ -422,14 +423,16 @@ class Template extends Common{ @@ -422,14 +423,16 @@ class Template extends Common{
422 'file_url'=>@$data['pic'], 423 'file_url'=>@$data['pic'],
423 'content'=>$data['content'], 424 'content'=>$data['content'],
424 'flag'=>$data['class'], 425 'flag'=>$data['class'],
  426 + 'make'=>$data['make'],
425 'cdate'=>time(), 427 'cdate'=>time(),
426 ); 428 );
427 $aid = db('android')->insert($data); 429 $aid = db('android')->insert($data);
428 if($aid){ 430 if($aid){
  431 + //2019-06-24 只有铱方设备才进行推送
429 if($data['flag']==3){ 432 if($data['flag']==3){
430 //推送跟新消息 433 //推送跟新消息
431 $file_url = 'http://xt03.colorcun.com'.@$data['file_url']; 434 $file_url = 'http://xt03.colorcun.com'.@$data['file_url'];
432 - $list= file_get_contents(ON_LINE.'Android.Device.SendNewPackageMessage&version='.$data['version'].'&file_url='.$file_url.'&content='.$data['content'].'&pro='.$data['pro']); 435 + $list= file_get_contents(ON_LINE.'Android.Device.SendNewPackageMessage&version='.$data['version'].'&file_url='.$file_url.'&content='.$data['content'].'&pro='.$data['pro'].'&make='.$data['make']);
433 //$array = json_decode($list,TRUE); 436 //$array = json_decode($list,TRUE);
434 } 437 }
435 } 438 }
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
35 ,{field:'file_url', title: '文件地址', width:450} 35 ,{field:'file_url', title: '文件地址', width:450}
36 ,{field:'cdate', title: '上传日期',width:180} 36 ,{field:'cdate', title: '上传日期',width:180}
37 ,{field:'flag', title: '终端',width:100} 37 ,{field:'flag', title: '终端',width:100}
  38 + ,{field:'make', title: '制作商',width:100}
38 ,{width:160,title: '操作', align:'center', toolbar: '#barDemo'} 39 ,{width:160,title: '操作', align:'center', toolbar: '#barDemo'}
39 ]] 40 ]]
40 }); 41 });
@@ -36,6 +36,14 @@ @@ -36,6 +36,14 @@
36 </div> 36 </div>
37 37
38 <div class="layui-form-item"> 38 <div class="layui-form-item">
  39 + <label class="layui-form-label">厂商类型</label>
  40 + <div class="layui-input-block">
  41 + <input type="radio" name="make" value="1" title="铱方" checked="">
  42 + <input type="radio" name="make" value="2" title="极钛">
  43 + </div>
  44 + </div>
  45 +
  46 + <div class="layui-form-item">
39 <label class="layui-form-label">更新方案</label> 47 <label class="layui-form-label">更新方案</label>
40 <div class="layui-input-block"> 48 <div class="layui-input-block">
41 <input type="radio" name="pro" value="1" title="全量更新" checked=""> 49 <input type="radio" name="pro" value="1" title="全量更新" checked="">