Merge branch 'master' of

http://114.215.100.48:3000/ipu/android-share.git

Conflicts:
	wade-mobile-common/libs/wade-mobile.jar

display-client/.classpath

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

display-client/.gitignore

@@ -2,5 +2,6 @@
/bin
/gen
/proguard
/.classpath
/.classpath
/project.properties

display-client/project.properties

@@ -1,18 +0,0 @@
<<<<<<< HEAD
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
android.library=false
android.library.reference.1=../wade-mobile-common
android.library.reference.2=../wade-mobile-lib

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

@@ -1,115 +1,115 @@
require(["domReady!","wadeMobile","mobile","util"], function(doc,WadeMobile,Mobile) {
	new iScroll("content");
	$("#progressBar").tap(function() {
		WadeMobile.loadingStart('加载中……', '进度条');
		// 关闭进度条
		setTimeout(function(){
			WadeMobile.loadingStop();
		}, 2000);
	});
	
	$("#progressBar2").tap(function() {
		WadeMobile.loadingStart('加载中……', '进度条','true');
		
	});
	
	$("#toastLong").tap(function() {
		WadeMobile.tip('我是一条提示信息！', 1);
	});
	
	$("#toastShort").tap(function() {
		WadeMobile.tip('我是一条提示信息！', 0);
	});
	
	$("#date1").tap(function() {
		WadeMobile.getDate(function(time) {
			$("#dateContent1").html(time);
		});
	});
	
	$("#date2").tap(function() {
		WadeMobile.getDate(function(time) {
			$("#dateContent2").html(time);
		}, '2012年12月', 'yyyy年MM月');
	});
	
	$("#customDialog").tap(function() {
		Mobile.openDialog("UI-CustomDialog", null, function(result) {
			alert(result);
		},0.6,0.6);
	});
	
	$("#customWindow").tap(function() {
		var param = Wade.DataMap();
		param.put("LEVEL", 1);
		Mobile.openWindow("UI-CustomWindow", param, function(result) {
			alert(result);
		});
	});
	
	$("#slidingMenu").tap(function() {
		Mobile.openSlidingMenu("UI-SlidingMenu",null,function(result){
			alert(result);
		});
	});
	/*
	 
	 
	 		intent = new Intent();
		intent.setClass(this, ContactsActivity.class);
		//contactsData.addNoneTypeRecord(1001, "我是1001");
		//contactsData.addNoneTypeRecord(1001, "我是1002");
		//addNoneTypeRecord("新的朋友1");
		//addNoneTypeRecord("群聊");
		//addNoneTypeRecord("标签");
		//addNoneTypeRecord("公众号");
		addRecord("LLL");
		addRecord("芙兰");
		addRecord("妹妹");
		addRecord("你好");
		addRecord("林小姐");
		addRecord("联盟");
		addRecord("L");
		addRecord("xdsfsdggsdsf");
		addRecord("星星");
		addRecord("靴刀誓死");
		addRecord("Java");
		addRecord("倒塌");
		addRecord("黑人");
		addRecord("~~在");
		addRecord("这个人");
		intent.putExtra(ContactsConstant.KEY_CONTACTS_DATA, contactsData);
		ContactsSettings settings = new ContactsSettings();
		settings.getChildViewSettings().setChildViewNormalBgColor(Color.parseColor("#FFDDCC"));
		settings.getTypeBarViewSettings().setPopupTextColor(Color.BLUE);
		settings.getChildViewSettings().setWithImage(true);
		//settings.getChildViewSettings().setTextMarginLeft(8);
		settings.getChildViewSettings().setChildViewStyle(ContactsConstant.NORMAL);
		//settings.getGroupViewSettings().
		intent.putExtra(ContactsConstant.KEY_CONTACTS_SETTINGS, settings);
	 
	 
	 */
	$("#getContactsView").tap(function(){
		alert("将要打开通讯录UI--" + WadeMobile.getContactsView);
		//1.
		//当前传入callback,array,array
		//改造成入参为：callback,datamap,datasetlist1,datasetlist2
		//设置集：其中，datamap对应 settings 三个map 其中一个为：key - group value -  <chileNormalBgColor,"#FFDDGG"> 第二个: key - child value - map2
		//数据集：datasetlist1里面有无数个map,每个map里面是k-v，如：key - id,value - 1001，key - value,value - 张三,key - type,value - 1。所以说，有价值的是：id,value,type 
		//数据集：datasetlist2里面有无数个map,每个map里面是k-v，如：key - id,value - 1001，key - value,value - 张三,key - type,value - 1。所以说，有价值的是：id,value,type 
		//d1.put("ID",001);
		//d1.put("TYPE",100);
		//list1.add(d1);
		//list1.add(d2);
		//2.异常情况的优化，比如，颜色传入错误时，无法正常转换出的时候，空指针。(类似这种异常情况的优化，暂时可以缓一下。明显的可以处理一下)
		//3.最好可以加一些注释
		//4.侧边的字母索引可以外围控制显示(弄成配置项)
		WadeMobile.getContactsView(function(result){
			alert("选择的结果是：" + result.toString());
		},
		["新的朋友","群聊","标签","公众号"],
		["LLL","芙兰","妹妹","你好","林小姐","联盟","L","xdsfsdggsdsf","星星","靴刀誓死","Java","倒塌","黑人","~~在","这个人"]
		);
	});
});
require(["domReady!","wadeMobile","mobile","util"], function(doc,WadeMobile,Mobile) {
	new iScroll("content");
	$("#progressBar").tap(function() {
		WadeMobile.loadingStart('加载中……', '进度条');
		// 关闭进度条
		setTimeout(function(){
			WadeMobile.loadingStop();
		}, 2000);
	});
	
	$("#progressBar2").tap(function() {
		WadeMobile.loadingStart('加载中……', '进度条','true');
		
	});
	
	$("#toastLong").tap(function() {
		WadeMobile.tip('我是一条提示信息！', 1);
	});
	
	$("#toastShort").tap(function() {
		WadeMobile.tip('我是一条提示信息！', 0);
	});
	
	$("#date1").tap(function() {
		WadeMobile.getDate(function(time) {
			$("#dateContent1").html(time);
		});
	});
	
	$("#date2").tap(function() {
		WadeMobile.getDate(function(time) {
			$("#dateContent2").html(time);
		}, '2012年12月', 'yyyy年MM月');
	});
	
	$("#customDialog").tap(function() {
		Mobile.openDialog("UI-CustomDialog", null, function(result) {
			alert(result);
		},0.6,0.6);
	});
	
	$("#customWindow").tap(function() {
		var param = Wade.DataMap();
		param.put("LEVEL", 1);
		Mobile.openWindow("UI-CustomWindow", param, function(result) {
			alert(result);
		});
	});
	
	$("#slidingMenu").tap(function() {
		Mobile.openSlidingMenu("UI-SlidingMenu",null,function(result){
			alert(result);
		});
	});
	/*
	 
	 
	 		intent = new Intent();
		intent.setClass(this, ContactsActivity.class);
		//contactsData.addNoneTypeRecord(1001, "我是1001");
		//contactsData.addNoneTypeRecord(1001, "我是1002");
		//addNoneTypeRecord("新的朋友1");
		//addNoneTypeRecord("群聊");
		//addNoneTypeRecord("标签");
		//addNoneTypeRecord("公众号");
		addRecord("LLL");
		addRecord("芙兰");
		addRecord("妹妹");
		addRecord("你好");
		addRecord("林小姐");
		addRecord("联盟");
		addRecord("L");
		addRecord("xdsfsdggsdsf");
		addRecord("星星");
		addRecord("靴刀誓死");
		addRecord("Java");
		addRecord("倒塌");
		addRecord("黑人");
		addRecord("~~在");
		addRecord("这个人");
		intent.putExtra(ContactsConstant.KEY_CONTACTS_DATA, contactsData);
		ContactsSettings settings = new ContactsSettings();
		settings.getChildViewSettings().setChildViewNormalBgColor(Color.parseColor("#FFDDCC"));
		settings.getTypeBarViewSettings().setPopupTextColor(Color.BLUE);
		settings.getChildViewSettings().setWithImage(true);
		//settings.getChildViewSettings().setTextMarginLeft(8);
		settings.getChildViewSettings().setChildViewStyle(ContactsConstant.NORMAL);
		//settings.getGroupViewSettings().
		intent.putExtra(ContactsConstant.KEY_CONTACTS_SETTINGS, settings);
	 
	 
	 */
	$("#getContactsView").tap(function(){
		alert("将要打开通讯录UI--" + WadeMobile.getContactsView);
		//1.
		//当前传入callback,array,array
		//改造成入参为：callback,datamap,datasetlist1,datasetlist2
		//设置集：其中，datamap对应 settings 三个map 其中一个为：key - group value -  <chileNormalBgColor,"#FFDDGG"> 第二个: key - child value - map2
		//数据集：datasetlist1里面有无数个map,每个map里面是k-v，如：key - id,value - 1001，key - value,value - 张三,key - type,value - 1。所以说，有价值的是：id,value,type 
		//数据集：datasetlist2里面有无数个map,每个map里面是k-v，如：key - id,value - 1001，key - value,value - 张三,key - type,value - 1。所以说，有价值的是：id,value,type 
		//d1.put("ID",001);
		//d1.put("TYPE",100);
		//list1.add(d1);
		//list1.add(d2);
		//2.异常情况的优化，比如，颜色传入错误时，无法正常转换出的时候，空指针。(类似这种异常情况的优化，暂时可以缓一下。明显的可以处理一下)
		//3.最好可以加一些注释
		//4.侧边的字母索引可以外围控制显示(弄成配置项)
		WadeMobile.getContactsView(function(result){
			alert("选择的结果是：" + result.toString());
		},
		["新的朋友","群聊","标签","公众号"],
		["LLL","芙兰","妹妹","你好","林小姐","联盟","L","xdsfsdggsdsf","星星","靴刀誓死","Java","倒塌","黑人","~~在","这个人"]
		);
	});
});

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

