iron out bugs

display-client/AndroidManifest.xml

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.ai.ipu.display"
    android:versionCode="1"
    android:versionName="2.2" >
    android:versionName="2.1" >
    <uses-sdk
        android:minSdkVersion="8"

display-client/assets/mobile-action.xml

@@ -26,6 +26,7 @@
	
	<!-- MobileUI -->
	<action name="tip" class="com.wade.mobile.func.MobileUI" method="tip"/>
    <action name="alert" class="com.wade.mobile.func.MobileUI" method="alert"/>
	<action name="openUrl" class="com.wade.mobile.func.MobileUI" method="openUrl"/>
	<action name="openPage" class="com.wade.mobile.func.MobileUI" method="openPage"/>
	<action name="openTemplate" class="com.wade.mobile.func.MobileUI" method="openTemplate"/>
@@ -141,7 +142,6 @@
	
	<!-- Voice -->
	<action name="startListen" class="com.ai.ipu.voice.IpuVoicePlugin" method="startListen"></action>
	<action name="endListen" class="com.ai.ipu.voice.IpuVoicePlugin" method="endListen"></action>
	<action name="voiceSpeak" class="com.ai.ipu.voice.IpuVoicePlugin" method="voiceSpeak"></action>
	
	<!-- BlutTooth -->

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

@@ -1,5 +1,12 @@
require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
	var iscroll = new iScroll("content");
    if(WadeMobile.isIOS()){
        $('#info_list .title').text('iOS系统(点击获取数据)');
    }else if(WadeMobile.isAndroid()){
        $('#info_list .title').text('Android系统(点击获取数据)');
    }else{
        $('#info_list .title').text('系统信息');
    }
	// 调用手机拨打电话
	$("#call").tap(function() {
		// 电话号码
@@ -35,14 +42,20 @@ require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
			},'PLATFORM');
		},'OSVERSION');
		var spans=infoDivs.eq(1).find("span");
		// MAC：获取移动设备的MAC地址。
		WadeMobile.getNetInfo(function(info){
			spans.eq(0).html(info);
		},'MAC');
		// IP:获取移动设备的IPV4地址。
		WadeMobile.getNetInfo(function(info){
			spans.eq(1).html(info);
		},'IP');
        // 频繁调用存在交互丢失的情况，因此加个延迟
        setTimeout(function(){
            // MAC：获取移动设备的MAC地址。
            WadeMobile.getNetInfo(function(info){
                spans.eq(0).html(info);
            },'MAC');
            // IP:获取移动设备的IPV4地址。
            WadeMobile.getNetInfo(function(info){
                spans.eq(1).html(info);
            },'IP');
        },200);
		// IMEI：获取移动设备国际身份码。 
		WadeMobile.getSysInfo(function(info){
			spans.eq(2).html(info);

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

@@ -1,5 +1,6 @@
require(["domReady!","wadeMobile","mobile","util"], function(doc,WadeMobile,Mobile) {
	new iScroll("content");
    alert(111)
	$("#progressBar").tap(function() {
		WadeMobile.loadingStart('加载中……', '进度条');
		// 关闭进度条

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

@@ -1,18 +1,16 @@
require(['jcl','wadeMobile'], function($,WadeMobile) {
	$('#voiceRecognize').on('touchstart', function() {
		WadeMobile.startListen();
	});
    require([ 'jcl','wadeMobile'], function($,wadeMobile) {
        $('#voiceRecognize').on('touchend', function() {
            wadeMobile.startListen("111",function(val){
                $('#myText').text(val);
            });
        });
	$('#voiceRecognize').on('touchend', function() {
		WadeMobile.endListen(function(val){
			$('#voiceText').text(val);
		});
	});
	
	$('#voiceRecognize').on('touchcancel', function() {
		WadeMobile.endListen(function(val){
			$('#voiceText').text(val);
		});
    });
	$('#voiceRecognize').on('touchstart', function() {
        wadeMobile.startListen("111",function(val){
            $('#voiceText').text(val);
        });
	});
	

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

@@ -304,16 +304,11 @@ define(["require"],function(require) {
				execute("scanMultiple",[]);
			},showNotification:function(content,title,icon,id){
				execute("showNotification",[content,title,icon,id]);
			},startListen:function(isUseDefautlDialog,callback,err){
			},startListen:function(callback,err){
				if(callback){
					WadeMobile.callback.storageCallback("startListen",callback);
				}
				execute("startListen",[isUseDefautlDialog],err);
			},endListen:function(callback,err){
				if(callback){
					WadeMobile.callback.storageCallback("endListen",callback);
				}
				execute("endListen",[],err);
				execute("startListen",[],err);
			},voiceSpeak:function(content,err){
				execute("voiceSpeak",[content],err);
			}

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

@@ -150,7 +150,7 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
            //alert("准备调用"+action+" 参数:"+args);
            console.log("action:"+action+" param:"+args);
        }
        
        var WADE_SCHEME = "wade://";
        var url = WADE_SCHEME+action+"?param="+encodeURIComponent(args)+"&callback="+callbackKey;
        //一个动作请求客户端的最大数量，超过会造成请求覆盖
@@ -235,10 +235,10 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
				globalErrorKey = callbackKey;
				var callbackItem = callbackDefine[callbackKey];
				if (callbackItem) {
					data = data=="null"?null:data;
					data = data=="null"?null:data;
					if(data){
		        		if(isEncode){
		        			data = decodeURIComponent(data);
		        			data = decodeURIComponent(data);
		        		}
		        	}
		            if (callbackItem.callback) {   
@@ -296,6 +296,18 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
		console.log(msg);
		alert(msg);
	};
    /**
     * 重写alert方法，解决在iOS7以上不可点击问题
     * @param name
     */
    window.alert = function(name){
        var iframe = document.createElement("IFRAME");
        iframe.style.display="none";
        iframe.setAttribute("src", 'data:text/plain,');
        document.documentElement.appendChild(iframe);
        window.frames[0].window.alert(name);
        iframe.parentNode.removeChild(iframe);
    }
	
	//动态执行js方法
	function _eval(code,action){

display-server/web/res/js/ui/wm-css3animate.js

@@ -36,7 +36,7 @@
 /* global wm*/
 /* global numOnly*/
define(["jcl"],function($){
define(["jcl","wmBase"],function($){
	"use strict";
    var cache = [];
    var objId = function(obj) {

display-server/web/template/webapp/plugin/Map.html

@@ -2,7 +2,7 @@
<html class="s_bs">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="target-densitydpi=device-dpi, width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
<title>地图</title>
{%>template/common/Head.html%}
<script type="text/javascript" src="biz/js/plugin/map.js" ></script>

display-server/web/template/webapp/plugin/Network.html

@@ -2,7 +2,7 @@
<html class="s_bs">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="target-densitydpi=device-dpi, width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
<title>网络</title>
{%>template/common/Head.html%}
<script type="text/javascript" src="biz/js/plugin/network.js"></script>

display-server/web/template/webapp/plugin/UI/UI.html

@@ -2,7 +2,7 @@
<html class="s_bs">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="target-densitydpi=device-dpi, width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
<title>web UI 组件</title>
{%>template/common/Head.html%}
<script type="text/javascript" src="biz/js/plugin/ui/ui.js"></script>