修改依赖包后代码及依赖的修改

display-client/AndroidManifest.xml

@@ -48,8 +48,11 @@
    
    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
    <!-- 
        android:name="com.wade.mobile.frame.IpuBasicApplication"
     -->
    <application
        android:name="com.wade.mobile.frame.MobileApplication"
        android:allowBackup="false"
        android:icon="@drawable/ic_launcher"
        android:label="@string/app_name"
@@ -126,13 +129,13 @@
        -->
        <!-- 单个扫码 -->
        <activity
            android:name="com.ipu.scan.activity.CaptureSingleActivity"
            android:name="com.ai.ipu.scan.activity.CaptureSingleActivity"
            android:configChanges="orientation|keyboardHidden"   
            android:screenOrientation="portrait" >
        </activity>
        <!-- 多个扫码 -->
        <activity
            android:name="com.ipu.scan.activity.CaptureMultipleActivity"
            android:name="com.ai.ipu.scan.activity.CaptureMultipleActivity"
            android:configChanges="orientation|keyboardHidden"   
            android:screenOrientation="portrait" >
        </activity>

display-client/assets/mobile-action.xml

@@ -134,10 +134,10 @@
	<action name="openNative" class="com.ai.ipu.func.MobileOpenApp" method="openNative"></action>
	
	<!--ScanQR -->
	<action name="scanQrCode" class="com.ipu.scan.func.IpuScan" method="scanSingle"></action>
	<action name="scanSingle" class="com.ipu.scan.func.IpuScan" method="scanSingle"></action>
	<action name="scanMultiple" class="com.ipu.scan.func.IpuScan" method="scanMultiple"></action>
	<action name="createQrCode" class="com.ipu.scan.func.IpuScan" method="createQrCode"></action>
	<action name="scanQrCode" class="com.ai.ipu.scan.func.IpuScan" method="scanSingle"></action>
	<action name="scanSingle" class="com.ai.ipu.scan.func.IpuScan" method="scanSingle"></action>
	<action name="scanMultiple" class="com.ai.ipu.scan.func.IpuScan" method="scanMultiple"></action>
	<action name="createQrCode" class="com.ai.ipu.scan.func.IpuScan" method="createQrCode"></action>
	
	<!-- Voice -->
	<action name="startListen" class="com.ai.ipu.voice.IpuVoicePlugin" method="startListen"></action>

display-client/src/com/ai/ipu/display/MainActivity.java