@@ -23,15 +23,21 @@ define(["require"],function(require) {
				}
				storageCallback("getDate",callback);
				execute("getDate", [date,format],err);
			},getContactsView:function(callback,arrayNoneType,array,err){
				if(arrayNoneType==undefined){
					arrayNoneType = [];
			},getContactsView:function(callback,list1,list2,err){
				if (typeof(list1)=="object" && (list1 instanceof Wade.DataMap)) {
					alert("==========");
					var list1 = new Wade.DatasetList();
					list1.add(list1);
					list1 = list1;
				}
				if(array == undefined){
					array = [];
				if (typeof(list2)=="object" && (list1 instanceof Wade.DataMap)) {
					alert("==========2");
					var list2 = new Wade.DatasetList();
					list2.add(list2);
					list2 = list2;
				}
				storageCallback("getContactsView",callback);
				execute("getContactsView", [arrayNoneType,array],err);
				execute("getContactsView", [list1,list2],err);
			},getPhoto:function(callback,type,err){//获取照片
				if(type==undefined){
					type = 1;//0-Base64编码的字符串 1- 文件路径

ipu-server/.gitignore

@@ -1,4 +1,3 @@
/.classpath
/.settings
/ipu-server.war
/web/res.version.properties

wade-mobile-common/更新纪要

@@ -2,4 +2,10 @@
更新人:黄波
更新时间:2015.4.18
更新文件:wade-mobile-data.jar
更新备注:无
更新内容:优化加密，去掉了bcprov-jdk16-140.jar，RSA.java中使用RSA/ECB/PKCS1Padding即可。
更新人:黄波
更新时间:2015.10.23
更新文件:RSA.java
更新备注:无

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

@@ -199,7 +199,6 @@ public class MobileNetWork extends Plugin {
		}
	}
	@SuppressWarnings({ "static-access" })
	private String requestBizData(String dataAction, IData param) throws Exception {
		Map<String,String> postData = transPostData(dataAction, param);
		String encode = MobileConfig.getInstance().getEncode();
@@ -207,7 +206,7 @@ public class MobileNetWork extends Plugin {
		dataUrl = HttpTool.urlEncode(dataUrl, encode);
		String result = HttpTool.httpRequest(MobileConfig.getInstance().getRequestUrl(),
				dataUrl, Constant.HTTP_POST);
		if (ServerDataConfig.getInstance().isEncrypt(dataAction)) {
		if (ServerDataConfig.isEncrypt(dataAction)) {
			result = MobileSecurity.responseDecrypt(result);
		}
		return result;
@@ -218,15 +217,17 @@ public class MobileNetWork extends Plugin {
		Map<String, String> postData = new HashMap<String, String>();
		postData.put(Constant.Server.ACTION, dataAction);
		if (ServerDataConfig.isEncrypt(dataAction)) {
			String paramData = dataParam == null ? "{}" : dataParam.toString();
			MobileSecurity.init(context);
			/* 参数加密处理 */
			String encryptData = MobileSecurity.requestEncrypt(paramData);
			String key = MobileSecurity.getDesKey(context);
			/* 将+号全部转换成-号 */
			encryptData = encryptData.replace("+", "-");
			key = key.replace("+", "-");
			postData.put(Constant.Server.DATA, encryptData);
			String key = MobileSecurity.getDesKey();
			key = key.replace("+", "-");//将+号全部转换成-号
			postData.put(Constant.Server.KEY, key);
			
			if(dataParam!=null){
				String encryptData = MobileSecurity.requestEncrypt(dataParam.toString());
				encryptData = encryptData.replace("+", "-");
				postData.put(Constant.Server.DATA, encryptData);
			}
		} else {
			if (dataParam != null) {
				postData.put(Constant.Server.DATA, dataParam.toString());
@@ -311,7 +312,7 @@ public class MobileNetWork extends Plugin {
		uploadWithServlet(filePaths, dataAction, dataParam);
	}
	
	public void uploadWithServlet(final JSONArray filePaths, String dataAction, IData dataParam) throws Exception {
	public void uploadWithServlet(final JSONArray filePaths, final String dataAction, IData dataParam) throws Exception {
		// TODO Auto-generated method stub
		final Map<String, String> postData = transPostData(dataAction, dataParam);
		final Map<String, Object> filePostData = new HashMap<String, Object>();
@@ -333,6 +334,9 @@ public class MobileNetWork extends Plugin {
						filePostData.put("FILE"+i, filePath);//再装载文件
					}
					result = UnirestUtil.uploadByPost(MobileConfig.getInstance().getRequestUrl(), filePostData);
					if (ServerDataConfig.isEncrypt(dataAction)) {
						result = MobileSecurity.responseDecrypt(result);
					}
				}catch(Exception e){
					MobileNetWork.this.error(e.getMessage());// 报错回调
				}

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

@@ -8,6 +8,7 @@ import java.util.Date;
import java.util.Map;
import org.json.JSONArray;
import org.json.JSONObject;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
@@ -22,7 +23,9 @@ import android.widget.DatePicker;
import android.widget.LinearLayout;
import com.ailk.common.data.IData;
import com.ailk.common.data.IDataset;
import com.ailk.common.data.impl.DataMap;
import com.ailk.common.data.impl.DatasetList;
import com.wade.mobile.common.MobileLog;
import com.wade.mobile.common.contacts.activity.ContactsActivity;
import com.wade.mobile.common.contacts.helper.ContactsData;
@@ -51,6 +54,7 @@ import com.wade.mobile.ui.view.FlipperLayout;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.EscapeUnescape;
import com.wade.mobile.util.Messages;
import com.wade.mobile.util.StringUtil;
import com.wade.mobile.util.Utility;
public class MobileUI extends Plugin{
@@ -511,15 +515,32 @@ public class MobileUI extends Plugin{
		}
	}
	
	public void getContactsView(JSONArray paArray)throws Exception{
		JSONArray arrayNoneType = paArray.getJSONArray(0);
		JSONArray array = paArray.getJSONArray(1);
	public void getContactsView(JSONArray params)throws Exception{
	    String dataString1 = params.getString(0);
        IDataset list1 = null;
        if(StringUtil.isDataMap(dataString1)){
            list1 = new DatasetList(new DataMap(dataString1));
        }else{
            list1 = new DatasetList(dataString1);
        }
        String dataString2 = params.getString(1);
        IDataset list2 = null;
        if(StringUtil.isDataMap(dataString2)){
            list2 = new DatasetList(new DataMap(dataString2));
        }else{
            list2 = new DatasetList(dataString1);
        }
		ContactsData contactsData =new ContactsData();
		for(int id = 0; id < arrayNoneType.length() ; id++ ){
			contactsData.addNoneTypeRecord(id, arrayNoneType.getString(id));
		IData data = null;
		for(int id = 0; id < list1.size() ; id++ ){
		    data = new DataMap();
		    data = list1.getData(id);
			contactsData.addNoneTypeRecord(id, data.getString("VALUE"));
		}
		for(int id = 0; id <array.length() ; id++ ){
			contactsData.addRecord(id, array.getString(id));
		for(int id = 0; id <list2.size() ; id++ ){
		    data = new DataMap();
		    data = list2.getData(id);
            contactsData.addRecord(id, data.getString("VALUE"));
		}
		Intent intent = new Intent();
		intent.setClass(context, ContactsActivity.class);
@@ -706,6 +727,7 @@ public class MobileUI extends Plugin{
			data.put("ID", record.getId());
			data.put("TYPE", record.getType());
			data.put("VALUE", record.getValue());
			data.put("COLOR", record.getColor());
			callback(data.toString());
		}
	}