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

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

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

@@ -55,7 +55,7 @@ public class MainActivity extends TemplateMainActivity {
		// TODO Auto-generated method stub
		super.onPause();
		//Umeng统计
		MobclickAgent.onPause(this);;
		MobclickAgent.onPause(this);
	}
	
//	@Override

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

@@ -15,6 +15,7 @@ import android.os.AsyncTask;
import android.os.Build;
import android.widget.Toast;
import com.ai.ipu.basic.string.StringUtils;
import com.ai.ipu.bluetooth.activity.ShareByBluetoothActivity;
import com.ai.ipu.bluetooth.listener.OnOpenBluetoothListener;
import com.ai.ipu.bluetooth.util.BluetoothTool;
@@ -38,7 +39,6 @@ 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;
@@ -61,7 +61,7 @@ public class MobileNetWork extends Plugin {
		HashSet<String> telSet = null;
		if(!isNull(telString)){
			telSet = new HashSet<String>();
			if(StringUtil.isJSONArray(telString)) {
			if(StringUtils.isJSONArray(telString)) {
				JSONArray teles = new JSONArray(telString);
				for(int i=0; i <teles.length() ; i++){
					telSet.add(teles.getString(i));