Merge branch 'master' of http://114.215.100.48:3000/ipu/android-share

display-client/AndroidManifest.xml

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.ai.mobile.display"
    android:versionCode="1"
    android:versionName="1.3" >
    android:versionName="1.0" >
    <uses-sdk
        android:minSdkVersion="8"
@@ -105,10 +105,6 @@
            android:name="com.wade.mobile.common.audio.activity.AudioPlayerActivity"
            android:theme="@style/AudioDialogTheme" >
        </activity>
        <activity
            android:name="com.wade.mobile.common.simplemedia.activity.SARecorder"
            android:theme="@style/AudioDialogTheme" >
        </activity>
        <!-- 标记地图 -->
        <activity android:name="com.wade.mobile.common.map.activity.MarkMapActivity">
        </activity>
@@ -122,7 +118,7 @@
        </activity>
        
        <!-- 键盘 -->
        <activity android:name="com.wade.mobile.common.keyboard.keyboardActivity"
        <activity android:name="com.wade.mobile.common.keyboard.KeyboardActivity"
            android:theme="@android:style/Theme.Translucent">
        </activity>
        <!-- 手势锁 -->

display-server/web/res/js/base/jcl.js

@@ -519,7 +519,8 @@ define(["zepto"],function($){
			if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
				.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
				.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
						
				console.log("########data");
				//先尝试使用浏览器内部JSON解析器
				return window.JSON && window.JSON.parse ?
					window.JSON.parse( data ) :
@@ -580,7 +581,8 @@ define(["zepto"],function($){
			str=str.replace(/\\\":(null|undefined)(,|})/g,"\\\":\\\"\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的空值
			str=str.replace(/\\\":(true|false)(,|})/g,"\\\":\\\"$1\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的布尔值
			str=str.replace(/\\\":(-)?([0-9\.]+)(,|})/g,"\\\":\\\"$1$2\\\"$3"); //处理KEY值里放IData或IDataset的toString串里的数值
			str=str.replace(/\\\"/g,"!~b~!"); //把字符串中原有的 \" 替换，处理KEY值里放IData或IDataset的toString串的情况
			//ybf326
			//str=str.replace(/\\\"/g,"!~b~!"); //把字符串中原有的 \" 替换，处理KEY值里放IData或IDataset的toString串的情况
			
			str=str.replace(/:(null|undefined)(,|})/g,":\"\"$2");    //将null或undefined替换为空字符
			str=str.replace(/:(true|false)(,|})/g,":\"$1\"$2");      //将true|false替换为字符串
@@ -617,9 +619,10 @@ define(["zepto"],function($){
					case "\n":
						out +="\u005Cn";
						break;
					case "\"":
					//ybf326
					/*case "\"":
						out +="!~a~!";
						break;
						break;*/
					default:
						out += chr;
					break;
@@ -627,6 +630,8 @@ define(["zepto"],function($){
			}
			str = out;
		
			//ybf326
			/*
			//第一次替换处理JSON格式的双引号字符
			str=str.replace(/{!~a~!/g,"{\""); //处理 {"
			str=str.replace(/!~a~!}/g,"\"}");  //处理 "}
@@ -641,6 +646,7 @@ define(["zepto"],function($){
			str=str.replace(/\u005C!~a~!/g,"\u005C\""); //本身就有\的还原
			str=str.replace(/!~a~!/g,"\u005C\"");    //其它的加上\符号
			str=str.replace(/!~b~!/g,"\u005C\"");   //恢复 !~b~! 为 \"
			*/
			
			//str=str.replace(/\r/g,"\u005Cr");		
			//str=str.replace(/\n/g,"\u005Cn");	
@@ -678,6 +684,10 @@ define(["zepto"],function($){
					case "\"":
						out +="\u005C\"";
						break;
					//ybf326
					case "\\":
						out += "\u005C\u005C";
						break;
					default:
						out += chr;
					break;
@@ -711,7 +721,9 @@ define(["zepto"],function($){
		},
		parseString:function(str){
			str=$.parseJsonString(str);
			(new Function("this.parseObject(" +str+")")).apply(this);
			console.log("#####this.parseObject");
			return window.JSON && window.JSON.parse ? this.parseObject(window.JSON.parse(str)) 
					: (new Function("this.parseObject(" +str+")")).apply(this);
			//if(typeof(o)=="object")this.parseObject(o);
		},
		parseObject:function(obj){
@@ -800,7 +812,9 @@ define(["zepto"],function($){
		},	
		parseString:function(str){
			str=$.parseJsonString(str);
			(new Function("this.parseArray(" +str+")")).apply(this);	
			console.log("#####this.parseArray");
			return window.JSON && window.JSON.parse ? this.parseArray(window.JSON.parse(str)) : 
				(new Function("this.parseArray(" +str+")")).apply(this);	
		},
		parseArray:function(o){
			for(var i=0;i<o.length;i++){

ipu-client/AndroidManifest.xml

@@ -36,6 +36,9 @@
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
    
    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <application
        android:allowBackup="false"
@@ -57,6 +60,10 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
        
        <!-- 注册推送服务 -->
        <service android:name="com.ai.mobile.im.PushService" android:process=":WmPush" />
        
        <!-- 对话框 -->
        <activity
            android:name="com.wade.mobile.ui.activity.CustomDialogActivity"
@@ -83,24 +90,64 @@
        </activity>
        <!-- 音乐播放服务 -->
        <service android:name="com.wade.mobile.common.audio.play.AudioPlayerService" />
        <!-- 录制声音 -->
        <!-- 录制声音
        <activity
            android:name="com.wade.mobile.common.audio.activity.AudioRecorderActivity"
            android:theme="@style/AudioDialogTheme" >
        </activity> -->
         <activity
            android:name="com.wade.mobile.common.simplemedia.activity.SARecorder"
            android:theme="@style/AudioDialogTheme" >
        </activity>
		<!-- 播放音乐 -->
        <activity
            android:name="com.wade.mobile.common.audio.activity.AudioPlayerActivity"
            android:theme="@style/AudioDialogTheme" >
        </activity>
        <activity
            android:name="com.wade.mobile.common.simplemedia.activity.SARecorder"
            android:theme="@style/AudioDialogTheme" >
        </activity>
        <!-- 标记地图 -->
        <activity android:name="com.wade.mobile.common.map.activity.MarkMapActivity">
        </activity>
        <activity android:name="com.ipu.client.test.TestActivity" ></activity>
        <!-- 通讯录UI -->
        <activity android:name="com.wade.mobile.common.contacts.activity.ContactsActivity">
        </activity>
        <!-- 设定位置 -->
        <activity
            android:name="com.wade.mobile.common.map.activity.SelectLocationActivity"
            android:screenOrientation="portrait" >
        </activity>
        
        <!-- 键盘 -->
        <activity android:name="com.wade.mobile.common.keyboard.KeyboardActivity"
            android:theme="@android:style/Theme.Translucent">
        </activity>
        <!-- 手势锁 -->
        <activity android:name="com.wade.mobile.common.screenlock.ScreenUnlockActivity" 
            android:theme="@android:style/Theme.NoTitleBar">
        </activity> 
        <activity android:name="com.wade.mobile.common.screenlock.SetScreenLockActivity" 
            android:theme="@android:style/Theme.NoTitleBar">
        </activity>
        
         <!-- YunBa Start -->
        <meta-data
            android:name="YUNBA_APPKEY"
            android:value="5630418ff085fc471efdf2c9" />
        <service android:name="io.yunba.android.core.YunBaService" >
        </service>
        <receiver android:name="io.yunba.android.core.YunBaReceiver" >
            <intent-filter>
                <action android:name="android.intent.action.USER_PRESENT" />
                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
            </intent-filter>
        </receiver>
        
        <!-- YunBa End -->
    </application>
</manifest>

ipu-client/assets/mobile-action.xml

@@ -115,5 +115,15 @@
	<action name="setCallbackForPushWithYunba" class="com.ai.ipu.mobile.push.YunBaPush" method="setCallbackForPush"></action>
	
	<action name="getContacts" class="com.wade.mobile.func.MobileContactDetail" method="getContacts"></action>
	
	<!-- keyboard -->
	<action name="openKeyboard" class="com.wade.mobile.func.MobileKeyboard" method="openKeyboard"></action>
	
	<action name="setScreeLock" class="com.wade.mobile.func.MobileScreenLock" method="setScreeLock"></action>
	<action name="screeUnlock" class="com.wade.mobile.func.MobileScreenLock" method="screeUnlock"></action>
	
	<action name="openNative" class="com.ai.mobile.func.MobileOpenApp" method="openNative"></action>
	
	<action name="openBrowser" class="com.ipu.func.Util" method="openBrowser" ></action>
</actions>

ipu-client/lint.xml

@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
</lint>

ipu-client/mac.bak.classpath

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

ipu-client/res/menu/main.xml

@@ -1,6 +1,4 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    tools:context="com.ai.wm_base_client.MainActivity" >
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
    <item
        android:id="@+id/action_settings"

ipu-client/res/values-sw600dp/dimens.xml

@@ -0,0 +1,8 @@
<resources>
    <!--
         Customize dimensions originally defined in res/values/dimens.xml (such as
         screen margins) for sw600dp devices (e.g. 7" tablets) here.
    -->
</resources>

ipu-client/res/values-sw720dp-land/dimens.xml

@@ -0,0 +1,9 @@
<resources>
    <!--
         Customize dimensions originally defined in res/values/dimens.xml (such as
         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
    -->
    <dimen name="activity_horizontal_margin">128dp</dimen>
</resources>

ipu-client/src/MainActivity.java.local

@@ -1,62 +0,0 @@
import android.os.Bundle;
import android.view.KeyEvent;
import com.wade.mobile.app.AppRecord;
import com.wade.mobile.app.MobileUtil;
import com.wade.mobile.frame.activity.TemplateMainActivity;
import com.wade.mobile.frame.activity.TemplateMobileActivity;
import com.wade.mobile.frame.config.ServerConfig;
import com.wade.mobile.frame.template.TemplateManager;
import com.wade.mobile.func.MobileUI;
import com.wade.mobile.ui.comp.dialog.ConfirmBlockDialog;
import com.wade.mobile.ui.view.FlipperLayout;
import com.wade.mobile.util.Messages;
public class MainActivity extends TemplateMobileActivity {
	@Override
	public void onCreate(Bundle savedInstanceState) {
		setTheme(R.style.Theme_Sherlock_Light);
		//设置本地的密钥
		TemplateManager.initResKey("abcdefgh");
		if (AppRecord.isFirst(this) && !MobileUtil.checkWifiActive(this)) {
			ConfirmBlockDialog dialog = new ConfirmBlockDialog(this, "下载提醒",
					"即将下载应用资源,连接wifi将为您节省流量,是否继续下载");
			dialog.show();
			if (dialog.getResult() == ConfirmBlockDialog.Result.OK) {
				super.onCreate(savedInstanceState);
			} else {
				android.os.Process.killProcess(android.os.Process.myPid());// 同一线程调用会导致异常
				System.exit(0); // 经典退出
			}
		} else {
			super.onCreate(savedInstanceState);
		}
	}
	
	@Override
	public boolean onKeyDown(int keyCode, KeyEvent event) {
		if (keyCode == KeyEvent.KEYCODE_BACK) {
			FlipperLayout flipperLayout= getFlipperLayout();
			if(flipperLayout!=null){
				//回到首页的时候就直接退出应用
				String indexPage = ServerConfig.getInstance().getValue("indexPage");
				String tagPage = flipperLayout.getCurrView().getTag().toString();
				if(flipperLayout.isCanBack()&&!indexPage.equals(tagPage)){
					flipperLayout.back();
					return true;
				}
			}
			getWadeMobileClient().shutdownByConfirm(Messages.CONFIRM_CLOSE);
			return true;
		}
		return false;
	}
	
	@Override
	protected void initBasePath() {
		// TODO Auto-generated method stub
		TemplateManager.initBasePath("assets/");
	}
}

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

@@ -4,16 +4,12 @@ import java.net.ConnectException;
import java.net.SocketTimeoutException;
import android.os.Bundle;
import android.view.View;
import com.wade.mobile.app.AppRecord;
import com.wade.mobile.app.MobileOperation;
import com.wade.mobile.app.MobileUtil;
import com.wade.mobile.frame.activity.TemplateMainActivity;
import com.wade.mobile.frame.config.ServerConfig;
import com.wade.mobile.ui.comp.dialog.ConfirmBlockDialog;
import com.wade.mobile.ui.view.FlipperLayout;
import com.wade.mobile.util.Messages;
public class MainActivity extends TemplateMainActivity {
	@Override
@@ -34,25 +30,6 @@ public class MainActivity extends TemplateMainActivity {
	}
	
	@Override
	public void onBackPressed() {
		try {
			FlipperLayout flipperLayout= getFlipperLayout();
			if(flipperLayout!=null){
				//回到首页的时候就直接退出应用
				String indexPage = ServerConfig.getInstance().getValue("indexPage");
				View currView = flipperLayout.getCurrView();
				if(flipperLayout.isCanBack()&& currView != null && (!indexPage.equals(currView.getTag().toString()))){
					flipperLayout.back();
					return;
				}
			}
			getWadeMobileClient().shutdownByConfirm(Messages.CONFIRM_CLOSE);
		} catch (Exception e) {
			getWadeMobileClient().shutdownByConfirm(Messages.CONFIRM_CLOSE);
		}
	}
	@Override
	protected void error(Exception e) {
		if (e instanceof ConnectException || e  instanceof SocketTimeoutException) {
			MainActivity.this.runOnUiThread(new Runnable() {

ipu-server/.gitignore

@@ -4,8 +4,7 @@
/ipu-server.war
/web
/res.version.properties
/web/res.version.properties
/.DS_Store

ipu-server/etc/database.xml

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<database>
 <ipuOracle
	<ipuOracle
		type="dbcp"
		driver="oracle.jdbc.driver.OracleDriver"
		url="jdbc:oracle:thin:@10.7.5.75:1521:ncrmdb"
		url="jdbc:oracle:thin:@127.0.0.1:1521:ncrmdb"
		user="bband"
		passwd="bband-123"
		initialSize="5"

ipu-server/web/biz/js/VerifyCodeImage.js

@@ -1,8 +0,0 @@
require(["mobile","zepto","common"],function(Mobile,$,Common){
	$("#verifyIMG").click(function(){
		Common.callSvc("VerifyCodeImage.generateImage", null, function(data){
			var resultData = new Wade.DataMap(data);
			$("#verifyIMG").attr("src", "data:image/png;base64, " + resultData.get("VERIFY_IMG"));
		});
	});
});

ipu-server/web/biz/js/common/biz-mobile.js

@@ -10,6 +10,8 @@ define(["require"],function(require) {
				execute("openAnimation", [],err);
			},shutAnimation:function(err){ //关闭动画
				execute("shutAnimation", [],err);
			},openNative:function(data,err){
				execute("openNative", [data], err);
			}
		};
	})();
@@ -20,8 +22,14 @@ define(["require"],function(require) {
		if(!WadeMobile){
			WadeMobile = require("wadeMobile")
		}
        return WadeMobile.execute(action, args, error, success)
	}
	function storageCallback(action,callback,isEscape,isBase64) {
		/*循环依赖,懒加载*/
		return require("wadeMobile").execute(action, args, error, success);
		if(!WadeMobile){
			WadeMobile = require("wadeMobile")
		}
		WadeMobile.callback.storageCallback(action,callback,isEscape,isBase64)
	}
	
	return BizMobile;

ipu-server/web/biz/js/common/common.js

@@ -1,132 +1,139 @@
/**
 * 将一些公共的业务处理放入此对象中
 * 将一些公共的业务处理放入此对象中 
 */
define([ "jcl", "mobile", "clientTool" ], function(Wade, Mobile, ClientTool) {
	var Common = new function() {
		/* 调用服务 */
		this.callSvc = function(action, param, callback, isEscape, error) {
define(["jcl","mobile","clientTool"],function(Wade,Mobile,ClientTool) {
	var Common = new function(){
		/*调用服务*/
		this.callSvc = function(action,param,callback,isEscape,error){
			param = param ? param : new Wade.DataMap();
			error = error ? error : function(x_code, x_info) {
            error = error ? error : function(x_info, x_code) {
				Mobile.loadingStop();
				alert(action + "请求失败\n错误编码:[" + x_code + "]\n错误信息:" + x_info);
				if (x_code == -100) {
					Mobile.openPage("SessionErr");
				if(x_code){
					alert("错误编码:[" + x_code + "]\n错误信息:" + x_info);
				}else{
					alert("错误信息:" + x_info);
				}
				if(x_code==-100){
					Mobile.openPage("Login");
				}
			};
            
			Common.get(function(data) {
				if (typeof data == "string") {
					data = new Wade.DataMap(data);
				}
				if (!param.get("SESSION_ID") && data.get("SESSION_ID")) {
					param.put("SESSION_ID", data.get("SESSION_ID"));
				if (data.get(Constant.SESSION_ID)) {
					param.put(Constant.SESSION_ID, data.get(Constant.SESSION_ID));
				}
				if ( !param.get("USER_NAME") && data.get("USER_NAME")) {
					param.put("USER_NAME", data.get("USER_NAME"));
				if (data.get(Constant.STAFF_ID)) {
					param.put(Constant.STAFF_ID, data.get(Constant.STAFF_ID));
				}
				callSvc(action, param, callback, isEscape, error);
			}, [ "SESSION_ID", "USER_NAME" ]);
			function callSvc(_action, _param, _callback, _isEscape, _error) {
				Mobile.dataRequest(_action, _param, _callback, _isEscape,
						function(errMsg) {
							if (typeof (errMsg) == "string") {
								errMsg = new Wade.DataMap(errMsg);
							}
							x_resultcode = errMsg.get("X_RESULTCODE");
							x_resultinfo = errMsg.get("X_RESULTINFO");
							_error(x_resultcode, x_resultinfo)
						});
			}, [Constant.SESSION_ID,Constant.STAFF_ID]);
			
			function callSvc(_action,_param,_callback,_isEscape,_error){
				Mobile.dataRequest(_action,_param,function(resultData){
					if (typeof (resultData) == "string") {
						resultData = new Wade.DataMap(resultData);
					}
					var x_resultcode = resultData.get(Constant.X_RESULTCODE);
					var x_resultinfo = resultData.get(Constant.X_RESULTINFO);
					if(x_resultcode<0){
						_error(x_resultinfo, x_resultcode);//接口异常则回调报错函数
					}else{
						_callback(resultData);
					}
				}, _isEscape, _error);
			}
		};
		this.openPage = function(action, param, error) {
			param = param ? param : new Wade.DataMap();
			error = error ? error
					: function(x_code, x_info) {
						Mobile.loadingStop();
						alert(action + "页面请求失败\n错误编码:[" + x_code + "]\n错误信息:"
								+ x_info);
						if (x_code == -100) {
							Mobile.openPage("SessionErr");
						}
					};
			error = error ? error : function(x_info, x_code) {
				Mobile.loadingStop();
				if(x_code){
					alert("错误编码:[" + x_code + "]\n错误信息:" + x_info);
				}else{
					alert("错误信息:" + x_info);
				}
				if(x_code==-100){
					Mobile.openPage("Login");
				}
			};
			Common.get(function(data) {
				if (typeof data == "string") {
					data = new Wade.DataMap(data);
				}
				var sessionId = data.get("SESSION_ID");
				var userName = data.get("USER_NAME");
				if (!param.get("SESSION_ID") && data.get("SESSION_ID")) {
					param.put("SESSION_ID", data.get("SESSION_ID"));
				if (data.get(Constant.SESSION_ID)) {
					param.put(Constant.SESSION_ID, data.get(Constant.SESSION_ID));
				}
				if ( !param.get("USER_NAME") && data.get("USER_NAME")) {
					param.put("USER_NAME", data.get("USER_NAME"));
				if (data.get(Constant.STAFF_ID)) {
					param.put(Constant.STAFF_ID, data.get(Constant.STAFF_ID));
				}
				openPage(action, param, error);
			}, [ "SESSION_ID", "USER_NAME" ]);
			}, [Constant.SESSION_ID,Constant.STAFF_ID]);
			function openPage(_action, _param, _error) {
				Mobile.openPage(_action, _param, function(errMsg) {
					if (typeof (errMsg) == "string") {
						errMsg = new Wade.DataMap(errMsg);
					}
					x_resultcode = errMsg.get("X_RESULTCODE");
					x_resultinfo = errMsg.get("X_RESULTINFO");
					_error(x_resultcode, x_resultinfo)
					var x_resultcode = errMsg.get("X_RESULTCODE");
					var x_resultinfo = errMsg.get("X_RESULTINFO");
					_error(x_resultinfo, x_resultcode);
				});
			}
		};
		this.closeApp = function() {
			if (confirm("确定要退出应用程序吗?")) {
		
		this.closeApp = function(){
			if(confirm("确定要退出应用程序吗?")){
				Mobile.closeApp();
			}
		};
		this.logoutAccount = function() {
			if (confirm("确定要注销该工号吗?")) {
		
		this.logoutAccount = function(){
			if(confirm("确定要注销该工号吗?")){
				Common.remove(Constant.SESSION_ID);
				Mobile.openTemplate("Home");
			}
		};
		
		this.put = function(key, value) {
			if (!checkMapKey(key)) {
			if(!checkMapKey(key)){
				return;
			}
			Mobile.setMemoryCache(key, value);
		};
		this.get = function(callback, key, value) {
			if (!checkArrayKey(key)) {
			if(!checkArrayKey(key)){
				return;
			}
			Mobile.getMemoryCache(callback, key, value);
		};
		this.remove = function(key) {
			if (!checkArrayKey(key)) {
			if(!checkArrayKey(key)){
				return;
			}
			Mobile.removeMemoryCache(key);
		};
		this.clear = function() {
			Mobile.clearMemoryCache();
		    Mobile.clearMemoryCache();
		};
		this.putLocal = function(key, value) {
			if (!checkMapKey(key)) {
			if(!checkMapKey(key)){
				return;
			}
			Mobile.setOfflineCache(key, value);
		};
		this.getLocal = function(callback, key, value) {
			if (!checkArrayKey(key)) {
			if(!checkArrayKey(key)){
				return;
			}
			Mobile.getOfflineCache(callback, key, value);
			Mobile.getOfflineCache(callback, key,value);
		};
		this.removeLocal = function(key) {
			if (!checkArrayKey(key)) {
			if(!checkArrayKey(key)){
				return;
			}
			Mobile.removeOfflineCache(key);
@@ -134,38 +141,40 @@ define([ "jcl", "mobile", "clientTool" ], function(Wade, Mobile, ClientTool) {
		this.clearLocal = function() {
			Mobile.clearOfflineCache();
		};
		function checkMapKey(key) {
			if (!key
					|| (typeof (key) != "string" && !ClientTool.tool
							.isDataMap(key))) {
				alert(key + "参数类型异常");
		/*数据库操作*/
		var dbName = "IPU";
		this.execSQL = function(sql,bindArgs,callback,err){
			Mobile.execSQL(dbName,sql,bindArgs,callback,err);
		};
		
		function checkMapKey(key){
			if (!key || (typeof (key) != "string" && !ClientTool.tool.isDataMap(key))) {
				alert(key+"参数类型异常");
				return false;
			} else {
				return true;
			}
		}
		function checkArrayKey(key) {
			if (!key
					|| (typeof (key) != "string" && !ClientTool.tool
							.isArray(key))) {
				alert(key + "参数类型异常");
		
		function checkArrayKey(key){
			if (!key || (typeof (key) != "string" && !ClientTool.tool.isArray(key))) {
				alert(key+"参数类型异常");
				return false;
			} else {
				return true;
			}
		}
	}
	
	window.Constant = {
		USER_NAME : "USER_NAME",
		OPEN_PAGE_KEY : "OPEN_PAGE_KEY",
		STAFF_ID : "STAFF_ID",
		SESSION_ID : "SESSION_ID",
		X_RECORDNUM : "X_RECORDNUM",
		X_RESULTCODE : "X_RESULTCODE",
		X_RESULTINFO : "X_RESULTINFO",
		X_RESULTCAUSE : "X_RESULTCAUSE"
	}
	
	return Common;
});
});

ipu-server/web/res/css/base.css

@@ -921,4 +921,177 @@ input[type="checkbox"]:checked { opacity:1; }
.l_page-current-2 { left:-100%;}
.l_page-current-3 { left:-200%;}
.l_page-current-4 { left:-400%;}
.l_page-current-5 { left:-500%;}
.l_page-current-5 { left:-500%;}
/* custome dialog */
.s-dialog {
	position: fixed;
	top: 50%;
	left: 50%;
	width: 80%;
	min-width: 320px;
	height: auto;
	z-index: 2000;
	visibility: hidden;
	-webkit-backface-visibility: hidden;
	-moz-backface-visibility: hidden;
	backface-visibility: hidden;
	-webkit-transform: translateX(-50%) translateY(-50%);
	-moz-transform: translateX(-50%) translateY(-50%);
	-ms-transform: translateX(-50%) translateY(-50%);
	transform: translateX(-50%) translateY(-50%);
}
.s-dialog-show {
	visibility: visible;
}
.s-dialog-content {
	color: #fff;
	background: #0085d0;
	position: relative;
	border-radius: 3px;
	margin: 0 auto;
}
.s-dialog-content h3 {
	margin: 0;
	padding: 0.4em;
	text-align: center;
	font-size: 2.4em;
	font-weight: 300;
	opacity: 0.8;
	background: rgba(0,0,0,0.1);
	border-radius: 3px 3px 0 0;
}
.s-dialog-content > div {
	padding: 15px 40px 30px;
	margin: 0;
	font-weight: 300;
	font-size: 1.15em;
}
.s-dialog .s-dialog-mainview{
	min-height: 1.15rem;
}
.s-dialog-content > .s-dialog-buttons{
	text-align: center;
	margin:0 auto;
}
.s-dialog-buttons button {
	border: none;
	padding: 3% 3%;
	background: #0085ff;
	color: #fff;
	letter-spacing: 1px;
	cursor: pointer;
	border-radius: 2px;
	display: inline-block;
	margin: 0 0.05rem;
	font-size: 0.8em;
	box-shadow: 7px 7px 5px #216AAD;
	width:45%;
}
.s-dialog-buttons button:hover {
	background: #216AAD;
}
.s-dialog-buttons .s-dialog-ok{
	background: #92E818;
	box-shadow: 7px 7px 5px #78C30D;
}
.s-dialog-buttons .s-dialog-ok:hover{
	background: #78C30D;
}
.s-dialog-slip .s-dialog-content {
	-webkit-transform: translateY(20%);
	-moz-transform: translateY(20%);
	-ms-transform: translateY(20%);
	transform: translateY(20%);
	
	opacity: 0;
	-webkit-transition: all 0.3s;
	-moz-transition: all 0.3s;
	transition: all 0.3s;
}
.s-dialog-show.s-dialog-slip .s-dialog-content {				
	-webkit-transform: translateY(0);
	-moz-transform: translateY(0);
	-ms-transform: translateY(0);
	transform: translateY(0);
	
	opacity: 1;
}
/*8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888
8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888*/
.c-refresh-container { position:absolute !important; top:0.62rem; bottom:0px; width:100%;}
[id*="c-refresh-wrapper"] { position:relative; overflow:auto;}
.m_wrapper { height:100%; overflow:auto; position:relative;}
/*下拉刷新*/
#pullDown, #pullUp {
	background:#fff;
	height:2.22em;
	line-height:2.22em;
	padding:0.28em 0.56em;
	border-bottom:1px solid #ccc;
	font-weight:bold;
	color:#888;
}
#pullDown .pullDownIcon, #pullUp .pullUpIcon  {
	display:block; float:left;
	width:2.22em; height:2.22em;
	background:url(../img/pull.png) 0 0 no-repeat;
	-webkit-background-size:100% 100%; background-size:100% 100%;
	-webkit-transition-property:-webkit-transform;
	-webkit-transition-duration:250ms;	
}
#pullDown .pullDownIcon {
	-webkit-transform:rotate(0deg) translateZ(0);
}
#pullUp .pullUpIcon  {
	-webkit-transform:rotate(-180deg) translateZ(0);
}
#pullDown.flip .pullDownIcon {
	-webkit-transform:rotate(-180deg) translateZ(0);
}
#pullUp.flip .pullUpIcon {
	-webkit-transform:rotate(0deg) translateZ(0);
}
#pullDown.loading .pullDownIcon, #pullUp.loading .pullUpIcon {
	background-image:url(../img/pullLoading.png);
	-webkit-transform:rotate(0deg) translateZ(0);
	-webkit-transition-duration:0ms;
	-webkit-animation-name:loading;
	-webkit-animation-duration:2s;
	-webkit-animation-iteration-count:infinite;
	-webkit-animation-timing-function:linear;
}
@-webkit-keyframes loading {
	from { -webkit-transform:rotate(0deg) translateZ(0); }
	to { -webkit-transform:rotate(360deg) translateZ(0); }
}

ipu-server/web/res/css/bizIco-sn.css

@@ -1,60 +0,0 @@
/*查询类*/
.e_bizIco-G3PaymentHistory:before        { content:"\e600"; color:#8fc320;}/*缴费历史查询*/
.e_bizIco-G3FreeResource:before          { content:"\e999"; color:#c37c20;}/*免费资源查询★已合并此功能至套餐余量查询★*/
.e_bizIco-G3QueryFeeRemain:before        { content:"\e609"; color:#c33f20;}/*话费余额查询*/
.e_bizIco-G3QueryCustInf:before          { content:"\e999"; color:#0085d0;}/*客户资料查询★此功能已移至侧栏★*/
.e_bizIco-G3QryOrderProduct:before       { content:"\e62b"; color:#e40077;}/*订购产品查询*/
.e_bizIco-G3QryBill:before               { content:"\e602"; color:#1ca98d;}/*账单查询*/
.e_bizIco-G3BlackList:before             { content:"\e62a"; color:#333333;}/*黑名单查询*/
.e_bizIco-G3Qryscore:before              { content:"\e629"; color:#c4a426;}/*积分\M值查询*/
.e_bizIco-G3QrySale:before               { content:"\e628"; color:#a64d9d;}/*营销活动查询*/
.e_bizIco-G3QryFamily:before             { content:"\e627"; color:#e69020;}/*亲情号码查询*/
.e_bizIco-G3Display:before               { content:"\e999"; color:#ef432c;}/*业务展示★已删除此蛋疼功能★*/
.e_bizIco-G3QryFee:before                { content:"\e601"; color:#a5af36;}/*实时话费*/
.e_bizIco-G3BusCount:before              { content:"\e626"; color:#8fc320;}/*业务统计*/
.e_bizIco-G3QryPUK:before                { content:"\e625"; color:#c37c20;}/*puk码查询*/
.e_bizIco-G3QryTerminalInventory:before  { content:"\e624"; color:#c33f20;}/*终端库存查询*/
.e_bizIco-G3GprsQry:before               { content:"\e999"; color:#0085d0;}/*数据流程查询★已合并此功能至套餐余量查询★*/
.e_bizIco-G3AgentRechargeDetails:before  { content:"\e623"; color:#e40077;}/*代理商缴费查询*/
.e_bizIco-G3SaleCard:before              { content:"\e622"; color:#1ca98d;}/*销售号卡查询*/
.e_bizIco-G3AgentFee:before              { content:"\e621"; color:#4489ac;}/*代理商余额查询*/
.e_bizIco-G3QryOverage:before            { content:"\e606"; color:#4489ac;}/*★套餐余量查询*/
/*办理类*/
.e_bizIco-G3Payment:before               { content:"\e608"; color:#8fc320;}/*营业缴费*/
.e_bizIco-G3MakeNewAccount:before        { content:"\e605"; color:#c37c20;}/*入网开户*/
.e_bizIco-G3ScoreExchange:before         { content:"\e620"; color:#c33f20;}/*积分M值兑换*/
.e_bizIco-G3ChangeProduct:before         { content:"\e603"; color:#0085d0;}/*产品变更*/
.e_bizIco-G3MonternetPortal:before       { content:"\e61f"; color:#e40077;}/*梦网查询*/
.e_bizIco-G3FamilyMember:before          { content:"\e61e"; color:#1ca98d;}/*家庭成员管理*/
.e_bizIco-G3Pick:before                  { content:"\e61d"; color:#4489ac;}/*号码预约*/
.e_bizIco-G3ServeOpenClose:before        { content:"\e61c"; color:#c4a426;}/*申请停开机*/
.e_bizIco-G3ChangePassword:before        { content:"\e999"; color:#a64d9d;}/*密码变更★简单业务放菜单页★*/
.e_bizIco-G3MarketActivity:before        { content:"\e607"; color:#e69020;}/*营销活动*/
.e_bizIco-G3BalanceReminder:before       { content:"\e999"; color:#ef432c;}/*余额提醒服务定制★简单业务放菜单页★*/
.e_bizIco-G3BillSender:before            { content:"\e999"; color:#a5af36;}/*账单寄送服务定制★简单业务放菜单页★*/
.e_bizIco-G3Vnet:before                  { content:"\e61b"; color:#8fc320;}/*校园V网*/
.e_bizIco-G3InterCruise:before           { content:"\e61a"; color:#c37c20;}/*国际漫游*/
.e_bizIco-G3BackOpenUser:before          { content:"\e619"; color:#c33f20;}/*返单开户*/
.e_bizIco-G3ReIssueCard:before           { content:"\e618"; color:#0085d0;}/*换卡*/
.e_bizIco-G3AoProductChange:before       { content:"\e999"; color:#e40077;}/*附加产品变更★合并至产品变更★*/
.e_bizIco-G3ChangeCard:before            { content:"\e618"; color:#1ca98d;}/*以卡换卡★同换卡（颜色会不一样）★*/
.e_bizIco-G3TerminalSale:before          { content:"\e62d"; color:#4489ac;}/*终端销售？？？*/
.e_bizIco-G3TerminalBack:before          { content:"\e617"; color:#c4a426;}/*终端返销*/
.e_bizIco-G3GoodsReceive:before          { content:"\e616"; color:#a64d9d;}/*货品领取*/
.e_bizIco-G3RealNameReg:before           { content:"\e62c"; color:#e69020;}/*实名登记？？？*/
.e_bizIco-G3AgentMarketActivity:before   { content:"\e607"; color:#ef432c;}/*代理商营销活动★同营销活动（颜色会不一样）★*/
.e_bizIco-G3BareMachineSale:before       { content:"\e615"; color:#a5af36;}/*裸机销售*/
.e_bizIco-G3ContractSale:before          { content:"\e604"; color:#8fc320;}/*合约计划销售*/
.e_bizIco-G3NewNetAcct:before            { content:"\e614"; color:#c37c20;}/*宽带开户业务*/
.e_bizIco-G3ChangeWidePassWord:before    { content:"\e613"; color:#c33f20;}/*宽带密码变更*/
.e_bizIco-G3TerminalInstock:before       { content:"\e612"; color:#0085d0;}/*终端入库*/
.e_bizIco-G3PaymentBuyBack:before        { content:"\e611"; color:#e40077;}/*缴费返销*/
.e_bizIco-G3AgentPayment:before          { content:"\e608"; color:#1ca98d;}/*代理商代缴费★同营业缴费★*/
.e_bizIco-G3BusinessRecommend:before     { content:"\e610"; color:#4489ac;}/*新业务推荐*/
/*管理类*/
.e_bizIco-G3ChannelWarning:before        { content:"\e60f"; color:#c4a426;}/*渠道预警*/
.e_bizIco-G3ChannelInformation:before    { content:"\e60e"; color:#a64d9d;}/*渠道信息查询*/
.e_bizIco-G3Remuneration:before          { content:"\e60d"; color:#e69020;}/*酬金查询*/
.e_bizIco-G3InformationCollection:before { content:"\e60c"; color:#ef432c;}/*信息采集*/
.e_bizIco-G3Inspection:before            { content:"\e60b"; color:#a5af36;}/*巡检管理*/
.e_bizIco-G3AmountOfPayment:before       { content:"\e60a"; color:#8fc320;}/*量酬查询*/

ipu-server/web/res/js/base/jcl.js

@@ -519,7 +519,8 @@ define(["zepto"],function($){
			if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
				.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
				.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
						
				console.log("########data");
				//先尝试使用浏览器内部JSON解析器
				return window.JSON && window.JSON.parse ?
					window.JSON.parse( data ) :
@@ -580,7 +581,8 @@ define(["zepto"],function($){
			str=str.replace(/\\\":(null|undefined)(,|})/g,"\\\":\\\"\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的空值
			str=str.replace(/\\\":(true|false)(,|})/g,"\\\":\\\"$1\\\"$2"); //处理KEY值里放IData或IDataset的toString串里的布尔值
			str=str.replace(/\\\":(-)?([0-9\.]+)(,|})/g,"\\\":\\\"$1$2\\\"$3"); //处理KEY值里放IData或IDataset的toString串里的数值
			str=str.replace(/\\\"/g,"!~b~!"); //把字符串中原有的 \" 替换，处理KEY值里放IData或IDataset的toString串的情况
			//ybf326
			//str=str.replace(/\\\"/g,"!~b~!"); //把字符串中原有的 \" 替换，处理KEY值里放IData或IDataset的toString串的情况
			
			str=str.replace(/:(null|undefined)(,|})/g,":\"\"$2");    //将null或undefined替换为空字符
			str=str.replace(/:(true|false)(,|})/g,":\"$1\"$2");      //将true|false替换为字符串
@@ -617,9 +619,10 @@ define(["zepto"],function($){
					case "\n":
						out +="\u005Cn";
						break;
					case "\"":
					//ybf326
					/*case "\"":
						out +="!~a~!";
						break;
						break;*/
					default:
						out += chr;
					break;
@@ -627,14 +630,14 @@ define(["zepto"],function($){
			}
			str = out;
		
			//ybf326
			/*
			//第一次替换处理JSON格式的双引号字符
			str=str.replace(/{!~a~!/g,"{\""); //处理 {"
			str=str.replace(/!~a~!}/g,"\"}");  //处理 "}
			str=str.replace(/!~a~!,!~a~!/g,"\",\"");   //处理 ","
			str=str.replace(/!~a~!:!~a~!/g,"\":\"");   //处理 ":"
			str=str.replace(/!~a~!:\[!~a~!/g,"\":[\"");   //处理 ":["
			str=str.replace(/!~a~!:\[/g,"\":[");   //处理 ":[
			str=str.replace(/!~a~!\],!~a~!/g,"\"],\"");   //处理 "],"
			str=str.replace(/\],!~a~!/g,"],\"");   //处理 ],"
			str=str.replace(/!~a~!:{/g,"\":{");    //处理 ":{
			str=str.replace(/},!~a~!/g,"},\"");    //处理 },"
@@ -643,6 +646,7 @@ define(["zepto"],function($){
			str=str.replace(/\u005C!~a~!/g,"\u005C\""); //本身就有\的还原
			str=str.replace(/!~a~!/g,"\u005C\"");    //其它的加上\符号
			str=str.replace(/!~b~!/g,"\u005C\"");   //恢复 !~b~! 为 \"
			*/
			
			//str=str.replace(/\r/g,"\u005Cr");		
			//str=str.replace(/\n/g,"\u005Cn");	
@@ -680,6 +684,10 @@ define(["zepto"],function($){
					case "\"":
						out +="\u005C\"";
						break;
					//ybf326
					case "\\":
						out += "\u005C\u005C";
						break;
					default:
						out += chr;
					break;
@@ -713,7 +721,9 @@ define(["zepto"],function($){
		},
		parseString:function(str){
			str=$.parseJsonString(str);
			(new Function("this.parseObject(" +str+")")).apply(this);
			console.log("#####this.parseObject");
			return window.JSON && window.JSON.parse ? this.parseObject(window.JSON.parse(str)) 
					: (new Function("this.parseObject(" +str+")")).apply(this);
			//if(typeof(o)=="object")this.parseObject(o);
		},
		parseObject:function(obj){
@@ -802,7 +812,9 @@ define(["zepto"],function($){
		},	
		parseString:function(str){
			str=$.parseJsonString(str);
			(new Function("this.parseArray(" +str+")")).apply(this);	
			console.log("#####this.parseArray");
			return window.JSON && window.JSON.parse ? this.parseArray(window.JSON.parse(str)) : 
				(new Function("this.parseArray(" +str+")")).apply(this);	
		},
		parseArray:function(o){
			for(var i=0;i<o.length;i++){

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

@@ -287,8 +287,12 @@ define(["require"],function(require) {
			},getContacts:function(callback,err){
				storageCallback("getContacts",callback);
				execute("getContacts",[], err);	
			},openBrowser:function(url,err){
				execute("openBrowser",[url],err);
			},openKeyboard:function(value,err){
				execute("openKeyboard",[value],err);
			},setScreeLock:function(dataAction,param,indexPage,err){
				execute("setScreeLock",[dataAction,param,indexPage],err);
			},screeUnlock:function(screenUnlockType, forgetPageAction, err){
				execute("screeUnlock",[screenUnlockType, forgetPageAction],err);
			}
		};
	})();

ipu-server/web/res/js/mobile/mobile-browser.js

@@ -203,6 +203,21 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
		this.selectFirst = function(dbName,table,columns,conds,callback,err){
			alert("等待实现");
		};
		// 设置手势锁
		this.setScreeLock = function(dataAction,param,indexPage,err) {
			alert("等待实现");
		}
		// 解锁
		this.screeUnlock = function(screenUnlockType, forgetPageAction, err){
			alert("等待实现");
		}
		// 打开小键盘
		this.openKeyboard = function(value,err){
			alert("等待实现");
		}
		this.openNative = function(data,err){
			alert("等待实现");
		}
	}
	
	return Mobile;

ipu-server/web/res/js/mobile/mobile-client.js

@@ -166,6 +166,21 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
		this.selectFirst = function(dbName,sql,bindArgs,callback,err){
			WadeMobile.selectFirst(dbName,sql,bindArgs,callback,err);
		};
		// 设置手势锁
		this.setScreeLock = function(dataAction,param,indexPage,err) {
			WadeMobile.setScreeLock(dataAction,param.toString(),indexPage,err);
		}
		// 解锁
		this.screeUnlock = function(screenUnlockType, forgetPageAction, err){
			WadeMobile.screeUnlock(screenUnlockType, forgetPageAction, err);
		}
		// 打开小键盘
		this.openKeyboard = function(value,err){
			WadeMobile.openKeyboard(value,err);
		}
		this.openNative = function(data,err){
			WadeMobile.openNative(data.toString(),err);
		}
	};
	
	return Mobile;

ipu-server/web/res/js/require-config.js

@@ -16,7 +16,7 @@ require.config({
		'iScroll5' : 'base/iscroll5',
		'hammer' : 'base/hammer',
		'o' : 'frame/o',
		'oEvent' : 'frame/o-event',
		//'oEvent' : 'frame/o-event',
		'oInput' : 'frame/o-input',
		'tap' : 'frame/tap',
		'browserTool' : 'mobile/browser-toolkit',
@@ -43,7 +43,9 @@ require.config({
		'wmProgress' : 'ui/wm-progress',
		'wmSegment' : 'ui/wm-segment',
		'wmDialog' : 'ui/wm-dialog',
		'wmDropmenu' : 'ui/wm-dropmenu'
		'wmDialog2' : 'ui/wm-dialog2',
		'wmDropmenu' : 'ui/wm-dropmenu',
		'wmRefresh' : 'ui/wm-refresh'
		
	},
	deps: [],

ipu-server/web/res/js/ui/wm-dialog2.js

@@ -0,0 +1,80 @@
/*引入util对应的js文件*/
define(['util'], function(){
	var isClose = true;
	/*WmNavBar对象定义*/
	function WmDialog2(id){
		this.listeners = new Array(); //存储监听事件
		this.id = id;
		/*常用对象*/
		this.box = (function(obj){
			if(typeof(obj)=="object"){
				obj = $(obj);
			}else if(typeof(obj)=="string"){
				obj = $("#"+obj);
			}else{
				alert("没有匹配类型");
				return null;
			}
			return obj;
		})(id);
		this.negativeButton = this.box.find(".s-dialog-cancle");
		this.positiveButton = this.box.find(".s-dialog-ok");
		this.title = this.box.find('.s-dialog-title');
		this.mainView = this.box.find('.s-dialog-mainview');
		
		var that = this;
		this.negativeButton.tap(function(){
			that.hide();
		});
	}
	
	WmDialog2.prototype.show = function(){
		this.box.addClass('s-dialog-show');
	}
	
	WmDialog2.prototype.hide = function(){
		this.box.removeClass('s-dialog-show');
	}
	
	WmDialog2.prototype.setPositiveAction = function(action,isHide){
		var that = this;
		if(this.positiveButton.length != 0){
			this.positiveButton.tap(function(){
				if(typeof(action) == "function") {
					action();
				}
				if(isHide){
					that.hide();
				}
			});
		}
	}
	
	WmDialog2.prototype.setNegativeAction = function(action,isHide){
		var that = this;
		if(this.negativeButton.length != 0){
			this.negativeButton.tap(function(){
				if(typeof(action) == "function") {
					action();
				}
				if(isHide){
					that.hide();
				}
			});
		}
	}
	
	WmDialog2.prototype.setTitle = function(title){
		this.title.text(title);
	}
	/*设置内容*/
	WmDialog2.prototype.setContentView = function(str,setBy) {
		if (setBy == "html") {
			this.mainView.html($("#" + str).html());
		} else {
			this.mainView.html("<div>" + str + "</div>");
		}
	}
	
	return WmDialog2;
});

ipu-server/web/template/common/Head.html

@@ -1,4 +1,14 @@
<script src="res/js/base/require.js"></script>
<script src="res/js/require-config.js" ></script>
<script src="biz/js/common/require-config.js" ></script>
<link rel="stylesheet" type="text/css" href="res/css/base.css"/>
	<!--注:由于html页面会被加密,不能使用双斜杠作为注释符号-->
	<script language="javascript">
	/*自定义增加每个页面需要执行的公共逻辑*/
	require(["domReady!","mobile","jcl","tap"],function(doc, Mobile, $) {
		/*每个页面的back样式都需要执行回退*/
		$(".c_navBar").find(".back").tap(function(){
			Mobile.back();
		});
	}); 
</script>

ipu-server/web/template/common/IpuHead.html

@@ -1,14 +0,0 @@
<script src="res/js/base/require.js"></script>
<script src="res/js/require-config.js" ></script>
<script src="biz/js/common/require-config.js" ></script>
<link rel="stylesheet" type="text/css" href="res/css/base.css"/>
	<!--注:由于html页面会被加密,不能使用双斜杠作为注释符号-->
	<script language="javascript">
	/*自定义增加每个页面需要执行的公共逻辑*/
	require(["domReady!","mobile","jcl","tap"],function(doc, Mobile, $) {
		/*每个页面的back样式都需要执行回退*/
		$(".c_navBar").find(".back").tap(function(){
			Mobile.back();
		});
	}); 
</script>

ipu-server/web/template/lua/tag/WmDialog.lua

@@ -0,0 +1,63 @@
local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmDialog = Class(Tag)
function WmDialog:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmDialog:doStartTag(attr)
	if not (attr.id and attr.title) then
		monitor:error("WmDialog组件 id、title属性不能为空 ")
		return nil
	end
	self.attr = attr
	self.htmlbuff:append('<div class="c_dialog" id="'..attr.id..'">')
	self.htmlbuff:append('<div class="wrapper">')
	self.htmlbuff:append('<div class="title">')
	self.htmlbuff:append('<div class="text">'..attr.title..'</div>')
	self.htmlbuff:append('<a href="#nogo" class="close"></a>')
	self.htmlbuff:append('</div>')
	self.htmlbuff:append('<div class="content">')
	if attr.contentText then
		self.htmlbuff:append(attr.contentText)
	end 
end
function WmDialog:doEndTag()
	local attr = self.attr
	self.htmlbuff:append('</div>')
	self.htmlbuff:append([[
		<div class="submit">
			<ul>
				<li><span class="e_button e_button-cancel">取消</span></li>
				<li><span class="e_button e_button-ok" id="btn">确定</span></li>
			</ul>
		</div>]])
	self.htmlbuff:append('</div></div>')
	self.htmlbuff:append('')
	self.htmlbuff:append('<script type="text/javascript">')
	self.htmlbuff:append('require(["wmDialog","wmWebUI"],function(WmDialog,WmWebUI) {')
	self.htmlbuff:append('var dialog_'..attr.id..' = new WmDialog("'..attr.id..'");')
	if attr.contentId then
		self.htmlbuff:append(' dialog_'..attr.id..'.setContent("'..attr.contentId..'","html");')
	end
	if attr.cancelAction then
		self.htmlbuff:append(' dialog_'..attr.id..'.cancelAction(function(){ return '..attr.cancelAction..'.apply(window,arguments);});')		
	end
	if attr.submitAction then
		self.htmlbuff:append(' dialog_'..attr.id..'.submitAction(function(){ return '..attr.submitAction..'.apply(window,arguments);});')
	end
	if attr.hideAction then
		self.htmlbuff:append(' dialog_'..attr.id..'.setHideAction(function(){ return '..attr.hideAction..'.apply(window,arguments);});')
	end
	if attr.showAction then
		self.htmlbuff:append(' dialog_'..attr.id..'.setShowAction(function(){ return '..attr.showAction..'.apply(window,arguments);});')
	end
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",dialog_'..attr.id..');')
	self.htmlbuff:append('})')
	self.htmlbuff:append('</script>')
end
return WmDialog

ipu-server/web/template/lua/tag/WmDialog2.lua

@@ -0,0 +1,107 @@
local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmDialog2 = Class(Tag)
function WmDialog2:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmDialog2:doStartTag(attr)
	if not (attr.id and attr.title) then
		monitor:error("WmDialog2组件 id、title属性不能为空 ")
		return nil
	end
	
	self.attr = attr
	self.htmlbuff:append('<div class="s-dialog s-dialog-slip" id="'..attr.id..'">')
	self.htmlbuff:append('<div class="s-dialog-content">')
	self.htmlbuff:append('<h3 class="s-dialog-title">'..attr.title..'</h3>')
	self.htmlbuff:append('<div class="s-dialog-mainview">')
	--this is the content area
	
	
end
function WmDialog2:doEndTag()
	local attr = self.attr
	
	self.htmlbuff:append('</div>')
	
	self.htmlbuff:append('<div class="s-dialog-buttons">')
	
	local n_action = nil
	local p_action = nil
	local p_closeDialg = 'true'
	if (not attr.negativeAction) and (not attr.positiveAction) then
		self.htmlbuff:append('<button class="s-dialog-cancle">确定</button>')
	else
		if attr.negativeAction then
			local negative = string.split(attr.negativeAction,",")
			local n_text = negative[1]
			n_action = negative[2]
			
			if n_text then
				self.htmlbuff:append('<button class="s-dialog-cancle">'..n_text..'</button>')
			end
		end
		
		if attr.positiveAction then
			local positive = string.split(attr.positiveAction,",")
			local p_text = positive[1]
			p_action = positive[2]
			
			if positive[3] then
				p_closeDialg = positive[3]
			end
			
			if p_text then
				self.htmlbuff:append('<button class="s-dialog-ok">'..p_text..'</button>')
			end
		end
		
		
	end
	
	self.htmlbuff:append('</div>')	
	
	self.htmlbuff:append('</div>')
	self.htmlbuff:append('</div>')
	
	
	self.htmlbuff:append('<script type="text/javascript">')
	self.htmlbuff:append('require(["wmDialog2","wmWebUI"],function(WmDialog2,WmWebUI) {')
	self.htmlbuff:append('var dialog_'..attr.id..' = new WmDialog2("'..attr.id..'");')
	
	if n_action then
		self.htmlbuff:append('dialog_'..attr.id..'.setNegativeAction('..n_action..',true);')
	end
	
	if p_action then
		self.htmlbuff:append('dialog_'..attr.id..'.setPositiveAction('..p_action..','..p_closeDialg..');')
	end
	
	if attr.contentview then
		local contentView = string.split(attr.contentview,",")
		local id = contentView[1]
		local type = contentView[2]
		
		self.htmlbuff:append('dialog_'..attr.id..'.setContentView("'..id..'","'..type..'");')
	end
	
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",dialog_'..attr.id..');')
	self.htmlbuff:append('})')
	self.htmlbuff:append('</script>')
end
function string.split(str, delimiter)	
	if str==nil or str=='' or delimiter==nil then		
		return nil	
	end	    
	local result = {}    
	for match in (str..delimiter):gmatch("(.-)"..delimiter) do        
		table.insert(result, match)    
	end    
	return result
end
return WmDialog2

ipu-server/web/template/lua/tag/WmDropmenu.lua

@@ -0,0 +1,132 @@
local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmDropmenu = Class(Tag)
--htmlbuff
function WmDropmenu:createNew(obj,htmlbuff)
  self.htmlbuff = htmlbuff
  self.actions = {}
end
--attr所有属性
function WmDropmenu:doStartTag(attr)
  --属性初始化
  attr.closeAction = attr.closeAction
  attr.openAction = attr.oppenAction
  self.attr = attr
  self.htmlbuff:append('<div id="')
  self.htmlbuff:append(attr.id)
  self.htmlbuff:append('">','\n')
  self.htmlbuff:append([[
  	<div class="fn">
		<span class="e_button"><span>]])
  self.htmlbuff:append(attr.label)
  self.htmlbuff:append([[</span><span class="e_ico-unfold"></span></span>
	</div>
	<div class="c_dropmenu">
      	<ul>
    ]])
end
function WmDropmenu:doEndTag()
  self.htmlbuff:append([[
     	</ul>
      </div>
    </div>
  ]])
    
  self.htmlbuff:append([[
<script type="text/javascript">
  require(["wmDropmenu"],function(WmDropmenu) {
      var wmDropmenu=new WmDropmenu("]])
  self.htmlbuff:append(self.attr.id)
  self.htmlbuff:append('");','\n')
  self.htmlbuff:append([[
  	wmDropmenu.create();
  ]])
  
  if self.attr.openAction then
  	self.htmlbuff:append([[
      wmDropmenu.setOpenAction(function(){
    ]])
	self.htmlbuff:append(self.attr.openAction,'\n')
	self.htmlbuff:append('});','\n')
  end
  if self.attr.closeAction then
  	self.htmlbuff:append([[
	  wmDropmenu.setCloseAction(function(){
    ]])
 	self.htmlbuff:append(self.attr.closeAction,'\n')
	self.htmlbuff:append('});','\n')
  end
 
 self.htmlbuff:append('		var items = wmDropmenu.getDropmenuItems();','\n')
 for k,v in pairs(self.actions) do
    if v~=-1 then
      self.htmlbuff:append('items[')
      self.htmlbuff:append(k-1)
      self.htmlbuff:append('].setAction(function(){')
      self.htmlbuff:append(v)
      self.htmlbuff:append('});','\n')
    end
  end
  self.htmlbuff:append([[
	});
	</script>
  ]])
end
function WmDropmenu:addActions(action)
  table.insert(self.actions, action)
end
return WmDropmenu
--[[
require(["wmDropmenu","util"],function(WmDropmenu) {
  var wmDropmenu=new WmDropmenu(dropmenu01);
  wmDropmenu.create();
  wmDropmenu.setLabel("下拉菜单01");
  wmDropmenu.setCloseAction(function(){
    console.log("closeAction");
  });
  wmDropmenu.setOpenAction(function(){
    console.log("openAction");
    console.log(wmDropmenu.getLabel());
  });
  var items=wmDropmenu.getItems();
  for(var i=0;i<items.length;i++){
    console.log("index:"+items[i].getIndex());
    console.log("parent:"+items[i].getParent());
    items[i].setAction(function(obj){
      alert(obj.html());
    });
  }
  console.log("length:"+items.length);
  items[2].remove();
  console.log("length:"+items.length);
  for(var i=0;i<items.length;i++){
    //alert(items[i].html());
  }
  //wmDropmenu.removeAll();
  var item1=wmDropmenu.push("111");
  item1.setAction(function(obj){
    alert("我是新来的1");
  });
  var item2=wmDropmenu.push("22222");
  item2.setAction(function(obj){
    alert("我是新来的2");
  });
  item1.remove();
  //wmDropmenu.getItems()[0].remove();
  $("#testbtn").setAction(function(){
    if(wmDropmenu.Invisible()){
      wmDropmenu.show();
    }else{
      wmDropmenu.hidden();
    }
  });
});
]]

ipu-server/web/template/lua/tag/WmDropmenuItem.lua

@@ -0,0 +1,19 @@
local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmDropmenuItem = Class(Tag)
function WmDropmenuItem:createNew(obj,htmlbuff)
  self.htmlbuff = htmlbuff
end
function WmDropmenuItem:doStartTag(attr)
  self.parent:addActions(attr.action or -1);
  self.htmlbuff:append('<li ontap>')
 
end
function WmDropmenuItem:doEndTag()
 self.htmlbuff:append('</li>');
end
return WmDropmenuItem

ipu-server/web/template/lua/tag/WmNavBar.lua

@@ -0,0 +1,96 @@
local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmNavBar = Class(Tag)
function WmNavBar:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
  monitor:debug("------------------------")
 -- monitor:debug("htmlbuff length:"..#self.htmlbuff)
  self.bottoms = {}
end
function WmNavBar:doStartTag(attr)
	self.id = attr.id
	self.bottoms = {}
	self.htmlbuff:append('<div class="c_navBar" id="'.. self.id ..'">')
end
function WmNavBar:doEndTag()
	self.htmlbuff:append('</div>')
	self.htmlbuff:append('<script type="text/javascript">')
	self.htmlbuff:append('require(["wmNavBar"],function(WmNavBar) {')
	self.htmlbuff:append('var navbar_'..self.id..' = new WmNavBar("'..self.id..'");')
	local groupCount = 0
	for i=1,#self.bottoms do
		local attr = self.bottoms[i]
		if attr.action and attr.action~="" then
			if attr.type == "icon" then
				local icons = self.Split(attr.icons, ",");
				local actions = self.Split(attr.action, ",");
				for i=1,#icons do
					if icons[i]~="" then
						self:setAction(icons[i],actions[i])
					end
				end 
			elseif attr.type == "tab" then
				local actions = self.Split(attr.action, ",");
				for i=1,#actions do
					self.htmlbuff:append('navbar_'..self.id..'.setTabItemAction('..(i-1)..',function(){ return '..actions[i]..'.apply(window,arguments);});')
				end
			elseif attr.type == "tabgroup" then
				if groupCount==0 then
					self.htmlbuff:append('navbar_'..self.id..'.initTabGroup();')
				end
				local actions = self.Split(attr.action, ",");
				for i=1,#actions do
					self.htmlbuff:append('navbar_'..self.id..'.setTabGroupItemAction('..groupCount..','..(i-1)..',function(){ return '..actions[i]..'.apply(window,arguments);});')
				end
				groupCount = groupCount+1
			else
				self:setAction(attr.type,attr.action)
			end
		end 
	end 
	self.htmlbuff:append('WmWebUI.store("'..self.id..'",navbar_'..self.id..');')
	self.htmlbuff:append('});')
	self.htmlbuff:append('</script>')
end
function WmNavBar:setAction(type,action)
	if action and action~="" then
		action = 'function(){ return '..action..'.apply(window,arguments);}'
		if type == "back" then
			self.htmlbuff:append('navbar_'..self.id..'.setBackAction('..action..');')
		elseif type == "add"  then
			self.htmlbuff:append('navbar_'..self.id..'.setAddAction('..action..');')
		elseif type == "delete" then
			self.htmlbuff:append('navbar_'..self.id..'.setDelAction('..action..');')
		elseif type == "date" then
			self.htmlbuff:append('navbar_'..self.id..'.setDateAction('..action..');')
		elseif type == "search" then
			self.htmlbuff:append('navbar_'..self.id..'.setSearchAction('..action..');')
		end
	end
end
function WmNavBar:addBottom(bottom)
  table.insert(self.bottoms, bottom)
end
function WmNavBar.Split(szFullString, szSeparator)
	local nFindStartIndex = 1
	local nSplitIndex = 1
	local nSplitArray = {}
	while true do
		local nFindLastIndex = string.find(szFullString, szSeparator, nFindStartIndex)
		if not nFindLastIndex then
			nSplitArray[nSplitIndex] = string.sub(szFullString, nFindStartIndex, string.len(szFullString))
			break
		end
		nSplitArray[nSplitIndex] = string.sub(szFullString, nFindStartIndex, nFindLastIndex - 1)
		nFindStartIndex = nFindLastIndex + string.len(szSeparator)
		nSplitIndex = nSplitIndex + 1
	end
	return nSplitArray
end
return WmNavBar

ipu-server/web/template/lua/tag/WmNavBarItem.lua

@@ -0,0 +1,84 @@
local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmNavBarItem = Class(Tag)
function WmNavBarItem:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmNavBarItem:doStartTag(attr)
	if attr.type == "back" then
		self.htmlbuff:append('<div class="left"><div class="back"><span class="e_ico-back"></span>')
		if attr.title then
			self.htmlbuff:append('<span class="text">'..attr.title..'</span>')
		end
		self.htmlbuff:append('</div></div>')
	elseif attr.type == "add" or attr.type == "delete" or attr.type == "date" then
		if attr.position then
			self.htmlbuff:append('<div class="'..attr.position..'">')
		else
			self.htmlbuff:append('<div class="right">')
		end 
		self.htmlbuff:append('<button><span class="e_ico-'..attr.type..'"></span>')
		if attr.text then
			self.htmlbuff:append(attr.text)
		end 
		self.htmlbuff:append('</button></div>')
	elseif attr.type == "title" then
		self.htmlbuff:append('<div class="center"><div class="title">'..attr.text..'</div></div>')
	elseif attr.type == "icon" then
		if attr.position then
			self.htmlbuff:append('<div class="'..attr.position..'">')
		else
			self.htmlbuff:append('<div class="right">')
		end
		self.htmlbuff:append('<div class="icon">')
		local icons = self.parent.Split(attr.icons, ",");
		for i=1,#icons do
			if icons[i]~="" then
				self.htmlbuff:append('<span class="e_ico-'..icons[i]..'"></span>')
			end
		end 
		self.htmlbuff:append('</div></div>')
	elseif attr.type == "tab" then
		if attr.position then
			self.htmlbuff:append('<div class="'..attr.position..'">')
		end 
		self.htmlbuff:append('<div class="tab"><ul>')
		local items = self.parent.Split(attr.items, ",");
		for i=1,#items do
			if i==1 then
				self.htmlbuff:append('<li class="on">'..items[i]..'</li>')
			else
				if items[i]~="" then
					self.htmlbuff:append('<li>'..items[i]..'</li>')
				end
			end
		end 
		self.htmlbuff:append('</ul></div>')
		if attr.position then
			self.htmlbuff:append('</div>')
		end 
	elseif attr.type == "tabgroup" then
		self.htmlbuff:append('<div class="'..attr.position..'">')
		self.htmlbuff:append('<div class="buttonList">')
		self.htmlbuff:append('<div class="tip">'..attr.text..'<span class="e_ico-unfold"></span></div>')
		self.htmlbuff:append('<div class="option" style="display:none;"><ul>')
		local items = self.parent.Split(attr.items, ",");
		for i=1,#items do
			if items[i]~="" then
				self.htmlbuff:append('<li>'..items[i]..'</li>')
			end
		end 
		self.htmlbuff:append('</ul></div></div></div>')
	end
	
	self.parent:addBottom(attr)
	
end
function WmNavBarItem:doEndTag()
end
return WmNavBarItem

ipu-server/web/template/lua/tag/WmProgress.lua

@@ -0,0 +1,55 @@
local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmProgress = Class(Tag)
function WmProgress:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmProgress:doStartTag(attr)
	if not (attr.id and attr.progress) then
		monitor:error("WmProgress组件 id、progress属性不能为空 ")
		return nil
	end
		
	self.htmlbuff:append('<div class="e_progress" id="'..attr.id..'">')
	if attr.pastTip then
		self.htmlbuff:append([[
			<div class="e_progressUse">
				<div class="e_progressUseValue"></div>
				<div class="e_progressUseTip">]]..attr.pastTip..[[</div>
			</div>
		]])
	end
	self.htmlbuff:append('<div class="e_progressBar"><span></span></div>')
	if attr.totalTip then
		self.htmlbuff:append('<div class="e_progressTotal">'..attr.totalTip..'</div>')
	end
	if attr.spaceTip then
		self.htmlbuff:append([[
			<div class="e_progressSurplus">
				<div class="e_progressSurplusTip">]]..attr.spaceTip..[[</div>
				<div class="e_progressSurplusValue"></div>
			</div>
		]])
	end
	self.htmlbuff:append('</div>\n')
	self.htmlbuff:append('<script type="text/javascript">')
	self.htmlbuff:append('require(["wmProgress"],function(WmProgress) {')
	self.htmlbuff:append('var progress_'..attr.id..' = new WmProgress("'..attr.id..'");')
	self.htmlbuff:append('progress_'..attr.id..'.setProgress("'..attr.progress..'");')
	if attr.level then
		self.htmlbuff:append('progress_'..attr.id..'.setLevel("'..attr.level..'");')
	end
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",progress_'..attr.id..');')
	self.htmlbuff:append('})')
	self.htmlbuff:append('</script>')
end
function WmProgress:doEndTag()
end
return WmProgress

ipu-server/web/template/lua/tag/WmRefresh.lua

@@ -0,0 +1,65 @@
local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmRefresh = Class(Tag)
function WmRefresh:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmRefresh:doStartTag(attr)
	if not (attr.id) then
		monitor:error("WmRefresh组件 id属性不能为空 ")
		return nil
	end
	
	self.attr = attr
	self.htmlbuff:append('<div class="c-refresh-container" id="'..attr.id..'">')
	self.htmlbuff:append('<div id="c-refresh-wrapper" style="height:200px;">')
	self.htmlbuff:append('<div id="c-refresh-scroller">')
	self.htmlbuff:append('<div id="pullDown">')
	self.htmlbuff:append('<span class="pullDownIcon"></span><span class="pullDownLabel">下拉刷新...</span>')
	self.htmlbuff:append('</div>')
	self.htmlbuff:append('<div class="c_list">')
	--this is the content area
	
	
end
function WmRefresh:doEndTag()
	local attr = self.attr
	
	self.htmlbuff:append('</div>')
	
	self.htmlbuff:append('<div id="pullUp">')
	self.htmlbuff:append('<span class="pullUpIcon"></span><span class="pullUpLabel">上拉加载更多...</span>')
	self.htmlbuff:append('</div> </div> </div> </div>')
	
	self.htmlbuff:append('<script type="text/javascript">')
	self.htmlbuff:append('require([ "wmRefresh","wmWebUI" ], function(WmRefresh,WmWebUI) {')
	self.htmlbuff:append('var refresh_'..attr.id..' = new WmRefresh("'..attr.id..'");')
	
	if attr.pullDownAction then
		self.htmlbuff:append('refresh_'..attr.id..'.setPullDownAction('..attr.pullDownAction..');')
	end
	
	if attr.pullUpAction then
		self.htmlbuff:append('refresh_'..attr.id..'.setPullUpAction('..attr.pullUpAction..');')
	end
	
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",refresh_'..attr.id..');')
	self.htmlbuff:append('})')
	self.htmlbuff:append('</script>')
end
function string.split(str, delimiter)	
	if str==nil or str=='' or delimiter==nil then		
		return nil	
	end	    
	local result = {}    
	for match in (str..delimiter):gmatch("(.-)"..delimiter) do        
		table.insert(result, match)    
	end    
	return result
end
return WmRefresh

ipu-server/web/template/lua/tag/WmSegment.lua

@@ -0,0 +1,59 @@
local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmSegment = Class(Tag)
function WmSegment:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmSegment:doStartTag(attr)
	local texts = self.Split(attr.texts, ",")
	local values = self.Split(attr.values, ",")
	self.htmlbuff:append('<span class="e_segment" id="'..attr.id..'"><span class="e_segmentWrapper">')
	for i=1,#texts do
		self.htmlbuff:append('<span class="e_segmentLi" segValue="'..values[i]..'">'..texts[i]..'</span>')
	end 
	self.htmlbuff:append('</span></span>\n')
	self.htmlbuff:append('<input type="hidden" id="'..attr.name..'" name="'..attr.name..'" value="" />')
	
	
	self.htmlbuff:append('<script type="text/javascript">\n')
	self.htmlbuff:append('require(["wmSegment"],function(WmSegment) {\n')
	self.htmlbuff:append('var segment_'..attr.id..' = new WmSegment("'..attr.id..'","'..attr.name..'",false);\n')
	if attr.selected then
		self.htmlbuff:append('segment_'..attr.id..'.activeItem("'..attr.selected..'");\n')
	else
		self.htmlbuff:append('segment_'..attr.id..'.activeItemIndex(0);\n')
	end 
	if attr.action then
		self.htmlbuff:append('segment_'..attr.id..'.setAction(function(){ return '..attr.action..'.apply(window,arguments);})\n')
	else
		self.htmlbuff:append('segment_'..attr.id..'.setAction();\n')
	end 
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",segment_'..attr.id..');\n')
	self.htmlbuff:append('})\n')
	self.htmlbuff:append('</script>')
end
function WmSegment:doEndTag()
end
function WmSegment.Split(szFullString, szSeparator)
	local nFindStartIndex = 1
	local nSplitIndex = 1
	local nSplitArray = {}
	while true do
		local nFindLastIndex = string.find(szFullString, szSeparator, nFindStartIndex)
		if not nFindLastIndex then
			nSplitArray[nSplitIndex] = string.sub(szFullString, nFindStartIndex, string.len(szFullString))
			break
		end
		nSplitArray[nSplitIndex] = string.sub(szFullString, nFindStartIndex, nFindLastIndex - 1)
		nFindStartIndex = nFindLastIndex + string.len(szSeparator)
		nSplitIndex = nSplitIndex + 1
	end
	return nSplitArray
end
return WmSegment

ipu-server/web/template/lua/tag/WmToolTip.lua

@@ -0,0 +1,54 @@
local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmToolTip = Class(Tag)
function WmToolTip:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmToolTip:doStartTag(attr)
	self.id = attr.id
	local align = ""
	if attr.align=="right" then
		align = "c_toolTip-arrowRight"
	elseif attr.align=="left" then
		align = "c_toolTip-arrowLeft"
	end
	local position = ""
	if attr.position=="up" then
		position = "c_toolTip-positionBottom"
	end
	self.htmlbuff:append('<div class="c_toolTip '..align..' '..position..'" id="'.. self.id ..'" >')
	self.htmlbuff:append('<div class="pointer"></div>')
	self.htmlbuff:append('<div class="content" >')
	self.htmlbuff:append('<div class="ico"><span class="e_ico-swipe"></span></div>')
	local textAlign = ""
	if attr.textAlign == "center" then
		textAlign = "e_center"
	end
	self.htmlbuff:append('<div class="detail '..textAlign..'">'..attr.text..'</div>')
	if attr.buttonText then
		self.htmlbuff:append('<div class="submit"><span class="e_button">'..attr.buttonText..'</span></div>')
	end
	self.htmlbuff:append('</div></div>')
	self.htmlbuff:append('<script type="text/javascript">')
	self.htmlbuff:append('require(["wmToolTip","wmWebUI"],function(WmToolTip,WmWebUI) {')
	self.htmlbuff:append('var tooltip_'..self.id..' = new WmToolTip("'..self.id..'");')
	if attr.action then
		self.htmlbuff:append('tooltip_'..self.id..'.setCloseAction(function(){ return '..attr.action..'.apply(window,arguments);});')
	else
		self.htmlbuff:append('tooltip_'..self.id..'.setCloseAction();')
	end
	self.htmlbuff:append('tooltip_'..self.id..'.setBaseElement("'..attr.baseId..'");')
	self.htmlbuff:append('tooltip_'..self.id..'.show();')
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",tooltip_'..attr.id..');')
	self.htmlbuff:append('})')
	self.htmlbuff:append('</script>')
end
function WmToolTip:doEndTag()
end
return WmToolTip

ipu-server/web/template/webapp/ipu/VerifyCodeImage.html

@@ -1,18 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport"
	content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<!--1，引入CSS文件 -->
{%>template/common/Head.html%}
<script type="text/javascript" src="biz/js/VerifyCodeImage.js"></script>
<title>验证码图片demo</title>
</head>
<body>
	<div>
		<img id="verifyIMG" alt="点击更换验证码"
			src="data:image/png;base64, {%VERIFY_IMG%}">
	</div>
</body>
</html>

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

@@ -7,7 +7,7 @@ import android.os.Bundle;
import android.os.Handler;
import com.wade.mobile.common.keyboard.KeyboardConstants;
import com.wade.mobile.common.keyboard.keyboardActivity;
import com.wade.mobile.common.keyboard.KeyboardActivity;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.util.EscapeUnescape;
@@ -25,7 +25,7 @@ public class MobileKeyboard extends Plugin {
		functionName = param.getString(0);
		KeyboardConstants.handler = handler;
		Intent intent = new Intent(context, keyboardActivity.class);
		Intent intent = new Intent(context, KeyboardActivity.class);
		startActivityForResult(intent, KEYBORAD);
	}

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

@@ -201,9 +201,7 @@ public class MobileNetWork extends Plugin {
	private String requestBizData(String dataAction, IData param) throws Exception {
		Map<String,String> postData = transPostData(dataAction, param);
		String encode = MobileConfig.getInstance().getEncode();
		String dataUrl = HttpTool.toQueryString(postData);
		dataUrl = HttpTool.urlEncode(dataUrl, encode);
		String dataUrl = HttpTool.toQueryStringWithEncode(postData);
		String result = HttpTool.httpRequest(MobileConfig.getInstance().getRequestUrl(),
				dataUrl, Constant.HTTP_POST);
		if (ServerDataConfig.isEncrypt(dataAction)) {
@@ -220,12 +218,10 @@ public class MobileNetWork extends Plugin {
			MobileSecurity.init(context);
			/* 参数加密处理 */
			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 {