Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share.git

display-client/assets/mobile-action.xml

@@ -58,6 +58,7 @@
	<action name="getPicture" class="com.wade.mobile.func.MobileCamera" method="getPicture"/>
	<action name="getBase64Picture" class="com.wade.mobile.func.MobileCamera" method="getBase64Picture"/>
	<action name="getCompressPicture" class="com.wade.mobile.func.MobileCamera" method="getCompressPicture"/>
	
	<!-- MobileInfo -->
	<action name="getTerminalType" class="com.wade.mobile.func.MobileInfo" method="getTerminalType"/>
	<action name="getSysInfo" class="com.wade.mobile.func.MobileInfo" method="getSysInfo"/>
@@ -169,7 +170,7 @@
	<action name="poiNearbySearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="poiNearbySearch"></action>
	<!-- 视频压缩 -->
	<action name="videoCompressor" class="com.ai.ipu.videocompressor.func.MobileVideoCompress" method="videoCompressor"></action>
	
	<action name="getVideoPath" class="com.ai.ipu.videocompressor.func.MobileVideoCompress" method="getVideoPath"/>
	
	<action name="poiBoundsSearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="poiBoundsSearch"></action>
	<action name="lbsLocalSearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="lbsLocalSearch"></action>
@@ -178,7 +179,6 @@
    <action name="openActivityFromPlugin" class="com.ai.ipu.func.MobileOpenApp" method="openActivityFromPlugin"></action>
    	<!-- PathMenu -->
	<action name="openPathMenu" class="com.ai.ipu.ipu_pathmenu.func.MobilePathMenu" method="openPathMenu"></action>
	<action name="closePathMenu" class="com.ai.ipu.ipu_pathmenu.func.MobilePathMenu" method="closePathMenu"></action>

display-server/web/biz/js/plugin/videocompress.js

@@ -1,7 +1,18 @@
require(["domReady!","wadeMobile", "util"], function(doc,WadeMobile) {
	var iscroll = new iScroll("content");
	var iscroll = new iScroll("content");
	
	/**
	 * 选择视频
	 */
	$("#getVideoPath").tap(function(){
		WadeMobile.getVideoPath(function(videoPath){
			$("#videoPath").html(videoPath);
		});
	});
	
	//视频压缩
	$("#videoCompressor").tap(function() {
		WadeMobile.videoCompressor();
		var videoPath = $("#videoPath").html();
		WadeMobile.videoCompressor(videoPath);
	});
});

display-server/web/res/js/mobile/expand-mobile.js

@@ -49,6 +49,9 @@ define(["require"],function(require) {
				}
				storageCallback("getPicture",callback);
				execute("getPicture", [type],err);
			},getVideoPath:function(callback){//获取视频
				storageCallback("getVideoPath", callback);
				execute("getVideoPath",[]);
			},transImageToBase64:function(callback,path,err){
				storageCallback("transImageToBase64",callback);
				execute("transImageToBase64", [path],err);
@@ -337,8 +340,8 @@ define(["require"],function(require) {
			},clickBaiduMap:function(callback,err){
				storageCallback("clickBaiduMap",callback);
				execute("clickBaiduMap",[],err);
			},videoCompressor:function(){
				execute("videoCompressor",[]);
			},videoCompressor:function(param){
				execute("videoCompressor",[param]);
			},sweetAlert:function(param){
				execute("sweetAlert",[param]);
			},sweetConfirm:function(param){
@@ -375,6 +378,8 @@ define(["require"],function(require) {
                    execute("clearBackStack",[]);
                }
            }
			
			
		};
	})();
	

display-server/web/template/webapp/plugin/VideoCompress.html

@@ -39,7 +39,22 @@
			</li>
		</ul>
	</div>
	<div class="c_list">
			<ul>
				<li>
					<div class="content">
						<div class="main" id="getVideoPath">
							<div class="title">选择视频</div>
							<div class="info">
								视频路径为：<span id="videoPath"></span>
							</div>
						</div>
					</div>
				</li>
			</ul>
		</div>
</div>
</div>
</body>

ipu-VideoCompressor/src/com/ai/ipu/videocompressor/func/MobileVideoCompress.java

@@ -2,6 +2,14 @@ package com.ai.ipu.videocompressor.func;
import org.json.JSONArray;
import org.json.JSONException;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.util.Log;
import com.ai.ipu.videocompressor.Compressor;
import com.ai.ipu.videocompressor.util.VideoCompressUtil;
@@ -12,12 +20,12 @@ public class MobileVideoCompress extends Plugin {
	// String filePath = AppInfoUtil.getSdcardPath() + "/video.mp4";
	// String desPath = AppInfoUtil.getSdcardPath() + "/videoto.mp4";
//	
	String filepath = "/sdcard" + "/video.mp4";
	
	String decpath = "/sdcard" + "/to.mp4";
	
//	String filepath = "/sdcard" + "/video.mp4";
//	
//	String decpath = "/sdcard" + "/to.mp4";
	
	String cmd = "-y -i " + filepath + " -strict -2 -vcodec libx264 -preset ultrafast -crf 24 -acodec aac -ar 44100 -ac 2 -b:a 96k -s 640x352 -aspect 16:9 " + decpath;
	private static final int VIDEO_CAPTURE = 0;
//	String cmd = "-y -i " + filepath + " -strict -2 -vcodec libx264 -preset ultrafast -crf 24 -acodec aac -ar 44100 -ac 2 -b:a 96k -s 640x352 -aspect 16:9 " + decpath;
	private Compressor com;
	private VideoCompressUtil vcUtil;
@@ -27,7 +35,44 @@ public class MobileVideoCompress extends Plugin {
		com = new Compressor(context);
	}
	public void videoCompressor(JSONArray params) {
	/**
	 * 视频压缩
	 * @param params
	 * @throws Exception 
	 */
	public void videoCompressor(JSONArray params) throws Exception {
		String filepath = params.getString(0);
		String decpath = "/sdcard" + "/to.mp4";
		String cmd = "-y -i " + filepath + " -strict -2 -vcodec libx264 -preset ultrafast -crf 24 -acodec aac -ar 44100 -ac 2 -b:a 96k -s 640x352 -aspect 16:9 " + decpath;
		vcUtil.videoCompressor(com, cmd);
	}
	/**
	 * 选择视频
	 */
	public void getVideoPath(JSONArray params){
		Intent intent = new Intent(Intent.ACTION_PICK);
		intent.setType("video/*");
		startActivityForResult(intent, VIDEO_CAPTURE);
	}
	@Override
	public void onActivityResult(int requestCode, int resultCode, Intent data) {
		super.onActivityResult(requestCode, resultCode, data);
		if (resultCode == Activity.RESULT_OK && requestCode == VIDEO_CAPTURE) {
			Uri uri = data.getData();
			Cursor cursor = context.getContentResolver().query(uri, null, null, null,
					null);
			cursor.moveToFirst();
			// String number= cursor.getString(0); // 视频编号
			String path = cursor.getString(1); // 视频文件路径
//			tvPath.setText(path);
			// String size = cursor.getString(2); // 视频大小
			// String name = cursor.getString(3); // 视频文件名
			// Log.e("-----","number="+number);
			callback(path);
			Log.e("-----", "v_path=" + path);
			// Log.e("-----","v_size="+size);
			// Log.e("-----","v_name="+name);
		}
	}
	
}