@@ -21,7 +21,7 @@ public class MainActivity extends TemplateMainActivity {
			setTheme(android.R.style.Theme_Light);
		}
		if (AppRecord.isFirst(this) && !MobileCheck.checkWifiActive()) {
		if (AppRecord.isFirst() && !MobileCheck.checkWifiActive()) {
			ConfirmBlockDialog dialog = new ConfirmBlockDialog(this, "下载提醒",
					"即将下载应用资源,连接wifi将为您节省流量,是否继续下载");
			dialog.show();

display-client/src/com/ai/ipu/func/MobileOpenApp.java

@@ -7,13 +7,13 @@ import android.content.Intent;
import com.ai.ipu.mobile.app.MobileCheck;
import com.ai.ipu.mobile.app.SimpleUpdate;
import com.ai.ipu.mobile.ui.HintUtil;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
import com.umeng.analytics.MobclickAgent;
import com.umeng.analytics.MobclickAgent.EScenarioType;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.ui.helper.HintHelper;
public class MobileOpenApp extends Plugin {
@@ -37,7 +37,7 @@ public class MobileOpenApp extends Plugin {
			intent.setComponent(cn);
			startActivityForResult(intent, 0);
		} else {
			HintHelper.tip(context, "正在下载，请稍后...", 1);
			HintUtil.tip(context, "正在下载，请稍后...", 1);
			/* 如果应用不存在则需要下载，配置需要下载应用 */
			SimpleUpdate simpleUpdate = new SimpleUpdate(context, downloadUrl);

ipu-bluetooth/src/com/ai/ipu/bluetooth/activity/BluetoothPicker.java

@@ -1,11 +1,12 @@
package com.ai.ipu.bluetooth.activity;
import com.ai.ipu.mobile.ui.HintUtil;
import android.app.Activity;
import android.bluetooth.BluetoothDevice;
import android.content.Intent;
import android.os.Bundle;
import com.wade.mobile.ui.helper.HintHelper;
/**
 * @author huangbo
@@ -41,7 +42,7 @@ public class BluetoothPicker extends Activity {
	public void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		if (device == null) {
			HintHelper.alert(this, "Failed to get selected bluetooth device!");
			HintUtil.alert(this, "Failed to get selected bluetooth device!");
			finish();
			return;
		}

ipu-bluetooth/src/com/ai/ipu/bluetooth/activity/ShareByBluetoothActivity.java

@@ -30,7 +30,7 @@ import com.ai.ipu.bluetooth.util.BluetoothConstant;
import com.ai.ipu.bluetooth.util.BluetoothTool;
import com.ai.ipu.mobile.app.ApkUtil;
import com.ai.ipu.mobile.app.AppInfoUtil;
import com.wade.mobile.ui.helper.HintHelper;
import com.ai.ipu.mobile.ui.HintUtil;
/**
@@ -82,7 +82,7 @@ public class ShareByBluetoothActivity extends Activity {
								setResult(BluetoothConstant.SUC_REQ_SEND_FILE);
							} catch (Exception e) {
								setResult(BluetoothConstant.ERR_REQ_SEND_FILE);
								HintHelper.alert(ShareByBluetoothActivity.this, "文件分享异常:"+e.getMessage());
								HintUtil.alert(ShareByBluetoothActivity.this, "文件分享异常:"+e.getMessage());
								e.printStackTrace();
							}
						}
@@ -170,7 +170,7 @@ public class ShareByBluetoothActivity extends Activity {
		} catch (Exception e) {
			closeDialog();
			setResult(BluetoothConstant.ERR_REQ_SEARCH);
			HintHelper.alert(ShareByBluetoothActivity.this, "搜索蓝牙设备异常:"+e.getMessage());
			HintUtil.alert(ShareByBluetoothActivity.this, "搜索蓝牙设备异常:"+e.getMessage());
			e.printStackTrace();
		}
	}

ipu-bluetooth/src/com/ai/ipu/bluetooth/func/MobileNetWork.java

@@ -1,250 +1,26 @@
package com.ai.ipu.bluetooth.func;
import java.io.File;
import java.io.InputStream;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import org.json.JSONArray;
import android.bluetooth.BluetoothAdapter;
import android.content.Intent;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.widget.Toast;
import com.ai.ipu.basic.net.http.HttpTool;
import com.ai.ipu.basic.string.StringUtil;
import com.ai.ipu.basic.thread.IpuThread;
import com.ai.ipu.bluetooth.activity.ShareByBluetoothActivity;
import com.ai.ipu.bluetooth.listener.OnOpenBluetoothListener;
import com.ai.ipu.bluetooth.util.BluetoothTool;
import com.ai.ipu.mobile.app.ApkUtil;
import com.ai.ipu.mobile.app.AppInfoUtil;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
import com.litesuits.http.LiteHttpClient;
import com.litesuits.http.request.Request;
import com.litesuits.http.response.Response;
import com.wade.mobile.common.sms.listener.OnSmsReceiveListener;
import com.wade.mobile.common.sms.util.SmsTool;
import com.ai.ipu.mobile.ui.HintUtil;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.config.MobileConfig;
import com.wade.mobile.frame.config.ServerDataConfig;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.safe.MobileSecurity;
import com.wade.mobile.util.BusinessCache;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.DirectionUtil;
import com.wade.mobile.util.FileUtil;
import com.wade.mobile.util.FuncConstant;
import com.wade.mobile.util.Messages;
import com.wade.mobile.util.Utility;
import com.wade.mobile.util.http.UnirestUtil;
import android.bluetooth.BluetoothAdapter;
import android.content.Intent;
import android.os.Build;
import android.util.Log;
import android.widget.Toast;
public class MobileNetWork extends Plugin {
	private boolean hasSetSmsListener;
	private DirectionUtil directionUtil;
	public MobileNetWork(IWadeMobile wademobile) {
		super(wademobile);
		directionUtil = DirectionUtil.getInstance(context);
	}
	public void setSmsListener(JSONArray param) throws Exception {
		String telString = param.getString(0);
		setSmsListener(telString);
	}
	public void setSmsListener(String telString) throws Exception {
		HashSet<String> telSet = null;
		if(!isNull(telString)){
			telSet = new HashSet<String>();
			if(StringUtil.isJSONArray(telString)) {
				JSONArray teles = new JSONArray(telString);
				for(int i=0; i <teles.length() ; i++){
					telSet.add(teles.getString(i));
				}
			} else {
				telSet.add(telString);
			}
		}
		
		final HashSet<String> _telSet = telSet;
		if (!hasSetSmsListener) {
			SmsTool.setSmsListener(context, new OnSmsReceiveListener() {
				@Override
				public boolean onSmsReceive(String content, String sender, long time) {
					if (_telSet == null || _telSet.contains(sender)) {// 没有滤号码或者存在过滤号码均处理
						IData resultData = new DataMap();
						resultData.put(FuncConstant.CONTENT, content);
						resultData.put(FuncConstant.SENDER, sender);
						resultData.put(FuncConstant.TIME, time);
						String result = resultData.toString();
						callback(result, true);
						hasSetSmsListener = false;
						return true;
					} else {
						return false;
					}
				}
			});
			hasSetSmsListener = true;
		}
	}
	public void httpRequest(JSONArray param) throws Exception {
		String requestUrl = param.getString(0);
		String encode = param.getString(1);
		if (isNull(encode)) {
			encode = MobileConfig.getInstance().getEncode();
		}
		String result;
		try {
			result = httpRequest(requestUrl, encode);
		} catch (Exception e) {
			result = "{\"X_RESULTCODE\":\"-1\",\"X_RESULTINFO\":\"" + e.getMessage() + "\"}";
		}
		callback(result, true);
	}
	public String httpRequest(String requestUrl, String encode) throws Exception {
		// TODO Auto-generated method stub
		MobileConfig config = MobileConfig.getInstance();
		// 预处理
		if (!requestUrl.startsWith(Constant.HTTP)) {
			if (!requestUrl.startsWith("/"))
				requestUrl = "/" + requestUrl;
			requestUrl = config.getRequestHost() + requestUrl;
		}
		requestUrl = HttpTool.urlEncode(requestUrl, encode);
		return HttpTool.httpRequest(requestUrl, null, Constant.HTTP_POST, encode);
	}
	public void httpGet(JSONArray param) throws Exception {
		String requestUrl = param.getString(0);
		String encode = param.getString(1);
		if (isNull(encode)) {
			encode = MobileConfig.getInstance().getEncode();// UTF-8
		}
		String result;
		try {
			/* 方式1 */
			/*result = httpGet(requestUrl,encode);*/
			/* 方式2 */
			LiteHttpClient client = LiteHttpClient.getInstance(context);
			Response res = client.execute(new Request(requestUrl));
			result = res.getString();
		} catch (Exception e) {
			result = e.getMessage();
		}
		callback(result, true);
	}
	public String httpGet(String requestUrl, String encode) throws Exception {
		MobileConfig config = MobileConfig.getInstance();
		/* 预处理 */
		if (!requestUrl.startsWith(Constant.HTTP)) {
			if (!requestUrl.startsWith("/"))
				requestUrl = "/" + requestUrl;
			requestUrl = config.getRequestHost() + requestUrl;
		}
		requestUrl = HttpTool.urlEncode(requestUrl, encode);
		return HttpTool.httpRequest(requestUrl, null, Constant.HTTP_GET, encode);
	}
	public void dataRequest(JSONArray param) throws Exception {
		String dataAction = param.getString(0);
		String data = param.getString(1);
		String result = dataRequest(dataAction, isNull(data) ? null : new DataMap(data));
		callback(result, true);
	}
	/**
	 * @param dataAction
	 * @param param
	 * @param isMustEncrypt
	 *            是否一定加密传输
	 * @return
	 * @throws Exception
	 */
	public String dataRequest(String dataAction, IData param) throws Exception {
		synchronized (dataAction) {
			String result = (String) BusinessCache.getInstance().get(dataAction);
			if (result != null) {
				BusinessCache.getInstance().remove(dataAction);
			} else {
				result = requestBizData(dataAction, param);
			}
			return result;
		}
	}
	private String requestBizData(String dataAction, IData param) throws Exception {
		Map<String,String> postData = transPostData(dataAction, param);
		String dataUrl = HttpTool.toQueryStringWithEncode(postData);
		String result = HttpTool.httpRequest(MobileConfig.getInstance().getRequestUrl(),
				dataUrl, Constant.HTTP_POST);
		if (ServerDataConfig.isEncrypt(dataAction)) {
			result = MobileSecurity.responseDecrypt(result);
		}
		return result;
	}
	
	public Map<String, String> transPostData(String dataAction, IData dataParam) throws Exception {
		// TODO Auto-generated method stub
		Map<String, String> postData = new HashMap<String, String>();
		postData.put(Constant.Server.ACTION, dataAction);
		if (ServerDataConfig.isEncrypt(dataAction)) {
			MobileSecurity.init();
			/* 参数加密处理 */
			String key = MobileSecurity.getDesKey();
			postData.put(Constant.Server.KEY, key);
			
			if(dataParam!=null){
				String encryptData = MobileSecurity.requestEncrypt(dataParam.toString());
				postData.put(Constant.Server.DATA, encryptData);
			}
		} else {
			if (dataParam != null) {
				postData.put(Constant.Server.DATA, dataParam.toString());
			}
		}
		return postData;
	}
	public void storageDataByThread(JSONArray param) throws Exception {
		String dataAction = param.getString(0);
		String data = param.getString(1);
		boolean isEncrypt = false;
		if (param.length() > 2) {
			isEncrypt = "true".equals(param.getString(2)) ? true : false;
		}
		int waitoutTime = 5;
		if (param.length() > 3) {
			waitoutTime = param.getInt(3);
		}
		storageDataByThread(dataAction, isNull(data) ? null : new DataMap(data), isEncrypt, waitoutTime);
	}
	public void storageDataByThread(final String dataAction, final IData param,
			final boolean isEncrypt, long waitoutTime) throws Exception {
		waitoutTime = (waitoutTime < 3 || waitoutTime > 10) ? 5 : waitoutTime;// 修正waitoutTime,确保在一定范围
		new IpuThread(dataAction, waitoutTime) {
			@Override
			protected void execute() throws Exception {
				String result = requestBizData(dataAction, param);
				synchronized (dataAction) {
					BusinessCache.getInstance().put(dataAction, result);
				}
			}
		}.start();
	}
	public void shareByBluetooth(JSONArray param) throws Exception {
@@ -277,139 +53,27 @@ public class MobileNetWork extends Plugin {
					public void OnOpened(BluetoothAdapter adapter) {
						// 开始查找设备。
						try {
							HintUtil.tip(context, "蓝牙已启动...");
							bluetoothTools.sendFile(ApkUtil.getCurrApk());
						} catch (Exception e) {
							e.printStackTrace();
						}
					}
				});
			}
		}
	}
	/**
	 * 打开浏览器
	 */
	public void openBrowser(JSONArray param) throws Exception {
		String url = param.getString(0);
		openBrowser(url);
	}
	/**
	 * 打开浏览器
	 */
	public void openBrowser(String url) {
		Uri uri = Uri.parse(url);
		Intent intent = new Intent(Intent.ACTION_VIEW, uri);
		context.startActivity(intent);
	}
	
	public void uploadWithServlet(JSONArray param) throws Exception {
		JSONArray filePaths = param.getJSONArray(0);
		String dataAction = param.getString(1);
		IData dataParam = isNull(param.getString(2))?new DataMap():new DataMap(param.getString(2));
		uploadWithServlet(filePaths, dataAction, dataParam);
	}
	
	@SuppressWarnings("unchecked")
	public void uploadWithServlet(final JSONArray filePaths, final String dataAction, IData dataParam) throws Exception {
		// TODO Auto-generated method stub
		Map<String, String> postData = transPostData(dataAction, dataParam);
		new AsyncTask<Map<String, String>, Integer, String>() {
			@Override
			protected String doInBackground(Map<String, String>... args) {
				Map<String, String> postData = args[0];
				Map<String, Object> fileData = new HashMap<String, Object>();
				// TODO Auto-generated method stub
				String result = null;
				try{
					String filePath = null;
					File file;
					for(int i=0;i<filePaths.length();i++){
						filePath = filePaths.getString(i);
						file = new File(filePath);
						if(!file.exists()){
							Utility.error(Messages.FILE_NOT_EXIST+":"+filePath);
						}
						fileData.put("UPLOAD_FILE"+i, file);//装载文件
					@Override
					public void OnOpen(BluetoothAdapter adapter) {
						HintUtil.tip(context, "蓝牙启动中...");
					}
					fileData.put("UPLOAD_FILE_COUNT", filePaths.length());//装载文件数量
					
					String encode = MobileConfig.getInstance().getEncode();
					String dataUrl = HttpTool.urlEncode(HttpTool.toQueryString(postData), encode);
					String url = MobileConfig.getInstance().getRequestUrl() + "?" + dataUrl;
					result = UnirestUtil.uploadByPost(HttpTool.urlEscape(url).toString(), fileData);
					if (ServerDataConfig.isEncrypt(dataAction)) {
						result = MobileSecurity.responseDecrypt(result);
					@Override
					public void OnClose(BluetoothAdapter adapter) {
						HintUtil.tip(context, "蓝牙关闭中...");
					}
				}catch(Exception e){
					MobileNetWork.this.error(e.getMessage());// 报错回调
					Utility.error(e);
				}
				return result;
			}
			
			@Override
			protected void onPostExecute(String result) {
				// TODO Auto-generated method stub
				super.onPostExecute(result);
				if (result != null) {
					MobileNetWork.this.callback(result, true);// 正常回调
				}
			}
		}.execute(postData);
	}
	
	public void downloadWithServlet(JSONArray param) throws Exception {
		String savePath = param.getString(0);
		String dataAction = param.getString(1);
		IData dataParam = param.getString(2) == null ? new DataMap() : new DataMap(param.getString(2));
		downloadWithServlet(savePath, dataAction, dataParam);
	}
	
	public void downloadWithServlet(final String _savePath, String dataAction, IData dataParam) throws Exception {
		// TODO Auto-generated method stub
		Map<String, String> tempPostData = transPostData(dataAction, dataParam);
		final Map<String, Object> postData = new HashMap<String, Object>();
		postData.putAll(tempPostData);
		new AsyncTask<String, Integer, String>() {
			@Override
			protected String doInBackground(String... arg0) {
				// TODO Auto-generated method stub
				String savePath = _savePath;
				try {
					InputStream in = UnirestUtil.downloadByPost(MobileConfig.getInstance().getRequestUrl(), postData);
					if (!savePath.startsWith(File.separator)) {
						savePath = directionUtil.getDirection(savePath, true);
					}
					File file = new File(savePath).getParentFile();
					if (!file.exists() && !file.mkdirs()) {
						Utility.error("创建下载文件夹失败!");
					@Override
					public void OnClosed(BluetoothAdapter adapter) {
						HintUtil.tip(context, "蓝牙已关闭...");
					}
					FileUtil.writeFile(in, savePath);
				} catch (Exception e) {
					MobileNetWork.this.error("[" + savePath + "]异常:" + e.getMessage());// 报错回调
				}
				return savePath;
			}
			
			@Override
			protected void onPostExecute(String savePath) {
				// TODO Auto-generated method stub
				super.onPostExecute(savePath);
				if (savePath != null) {
					MobileNetWork.this.callback(savePath, true);// 正常回调
				}
				});
			}
		}.execute();
	}
	public void uploadFile(JSONArray param) throws Exception {
		String path = param.getString(0);
		uploadFile(path);
		}
	}
	public void uploadFile(String path) throws Exception {
		// TODO Auto-generated method stub
		
	}
}

