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

display-client/assets/display-client/res/js/mobile/expand-mobile.js

@@ -127,11 +127,17 @@ define(["require"],function(require) {
			},getMemoryCache:function(callback,key,defValue,err){
				storageCallback("getMemoryCache",callback);
				execute("getMemoryCache",[key,defValue],err);
			},setOfflineCache:function(key,value,err){
				execute("setOfflineCache", [key,value],err);
			},getOfflineCache:function(callback,key,defValue,err){
			}setOfflineCache:function(key,value,isEncrypt,err){
				if(isEncrypt==undefined){
					isEncrypt = false;
				}
				execute("setOfflineCache", [key,value,isEncrypt],err);
			},getOfflineCache:function(callback,key,defValue,isEncrypt,err){
				if(isEncrypt==undefined){
					isEncrypt = false;
				}
				storageCallback("getOfflineCache",callback);
				return execute("getOfflineCache", [key,defValue],err);
				return execute("getOfflineCache", [key,defValue,isEncrypt],err);
			},removeOfflineCache:function(key,err){
				execute("removeOfflineCache", [key],err);
			},clearOfflineCache:function(err){

display-client/assets/display-client/res/js/mobile/mobile-browser.js

@@ -96,11 +96,11 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
			browserTool.browser.clearMemoryCache();
		};
		/******************离线缓存**********************/
		this.setOfflineCache = function(key, value){
			browserTool.browser.setOfflineCache(key, value);
		this.setOfflineCache = function(key, value,isEncrypt){
			browserTool.browser.setOfflineCache(key, value,isEncrypt);
		};
		this.getOfflineCache = function(callback, key, value){
			browserTool.browser.getOfflineCache(callback, key, value);
		this.getOfflineCache = function(callback, key, value,isEncrypt){
			browserTool.browser.getOfflineCache(callback, key, value,isEncrypt);
		};
		this.removeOfflineCache = function(key){
			browserTool.browser.removeOfflineCache(key);

display-client/assets/display-client/res/js/mobile/mobile-client.js

@@ -96,15 +96,15 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
			WadeMobile.clearMemoryCache();
		};
		/******************离线缓存**********************/
		this.setOfflineCache = function(key, value){
		this.setOfflineCache = function(key, value,isEncrypt){
			if (clientTool.tool.isDataMap(key)) {
				WadeMobile.setOfflineCache(key.map);
				WadeMobile.setOfflineCache(key.map, value,isEncrypt);
			} else {
				WadeMobile.setOfflineCache(key, value);
				WadeMobile.setOfflineCache(key, value,isEncrypt);
			}
		};
		this.getOfflineCache = function(callback, key, value){
			WadeMobile.getOfflineCache(callback, key, value);
		this.getOfflineCache = function(callback, key, value,isEncrypt){
			WadeMobile.getOfflineCache(callback, key, value,isEncrypt);
		};
		this.removeOfflineCache = function(key){
			WadeMobile.removeOfflineCache(key);

display-client/assets/mobile-action.xml

@@ -194,4 +194,6 @@
	<!-- 物理按键监听 -->
	<action name="setKeyDownFlag" class="com.ai.ipu.mobile.plugin.MobileUI" method="setKeyDownFlag"></action>
	<action name="cleanKeyDownFlag" class="com.ai.ipu.mobile.plugin.MobileUI" method="cleanKeyDownFlag"></action>
	
	<action name="openIPUFromOtherApp" class="com.ai.ipu.func.OpenOtherApp" method="openIPUFromOtherApp"></action>
</actions>

display-client/assets/mobile-config.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configs>
    <!-- 请求主机名或请求地址。包括服务器的ip地址和端口 -->
	<config name="request_host" value="http://www.aiipu.com"/>
	<config name="request_host" value="http://www.aiipu.com:8083"/>
	<!-- 必须。10.0.2.2为Android模拟器的保留ip地址。访问到本机电脑时使用 -->
	<!-- <config name="request_host" value="http://10.0.2.2:8080"/> -->
	<!-- 必须。容器应用名或请求根路径 -->

display-client/src/com/ai/ipu/func/OpenOtherApp.java

@@ -0,0 +1,45 @@
package com.ai.ipu.func;
import org.json.JSONArray;
import org.json.JSONException;
import com.ai.ipu.mobile.frame.IIpuMobile;
import com.ai.ipu.mobile.frame.plugin.Plugin;
import android.content.Intent;
public class OpenOtherApp extends Plugin {
	public OpenOtherApp(IIpuMobile ipumobile) {
		super(ipumobile);
		
	}
	
	public void openIPUFromOtherApp(JSONArray params) {
		try {
			String pageAction = params.getString(0);
			Intent intent = new Intent();
			intent.setClassName("com.ai.ipu.display", "com.ai.ipu.display.MainActivity");
			intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
			intent.putExtra("PAGE_ACTION", pageAction);
			
			if(params.length() > 1) {
				JSONArray array = params.getJSONArray(1);
				String pageParams = array.getString(0);
				if (pageParams != null && pageParams.length() > 0) {
					intent.putExtra("PAGE_PARAMS", pageParams);
				}
				
				String contextParams = array.getString(1);
				if (contextParams != null && contextParams.length() > 0) {
					intent.putExtra("PAGE_CONTEXT", contextParams);
				}
			}
			
			context.startActivity(intent);
		} catch (JSONException e) {
			e.printStackTrace();
		}
	}
}

display-server/src/main/resources/dev/database.xml

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<database limit="100000">
	<display
		type="dbcp"
		driver="com.mysql.jdbc.Driver"
		url="jdbc:mysql://localhost:3306/display?useUnicode=true"
        user="ipu"
        passwd="ipumysql"
		initialSize="5"
		maxActive="20"
		maxIdle="5"
		maxWait="1000"
		/>
</database>

display-server/src/main/resources/test/database.xml

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<database limit="100000">
	<display
		type="dbcp"
		driver="com.mysql.jdbc.Driver"
		url="jdbc:mysql://121.42.183.206:3307/display?useUnicode=true"
        user="ipu"
        passwd="ipumysql"
		initialSize="5"
		maxActive="20"
		maxIdle="5"
		maxWait="1000"
		/>
</database>

display-server/src/main/webapp/res/js/base/jcl.js

@@ -720,7 +720,7 @@ define(["zepto"],function($){
			return r;
		},
		parseString:function(str){
			str=$.parseJsonString(str);
			//str=$.parseJsonString(str);
			//console.log("#####this.parseObject");
			return window.JSON && window.JSON.parse ? this.parseObject(window.JSON.parse(str)) 
					: (new Function("this.parseObject(" +str+")")).apply(this);
@@ -733,7 +733,7 @@ define(["zepto"],function($){
				}else if(obj[p] && $.isObject(obj[p])){
					this.add(p,new $.DataMap(obj[p]));
				}else{
					this.add(p,(obj[p]==undefined || obj[p]==null)?"":obj[p]);
					this.add(p,(obj[p]==undefined || obj[p]==null)?"":obj[p]+"");
				} 
			}
		}
@@ -811,7 +811,7 @@ define(["zepto"],function($){
			return this.length; 
		},	
		parseString:function(str){
			str=$.parseJsonString(str);
			//str=$.parseJsonString(str);
			//console.log("#####this.parseArray");
			return window.JSON && window.JSON.parse ? this.parseArray(window.JSON.parse(str)) : 
				(new Function("this.parseArray(" +str+")")).apply(this);	

ipu-mobile-ui/pom.xml

@@ -4,7 +4,7 @@
	<parent>
		<groupId>com.ai.ipu.mobile</groupId>
		<artifactId>ipu-mobile-aggregator</artifactId>
		<version>3.0</version>
		<version>3.0-SNAPSHOT</version>
	</parent>
	<artifactId>ipu-mobile-ui</artifactId>

ipu-plugin-basic/.classpath

@@ -17,6 +17,5 @@
			<attribute name="maven.pomderived" value="true"/>
		</attributes>
	</classpathentry>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	<classpathentry kind="output" path="target/classes"/>
</classpath>

ipu-plugin-basic/pom.xml

@@ -4,12 +4,27 @@
	<parent>
		<groupId>com.ai.ipu.mobile</groupId>
		<artifactId>ipu-mobile-aggregator</artifactId>
		<version>3.0</version>
		<version>3.0-SNAPSHOT</version>
	</parent>
	<artifactId>ipu-plugin-basic</artifactId>
	<packaging>jar</packaging>
	
	<repositories>
		<repository>
			<id>ipu</id>
			<name>ipu repository</name>
			<url>http://114.215.100.48:9090/nexus/content/groups/public/</url>
			<releases>
				<enabled>true</enabled>
			</releases>
			<snapshots>
				<enabled>true</enabled>
				<updatePolicy>always</updatePolicy>
			</snapshots>
		</repository>
	</repositories>
	
	<properties>
		<scan-code>1.0</scan-code>
		<android-lite-http>1.0</android-lite-http>
@@ -51,7 +66,7 @@
		<dependency>
			<groupId>com.ai.ipu.mobile</groupId>
			<artifactId>ipu-plugin-extend</artifactId>
			<version>${ipu}</version>
			<version>3.0</version>
		</dependency>
	</dependencies>
</project>

ipu-plugin-basic/src/main/java/com/ai/ipu/mobile/plugin/MobileStorage.java

@@ -1,17 +1,17 @@
package com.ai.ipu.mobile.plugin;
import java.security.Key;
import java.util.HashMap;
import java.util.Map;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import com.ai.ipu.basic.string.StringUtil;
import com.ai.ipu.mobile.common.MobileCache;
import com.ai.ipu.mobile.data.SharedPrefUtil;
import com.ai.ipu.mobile.frame.IIpuMobile;
import com.ai.ipu.mobile.frame.plugin.Plugin;
import com.ai.ipu.mobile.frame.template.TemplateManager;
import com.ai.ipu.mobile.util.Constant;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
@@ -139,39 +139,67 @@ public class MobileStorage extends Plugin{
	public void setOfflineCache(JSONArray param) throws Exception {
		String key = param.getString(0);
		String value = param.getString(1);
		setOfflineCache(key, value);
		Boolean isEncrypt = param.getBoolean(2);
		setOfflineCache(key,value,isEncrypt);
		callback(value);
	}
	
	/**写入Android本地存储键值对*/
	public void setOfflineCache(String key,String value){
	public void setOfflineCache(String key,String value,Boolean isEncrypt)throws Exception {
		Key deskey = null;
		if(isEncrypt){
			deskey = TemplateManager.getResKey();
		}
		if (key == null || "".equals(key))
			return;
		if (StringUtil.isDataMap(key)) {
			IData data = new DataMap(key);
			SharedPrefUtil.put(Constant.MobileCache.IPU_MOBILE_STORAGE, data);
			if(isEncrypt){
				SharedPrefUtil.put(Constant.MobileCache.IPU_MOBILE_STORAGE, data,deskey);
			}else{
				SharedPrefUtil.put(Constant.MobileCache.IPU_MOBILE_STORAGE, data);
			}
		} else {
			SharedPrefUtil.put(Constant.MobileCache.IPU_MOBILE_STORAGE, key, value);
			if(isEncrypt){
				SharedPrefUtil.put(Constant.MobileCache.IPU_MOBILE_STORAGE, key, value,deskey);
			}else{
				SharedPrefUtil.put(Constant.MobileCache.IPU_MOBILE_STORAGE, key, value);
			}
		}
	}
	
	public void getOfflineCache(JSONArray param) throws Exception {
		String key = param.getString(0);
		String defValue = param.getString(1);
		String value = getOfflineCache(key, defValue);
		Boolean isEncrypt = param.getBoolean(2);
		String value = getOfflineCache(key, defValue,isEncrypt);
		callback(value);
	}
	
	/**获取 Android 本地存储键值 */
	public String getOfflineCache(String key,String defValue) throws JSONException{
	public String getOfflineCache(String key,String defValue,Boolean isEncrypt) throws Exception{
		Key deskey = null;
		if(isEncrypt){
			deskey = TemplateManager.getResKey();
		}
		if (key == null || "".equals(key))
			return null;
		if (StringUtil.isJSONArray(key)) {
			JSONArray keys = new JSONArray(key);
			JSONObject json =new JSONObject(SharedPrefUtil.get(Constant.MobileCache.IPU_MOBILE_STORAGE, keys));
			JSONObject json = null;
			if(isEncrypt){
				 json =new JSONObject(SharedPrefUtil.get(Constant.MobileCache.IPU_MOBILE_STORAGE, keys,deskey));
			}else{
				 json =new JSONObject(SharedPrefUtil.get(Constant.MobileCache.IPU_MOBILE_STORAGE, keys));
			}
			return json.toString();
		} else {
			return SharedPrefUtil.get(Constant.MobileCache.IPU_MOBILE_STORAGE, key, defValue);
			if(isEncrypt){
				return SharedPrefUtil.get(Constant.MobileCache.IPU_MOBILE_STORAGE, key, defValue,deskey);
			}else{
				return SharedPrefUtil.get(Constant.MobileCache.IPU_MOBILE_STORAGE, key, defValue);
			}
			
		}
	}
	

ipu-web-libs/pom.xml

@@ -11,7 +11,7 @@
	<distributionManagement>
		<repository>
			<id>exus-service-ipu-repository</id>
			<id>ipu-exus</id>
			<name>nexus service ipu repository</name>
			<url>http://114.215.100.48:9090/nexus/content/repositories/ipu/</url>
		</repository>
@@ -319,5 +319,45 @@
		</pluginManagement>
		<outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
		<resources>
			<resource>
				<directory>${project.basedir}/src/main/resources</directory>
				<!-- 资源根目录排除各环境的配置，防止在生成目录中多余其它目录 -->
				<excludes>
					<exclude>test/*</exclude>
					<exclude>pro/*</exclude>
					<exclude>dev/*</exclude>
				</excludes>
			</resource>
			<resource>
				<directory>src/main/resources/${profiles.active}</directory>
			</resource>
		</resources>
	</build>
	<profiles>
		<profile>
			<!-- 本地开发环境 -->
			<id>dev</id>
			<properties>
				<profiles.active>dev</profiles.active>
			</properties>
			<activation>
				<activeByDefault>true</activeByDefault>
			</activation>
		</profile>
		<profile>
			<!-- 测试环境 -->
			<id>test</id>
			<properties>
				<profiles.active>test</profiles.active>
			</properties>
		</profile>
		<profile>
			<!-- 生产环境 -->
			<id>pro</id>
			<properties>
				<profiles.active>pro</profiles.active>
			</properties>
		</profile>
	</profiles>
</project>