修包bluetooth代码

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

@@ -28,7 +28,8 @@ import com.ai.ipu.bluetooth.R;
import com.ai.ipu.bluetooth.listener.OnSearchDeviceListener;
import com.ai.ipu.bluetooth.util.BluetoothConstant;
import com.ai.ipu.bluetooth.util.BluetoothTool;
import com.wade.mobile.app.MobileAppInfo;
import com.ai.ipu.mobile.app.ApkUtil;
import com.ai.ipu.mobile.app.AppInfoUtil;
import com.wade.mobile.ui.helper.HintHelper;
@@ -76,8 +77,8 @@ public class ShareByBluetoothActivity extends Activity {
					new DialogInterface.OnClickListener() {
						public void onClick(DialogInterface dialog, int which) {
							try {
								MobileAppInfo mAppInfo =  MobileAppInfo.getInstance(ShareByBluetoothActivity.this);
								tool.sendFile(mAppInfo.getApk(), device);
//								MobileAppInfo mAppInfo =  MobileAppInfo.getInstance(ShareByBluetoothActivity.this);
								tool.sendFile(ApkUtil.getCurrApk(), device);
								setResult(BluetoothConstant.SUC_REQ_SEND_FILE);
							} catch (Exception e) {
								setResult(BluetoothConstant.ERR_REQ_SEND_FILE);

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

@@ -15,17 +15,19 @@ import android.os.AsyncTask;
import android.os.Build;
import android.widget.Toast;
import com.ai.ipu.basic.string.StringUtils;
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.app.MobileAppInfo;
import com.wade.mobile.common.MobileThread;
import com.wade.mobile.common.sms.listener.OnSmsReceiveListener;
import com.wade.mobile.common.sms.util.SmsTool;
import com.wade.mobile.frame.IWadeMobile;
@@ -40,7 +42,6 @@ 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.HttpTool;
import com.wade.mobile.util.http.UnirestUtil;
public class MobileNetWork extends Plugin {
@@ -61,7 +62,7 @@ public class MobileNetWork extends Plugin {
		HashSet<String> telSet = null;
		if(!isNull(telString)){
			telSet = new HashSet<String>();
			if(StringUtils.isJSONArray(telString)) {
			if(StringUtil.isJSONArray(telString)) {
				JSONArray teles = new JSONArray(telString);
				for(int i=0; i <teles.length() ; i++){
					telSet.add(teles.getString(i));
@@ -200,7 +201,7 @@ public class MobileNetWork extends Plugin {
		Map<String, String> postData = new HashMap<String, String>();
		postData.put(Constant.Server.ACTION, dataAction);
		if (ServerDataConfig.isEncrypt(dataAction)) {
			MobileSecurity.init(context);
			MobileSecurity.init();
			/* 参数加密处理 */
			String key = MobileSecurity.getDesKey();
			postData.put(Constant.Server.KEY, key);
@@ -235,7 +236,7 @@ public class MobileNetWork extends Plugin {
	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 MobileThread(dataAction, waitoutTime) {
		new IpuThread(dataAction, waitoutTime) {
			@Override
			protected void execute() throws Exception {
				String result = requestBizData(dataAction, param);
@@ -258,7 +259,7 @@ public class MobileNetWork extends Plugin {
			return;
		}
		if (Build.VERSION.SDK_INT < MobileAppInfo.Android_4_1_2) {
		if (Build.VERSION.SDK_INT < AppInfoUtil.Android_4_1_2) {
			try {
				Intent intent = new Intent(context, ShareByBluetoothActivity.class);
				context.startActivity(intent);
@@ -268,15 +269,15 @@ public class MobileNetWork extends Plugin {
			}
		} else {
			final BluetoothTool bluetoothTools = new BluetoothTool(context);
			final MobileAppInfo mobileAppInfo = MobileAppInfo.getInstance(context);
//			final AppInfoUtil mobileAppInfo = AppInfoUtil.getInstance(context);
			if (bluetoothTools.isEnabled()) {
				bluetoothTools.sendFile(mobileAppInfo.getApk());
				bluetoothTools.sendFile(ApkUtil.getCurrApk());
			} else {
				bluetoothTools.openBluetooth(new OnOpenBluetoothListener() {
					public void OnOpened(BluetoothAdapter adapter) {
						// 开始查找设备。
						try {
							bluetoothTools.sendFile(mobileAppInfo.getApk());
							bluetoothTools.sendFile(ApkUtil.getCurrApk());
						} catch (Exception e) {
							e.printStackTrace();
						}

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

@@ -5,23 +5,23 @@ import java.net.SocketTimeoutException;
import android.os.Bundle;
import com.ai.ipu.mobile.app.AppInfoUtil;
import com.ai.ipu.mobile.app.MobileCheck;
import com.ai.ipu.mobile.app.MobileOperation;
import com.wade.mobile.app.AppRecord;
import com.wade.mobile.app.MobileAppInfo;
import com.wade.mobile.app.MobileOperation;
import com.wade.mobile.app.MobileUtil;
import com.wade.mobile.frame.activity.TemplateMainActivity;
import com.wade.mobile.ui.comp.dialog.ConfirmBlockDialog;
public class MainActivity extends TemplateMainActivity {
	@Override
	public void onCreate(Bundle savedInstanceState) {
		if(MobileAppInfo.getOsVersionNumber() > 8){			
		if(AppInfoUtil.getOsVersionNumber() > 8){			
			setTheme(android.R.style.Theme_Holo_Light_NoActionBar);
		}else {
			setTheme(android.R.style.Theme_Light);
		}
		if (AppRecord.isFirst(this) && !MobileUtil.checkWifiActive(this)) {
		if (AppRecord.isFirst(this) && !MobileCheck.checkWifiActive()) {
			ConfirmBlockDialog dialog = new ConfirmBlockDialog(this, "下载提醒", "即将下载应用资源,连接wifi将为您节省流量,是否继续下载");
			dialog.show();
			if (dialog.getResult() == ConfirmBlockDialog.Result.OK) {