ipu-bluetooth/src/com/ai/ipu/bluetooth/util/BluetoothTool.java

@@ -22,7 +22,7 @@ import com.ai.ipu.bluetooth.listener.OnSearchDeviceListener;
import com.ai.ipu.bluetooth.receiver.BondBluetoothReceiver;
import com.ai.ipu.bluetooth.receiver.OpenBluetoothReceiver;
import com.ai.ipu.bluetooth.receiver.ScanBluetoothReceiver;
import com.wade.mobile.util.Utility;
import com.ai.ipu.mobile.util.IpuMobileUtility;
public class BluetoothTool {
	// 用于保存传入的上下文
@@ -307,7 +307,7 @@ public class BluetoothTool {
					Uri.parse("content://com.android.bluetooth.opp/btopp"),
					cv);
		} else {
			Utility.error("The file "+file.getName()+" does not exist.");
			IpuMobileUtility.error("The file "+file.getName()+" does not exist.");
		}
	}
	
@@ -327,7 +327,7 @@ public class BluetoothTool {
			sharingIntent.putExtra(Intent.EXTRA_STREAM, uri);
			mActivity.startActivity(sharingIntent);
		} else {
			Utility.error("The file "+file.getName()+" does not exist.");
			IpuMobileUtility.error("The file "+file.getName()+" does not exist.");
		}
	}
}

ipu-client/src/com/ipu/client/MainActivity.java

@@ -21,7 +21,7 @@ public class MainActivity extends TemplateMainActivity {
			setTheme(android.R.style.Theme_Light);
		}
		if (AppRecord.isFirst(this) && !MobileCheck.checkWifiActive()) {
		if (AppRecord.isFirst() && !MobileCheck.checkWifiActive()) {
			ConfirmBlockDialog dialog = new ConfirmBlockDialog(this, "下载提醒", "即将下载应用资源,连接wifi将为您节省流量,是否继续下载");
			dialog.show();
			if (dialog.getResult() == ConfirmBlockDialog.Result.OK) {