ipu-mobile代码迁移第二阶段

wade-mobile-func/.classpath

@@ -10,5 +10,7 @@
	<classpathentry kind="lib" path="libs/wade-mobile-ui.jar"/>
	<classpathentry kind="lib" path="libs/unirest-java-1.3.2-SNAPSHOT-withDependency-ShadedForAndroid.jar"/>
	<classpathentry kind="lib" path="libs/wade-mobile.jar"/>
	<classpathentry kind="lib" path="libs/ipu-basic-1.0.jar"/>
	<classpathentry kind="lib" path="libs/ipu-mobile-1.0.jar"/>
	<classpathentry kind="output" path="bin"/>
</classpath>

wade-mobile-func/src/com/wade/mobile/activity/DownloadFileActivity.java

@@ -16,9 +16,9 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.ai.ipu.basic.net.http.HttpTool;
import com.wade.mobile.frame.WadeMobileActivity;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.http.HttpTool;
public class DownloadFileActivity extends Activity{
	private final int textViewId = "fileTextView".hashCode();

wade-mobile-func/src/com/wade/mobile/func/MobileCamera.java

@@ -19,13 +19,12 @@ import android.provider.MediaStore;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
import com.google.zxing.WriterException;
import com.wade.mobile.app.MobileAppInfo;
import com.wade.mobile.app.IpuAppInfo;
import com.wade.mobile.common.scan.activity.CaptureActivity;
import com.wade.mobile.common.scan.encoding.EncodingHandler;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.ui.helper.HintHelper;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.DirectionUtil;
import com.wade.mobile.util.FileUtil;
import com.wade.mobile.util.MobileGraphics;
@@ -82,7 +81,7 @@ public class MobileCamera extends Plugin {
		this.func = Function.getPhoto;
		int type = param.getInt(0);
		String appName = MobileAppInfo.getInstance(context).getAppPath();
		String appName = IpuAppInfo.getAppPath();
		String photoName = appName + "-" + format.format(new Date()) + ".jpg";// 生成照片名称
		DirectionUtil util = DirectionUtil.getInstance(context);
		String photoDir = util.getImageDirection(true);

wade-mobile-func/src/com/wade/mobile/func/MobileDevice.java

@@ -5,13 +5,13 @@ import org.json.JSONArray;
import android.content.Intent;
import android.os.Build;
import com.wade.mobile.app.MobileAppInfo;
import com.ai.ipu.basic.string.EscapeUnescape;
import com.ai.ipu.mobile.app.AppInfoUtil;
import com.wade.mobile.common.nfc.activity.NfcActivity;
import com.wade.mobile.common.nfc.util.NfcConstant;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.ui.helper.HintHelper;
import com.wade.mobile.util.EscapeUnescape;
import com.wade.mobile.util.Utility;
public class MobileDevice extends Plugin {
@@ -26,7 +26,7 @@ public class MobileDevice extends Plugin {
	 * 初始化nfc
	 */
	public void initNfc(JSONArray param) throws Exception {
		if (Build.VERSION.SDK_INT < MobileAppInfo.Android_2_3_3) {
		if (Build.VERSION.SDK_INT < AppInfoUtil.Android_2_3_3) {
			HintHelper.alert(context, "版本过低,不能使用NFC");
			return;
		}

wade-mobile-func/src/com/wade/mobile/func/MobileKeyboard.java

@@ -6,11 +6,11 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import com.wade.mobile.common.keyboard.KeyboardConstants;
import com.ai.ipu.basic.string.EscapeUnescape;
import com.wade.mobile.common.keyboard.KeyboardActivity;
import com.wade.mobile.common.keyboard.KeyboardConstants;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.util.EscapeUnescape;
public class MobileKeyboard extends Plugin {

wade-mobile-func/src/com/wade/mobile/func/MobileLocalLogic.java

@@ -2,6 +2,7 @@ package com.wade.mobile.func;
import org.json.JSONArray;
import com.ai.ipu.basic.reflect.ReflectUtil;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
import com.wade.mobile.common.MobileThread;
@@ -13,7 +14,6 @@ import com.wade.mobile.util.BeanManager;
import com.wade.mobile.util.BizManager;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.Messages;
import com.wade.mobile.util.MobileRefleck;
import com.wade.mobile.util.Utility;
/**
@@ -54,7 +54,7 @@ public class MobileLocalLogic extends Plugin {
		param.put(Constant.Server.ACTION, dataAction);
		Class<?> clazz = Class.forName(className);
		Object result = MobileRefleck.invokeMethod(clazz,
		Object result = ReflectUtil.invokeMethod(clazz,
				BeanManager.createBean(clazz), methodName,
				new Object[] { param }, new Class[] { IData.class });
		return result;

wade-mobile-func/src/com/wade/mobile/func/MobileMap.java

@@ -6,6 +6,8 @@ import org.json.JSONArray;
import android.content.Intent;
import com.ai.ipu.basic.string.StringUtils;
import com.ai.ipu.mobile.ui.UiTool;
import com.ailk.common.data.IData;
import com.ailk.common.data.IDataset;
import com.ailk.common.data.impl.DataMap;
@@ -18,9 +20,7 @@ import com.wade.mobile.common.map.util.MapConstant;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.helper.SharedPrefHelper;
import com.wade.mobile.ui.util.UiTool;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.StringUtil;
public class MobileMap extends Plugin {
	private final int SELECT_LOCATION_CODE = 100;
@@ -39,7 +39,7 @@ public class MobileMap extends Plugin {
		boolean isJump = "true".equals(params.getString(2))?true:false;
		
		IDataset paramDatas = null;
		if(StringUtil.isDataMap(dataString)){
		if(StringUtils.isDataMap(dataString)){
			paramDatas = new DatasetList(new DataMap(dataString));
		}else{
			paramDatas = new DatasetList(dataString);
@@ -52,7 +52,7 @@ public class MobileMap extends Plugin {
				if (iconMap.containsKey(pngName)) {
					id = iconMap.get(pngName);
				} else {
					id = UiTool.getR(context, Constant.DRAWABLE, pngName);
					id = UiTool.getR(Constant.DRAWABLE, pngName);
					iconMap.put(pngName, id);
				}
				data.put(MapConstant.KEY_MARK_ICON, id);

wade-mobile-func/src/com/wade/mobile/func/MobileNetWork.java

@@ -15,12 +15,15 @@ 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.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.bluetooth.activity.ShareByBluetoothActivity;
import com.wade.mobile.common.bluetooth.listener.OnOpenBluetoothListener;
@@ -38,9 +41,7 @@ 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.StringUtil;
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 {
@@ -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,14 @@ public class MobileNetWork extends Plugin {
			}
		} else {
			final BluetoothTool bluetoothTools = new BluetoothTool(context);
			final MobileAppInfo mobileAppInfo = MobileAppInfo.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();
						}

wade-mobile-func/src/com/wade/mobile/func/MobileStorage.java

@@ -6,6 +6,7 @@ import java.util.Map;
import org.json.JSONArray;
import org.json.JSONException;
import com.ai.ipu.basic.string.StringUtil;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
import com.wade.mobile.common.MobileCache;
@@ -13,7 +14,6 @@ import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.helper.SharedPrefHelper;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.StringUtil;
public class MobileStorage extends Plugin{
	private SharedPrefHelper sharedPrefHelper;

wade-mobile-func/src/com/wade/mobile/func/MobileUI.java

@@ -24,10 +24,11 @@ import android.widget.DatePicker;
import android.widget.LinearLayout;
import android.widget.TimePicker;
import com.ai.ipu.mobile.app.AppInfoUtil;
import com.ai.ipu.mobile.ui.UiTool;
import com.ailk.common.data.IData;
import com.ailk.common.data.IDataset;
import com.ailk.common.data.impl.DataMap;
import com.wade.mobile.app.MobileAppInfo;
import com.wade.mobile.common.MobileLog;
import com.wade.mobile.common.contacts.activity.ContactsActivity;
import com.wade.mobile.common.contacts.helper.ContactsData;
@@ -51,7 +52,6 @@ import com.wade.mobile.ui.comp.dialog.YMPickerDialog;
import com.wade.mobile.ui.comp.notification.Notify;
import com.wade.mobile.ui.helper.HintHelper;
import com.wade.mobile.ui.layout.ConstantParams;
import com.wade.mobile.ui.util.UiTool;
import com.wade.mobile.ui.view.FlipperLayout;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.Messages;
@@ -708,7 +708,7 @@ public class MobileUI extends Plugin {
		final String title = param.getString(2);
		final String iconName = param.getString(3);
		final int iconId = isNull(iconName) ? android.R.drawable.ic_dialog_info
				: UiTool.getR(context, Constant.DRAWABLE, iconName);
				: UiTool.getR(Constant.DRAWABLE, iconName);
		Runnable runnable = new Runnable() {
			public void run() {
				MobileUI.this.getChoice(options, values, title, iconId);
@@ -896,11 +896,11 @@ public class MobileUI extends Plugin {
		String iconName = param.getString(2);//消息图标
		String id = param.getString(3);//设置通知id值
		
		title = isNull(title) ? MobileAppInfo.getInstance(context).getAppName() : title;
		title = isNull(title) ? AppInfoUtil.getAppName() : title;
		
		int icon ;//消息icon值
		if(!isNull(iconName)){
			icon = 	UiTool.getR(context, "drawable", iconName);
			icon = 	UiTool.getR("drawable", iconName);
		}else {
			icon = context.getApplicationInfo().icon;
		}

wade-mobile-func/src/com/wade/mobile/util/BizManager.java

@@ -4,6 +4,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.HashMap;
import com.ai.ipu.basic.reflect.ReflectUtil;
import com.ailk.common.data.IData;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.config.ServerDataConfig;
@@ -82,7 +83,7 @@ public class BizManager {
			return method;
		} else {
			synchronized (methods) {
				method = MobileRefleck.getMethod(clazz, methodName, new Class[] { IData.class });
				method = ReflectUtil.getMethod(clazz, methodName, new Class[] { IData.class });
				methods.put(methodKey, method);
				return method;
			}