Pārlūkot izejas kodu

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

kevin 9 gadi atpakaļ
vecāks
revīzija
c6b8b307c4

+ 2 - 2
display-client/AndroidManifest.xml

@ -5,8 +5,8 @@
5 5
    android:versionName="1.3" >
6 6

7 7
    <uses-sdk
8
        android:minSdkVersion="10"
9
        android:targetSdkVersion="15" /><!-- minSdkVersion modify to 10 by wyj for nfc  -->
8
        android:minSdkVersion="8"
9
        android:targetSdkVersion="15" />
10 10

11 11
    <uses-permission android:name="android.permission.CAMERA" />
12 12
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

+ 1 - 1
display-client/assets/mobile-action.xml

@ -19,7 +19,7 @@
19 19
	<action name="downloadWithServlet" class="com.wade.mobile.func.MobileNetWork" method="downloadWithServlet"></action>
20 20
	<action name="uploadWithServlet" class="com.wade.mobile.func.MobileNetWork" method="uploadWithServlet"></action>
21 21
	<!-- NFC -->
22
	<action name="initDfc" class="com.wade.mobile.func.MobileDevice" method="initDfc"></action>
22
	<action name="initNfc" class="com.wade.mobile.func.MobileDevice" method="initNfc"></action>
23 23
	
24 24
	<!-- MobileUI -->
25 25
	<action name="tip" class="com.wade.mobile.func.MobileUI" method="tip"/>

+ 1 - 1
display-client/assets/mobile-config.xml

@ -17,7 +17,7 @@
17 17
	<!-- 非必须。进入应用时的欢迎页面 --><!-- file:///android_asset为固定写法,表示工程的asset目录 -->
18 18
	<config name="loading_page" value="file:///android_asset/local/welcome.html"/>
19 19
	<!-- 非必须。更新应用的url -->
20
	<config name="update_url" value="setup/display-client.apk"/>
20
	<config name="update_url" value="http://114.215.100.48:8080/setup/display-client.apk"/>
21 21
	<!-- 推送平台服务地址 -->
22 22
	<config name="push_address" value="114.215.100.48"/>
23 23
	<!-- 推送平台服务端口 -->

+ 3 - 2
display-server/web/biz/js/plugin/nfc.js

@ -14,10 +14,11 @@ require(["domReady!","mobile","jcl","tap"],function(doc, Mobile, $) {
14 14
		cmds1.put("cmd5","805C000204");
15 15
		var cmds = new $.DataMap();
16 16
		cmds.put("cmds1",cmds1);
17
		Mobile.initDfc(cmds);
17
		Mobile.initNfc(cmds);
18 18
	});
19 19
	
20
	// 读取NFC的信息的回调
20 21
	window.getNfcMsg = function(msg){
21 22
		alert(msg);
22 23
	}
23
});
24
});

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

@ -306,8 +306,8 @@ define(["require"],function(require) {
306 306
				execute("setScreeLock",[dataAction,param,indexPage],err);
307 307
			},screeUnlock:function(screenUnlockType, forgetPageAction, err){
308 308
				execute("screeUnlock",[screenUnlockType, forgetPageAction],err);
309
			},initDfc:function(cmds, err) {
310
				execute("initDfc", [cmds], err);
309
			},initNfc:function(cmds, err) {
310
				execute("initNfc", [cmds], err);
311 311
			}
312 312
		};
313 313
	})();

+ 2 - 2
display-server/web/res/js/mobile/mobile-browser.js

@ -219,8 +219,8 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
219 219
			alert("等待实现");
220 220
		}
221 221
		// 初始化NFC
222
		this.initDfc = function(data,err){
223
			alert("等待实现");
222
		this.initNfc = function(data,err){
223
			alert("浏览器不支持NFC功能");
224 224
		}
225 225
	}
226 226
	

+ 2 - 2
display-server/web/res/js/mobile/mobile-client.js

@ -182,8 +182,8 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
182 182
			WadeMobile.openNative(data.toString(),err);
183 183
		}
184 184
		// 初始化NFC
185
		this.initDfc = function(data,err){
186
			WadeMobile.initDfc(data.toString(),err);
185
		this.initNfc = function(data,err){
186
			WadeMobile.initNfc(data.toString(),err);
187 187
		}
188 188
		
189 189
	};

+ 2 - 2
multiple-client/assets/mobile-config.xml

@ -5,7 +5,7 @@
5 5
	<config name="request_host" value="http://10.0.2.2:8080"/>
6 6
	-->
7 7
	<!-- 必须。10.0.2.2为Android模拟器的保留ip地址。访问到本机电脑时使用 -->
8
	<config name="request_host" value="http://192.168.1.109:18080"/> 
8
	<config name="request_host" value="http://114.215.100.48:8080"/> 
9 9
	<!-- 必须。容器应用名或请求根路径 -->
10 10
	<config name="request_path" value="/mult"/>
11 11
	<!-- 必须。数据接口的servlet路径 -->
@ -21,7 +21,7 @@
21 21
	<!-- 非必须。进入应用时的欢迎页面 --><!-- file:///android_asset为固定写法,表示工程的asset目录 -->
22 22
	<config name="loading_page" value="file:///android_asset/local/welcome.html"/>
23 23
	<!-- 非必须。更新应用的url -->
24
	<config name="update_url" value="setup/display-client.apk"/>
24
	<config name="update_url" value="http://114.215.100.48:8080/setup/multiple-client.apk"/>
25 25
	<!-- 推送平台服务地址 -->
26 26
	<config name="push_address" value="114.215.100.48"/>
27 27
	<!-- 推送平台服务端口 -->

+ 2 - 2
multiple-client/src/com/ai/mobile/multiple/SubAppActivity.java

@ -77,8 +77,8 @@ public class SubAppActivity extends TemplateSubActivity{
77 77
	/**
78 78
	 * 进度条样式
79 79
	 */
80
	protected String getDialogStyle() {
81
		return PROGRESS_BAR_DIALOG;
80
	protected LoadingDialogStyle getLoadingDialogStyle() {
81
		return LoadingDialogStyle.HORIZONTAL;
82 82
	}
83 83
	
84 84
	/**

+ 1 - 1
multiple-server/.classpath

@ -39,7 +39,6 @@
39 39
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-common.jar"/>
40 40
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-database.jar"/>
41 41
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-mobile-data.jar"/>
42
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-mobile-server.jar"/>
43 42
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-sqlite-jdbc.jar"/>
44 43
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpasyncclient-4.0.1.jar"/>
45 44
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpcore-4.4.3.jar"/>
@ -60,5 +59,6 @@
60 59
	<classpathentry kind="lib" path="/wade-mobile-library/common/saaj.jar"/>
61 60
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-cache.jar"/>
62 61
	<classpathentry kind="lib" path="/wade-mobile-library/common/ehcache-1.6.0.jar"/>
62
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile-server"/>
63 63
	<classpathentry kind="output" path="web/WEB-INF/classes"/>
64 64
</classpath>

+ 1 - 3
multiple-server/etc/memcache.xml

@ -6,9 +6,7 @@
6 6
        <cluster name="SSN_CACHE">
7 7
            <heartbeat-second>2</heartbeat-second>
8 8
            <pool-size>5</pool-size>
9
            <address master="10.7.5.77:10001"/>
10
            <address master="10.7.5.77:10002"/>
11
            <address master="10.7.5.77:30001"/>
9
            <address master="127.0.0.1:11211"/>
12 10
        </cluster>
13 11
    </datacenter>
14 12
</memcache>

+ 9 - 0
multiple-server/etc/server-data-result.txt

@ -0,0 +1,9 @@
1
LoginBean.createCheckCode={"BASE64_IMAGE":"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","SESSION_ID":"561450230721396"}
2
LoginBean.refrashCheckCode={"BASE64_IMAGE":"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"}
3
LoginBean.checkUserInfoBy4A={"uuid":"ff808081515c41ea01515c7fde480003","CODE":"00"}
4
LoginBean.checkSmsPwdBy4A={"employeeCodes":[{"employeeCode":"C8003"},{"employeeCode":"C8000"},{"employeeCode":"C90114"}],"SEQ":"100000009970","CODE":"00"}
5
LocusPassWord.saveUuid={}
6
LoginBean.doLogin={"USER_NAME":"CS114593_01","SESSION_ID":"271450231500240","CODE":"00"}
7
LoginBean.checkLogin={"USER_NAME":"CS114593_01","SESSION_ID":"531450231390975","UUID":"0000000000000003092070243"}
8
IndexBean.getAppDatas={"APPS":[{"appName":"政企客户信息","requestServlet":"/mobiledata","appPath":"eci","appId":"eci","appIcon":"e_ico-eci","appIndexPage":"EciMenu","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-eci.htm","requestPath":"/eci-server","requestHost":"http://114.215.100.48:8080","appType":"I"},{"appName":"智能终端CRM","requestServlet":"/mobiledata","appPath":"smartCRM","appId":"smartCRM","appIcon":"e_ico-wade-ob","appIndexPage":"Index","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-smartCRM.htm","requestPath":"/smartCRM","requestHost":"http://114.215.100.48:8080","appType":"I"},{"appName":"实名登记","requestServlet":"/mobiledata","appPath":"realname-server","appId":"realname","appIcon":"e_ico-realname","appIndexPage":"Index","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-realname.htm","requestPath":"/realname-server","requestHost":"http://114.215.100.48:8080","appType":"I"},{"appName":"光宽带","requestServlet":"/mobiledata","appPath":"guangkuandai","appId":"guangkuandai","appIcon":"e_ico-guangkuandai","appIndexPage":"Index","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-guangkuandai.htm","requestPath":"/appserver","requestHost":"http://114.215.100.48:8080","appType":"I"},{"appName":"换卡易","requestServlet":"/mobiledata","appPath":"bukayi","appId":"bukayi","appIcon":"e_ico-bukayi","appIndexPage":"UserConfirm","belong":"SELF,CHANNAL","appWelcomePage":"welcome/Welcome-bukayi.htm","requestPath":"/bukayi-server","requestHost":"http://114.215.100.48:8080","appType":"I"}]}
9
LoginBean.initAppConfig={}

+ 9 - 9
multiple-server/etc/server-data.xml

@ -1,16 +1,16 @@
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<datas>
3 3
	<!-- 登陆初始化 -->
4
	<action name="LoginBean.createCheckCode" class="com.ai.server.multiple.bean.LoginBean" method="createCheckCode" verify="false" encrypt="true"></action>
5
    <action name="LoginBean.refrashCheckCode" class="com.ai.server.multiple.bean.LoginBean" method="refrashCheckCode" verify="false" encrypt="true"></action>
6
	<action name="LoginBean.checkUserInfoBy4A" class="com.ai.server.multiple.bean.LoginBean" method="checkUserInfoBy4A" verify="false" encrypt="true"></action>
7
    <action name="LoginBean.checkSmsPwdBy4A" class="com.ai.server.multiple.bean.LoginBean" method="checkSmsPwdBy4A" verify="false" encrypt="true"></action>
8
   	<action name="LocusPassWord.saveUuid" class="com.ai.server.multiple.bean.LocusPassWord" method="saveUuid" verify="false" encrypt="true"></action>
4
	<action name="LoginBean.createCheckCode" class="com.ailk.mobile.frame.bean.SimulatedBean" method="invoke" verify="false" encrypt="true"></action>
5
    <action name="LoginBean.refrashCheckCode" class="com.ailk.mobile.frame.bean.SimulatedBean" method="invoke" verify="false" encrypt="true"></action>
6
	<action name="LoginBean.checkUserInfoBy4A" class="com.ailk.mobile.frame.bean.SimulatedBean" method="invoke" verify="false" encrypt="true"></action>
7
    <action name="LoginBean.checkSmsPwdBy4A" class="com.ailk.mobile.frame.bean.SimulatedBean" method="invoke" verify="false" encrypt="true"></action>
8
   	<action name="LocusPassWord.saveUuid" class="com.ailk.mobile.frame.bean.SimulatedBean" method="invoke" verify="false" encrypt="true"></action>
9 9
	<!-- 登陆 -->
10
	<action name="LoginBean.doLogin" class="com.ai.server.multiple.bean.LoginBean" method="doLogin" verify="false" encrypt="true"></action>
11
	<action name="LoginBean.checkLogin" class="com.ai.server.multiple.bean.LoginBean" method="checkLogin" verify="false" encrypt="true"></action>
12
	<action name="IndexBean.getAppDatas" class="com.ai.server.multiple.bean.IndexBean" method="getAppDatas" verify="true" encrypt="true"></action>
13
	<action name="LoginBean.initAppConfig" class="com.ai.server.multiple.bean.LoginBean" method="initAppConfig" verify="false"></action>
10
	<action name="LoginBean.doLogin" class="com.ailk.mobile.frame.bean.SimulatedBean" method="invoke" verify="false" encrypt="true"></action>
11
	<action name="LoginBean.checkLogin" class="com.ailk.mobile.frame.bean.SimulatedBean" method="invoke" verify="false" encrypt="true"></action>
12
	<action name="IndexBean.getAppDatas" class="com.ailk.mobile.frame.bean.SimulatedBean" method="invoke" verify="false" encrypt="true"></action>
13
	<action name="LoginBean.initAppConfig" class="com.ailk.mobile.frame.bean.SimulatedBean" method="invoke" verify="false"></action>
14 14
	
15 15
	
16 16
</datas>

+ 4 - 2
multiple-server/web/biz/css/project.css

@ -55,7 +55,8 @@
55 55
.e_ico-guangkuandai,
56 56
.e_ico-bukayi,
57 57
.e_ico-realname,
58
.e_ico-wade-ob { font-family:"project";}
58
.e_ico-wade-ob,
59
.e_ico-eci { font-family:"project";}
59 60
.m_nav .e_ico-conect { color:#8fc320;}
60 61
.m_nav .e_ico-net { color:#c37c20;}
61 62
.m_nav .e_ico-position { color:#c33f20;}
@ -83,7 +84,8 @@
83 84
.m_nav .e_ico-wade-ob { color:#8fc320;}
84 85
.m_nav .e_ico-realname { color:#4489ac;}
85 86

86

87
.e_ico-eci:before{ content:"\e624";} /*政企的字体图标*/
88
.e_ico-eci { color:#448AFF;}	/*政企的字体图标颜色*/
87 89

88 90
.m_welcome { background:#333; width:100%; height:100%; color:#fff; overflow:hidden;}
89 91
.m_welcome .slogan { font-family:"project"; text-align:center; margin-top:1.2rem;}

BIN
multiple-server/web/biz/img/project.ttf


BIN
multiple-server/web/biz/img/welcome-eci.jpg


BIN
multiple-server/web/key/eci


BIN
multiple-server/web/key/smartCRM


+ 15 - 0
multiple-server/web/welcome/Welcome-eci.htm

@ -0,0 +1,15 @@
1
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2
<html>
3
<head>
4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5
<style type="text/css">
6
	body { margin:0; padding:0;position:absolute;width:100%;height:100%;overflow:hidden;}
7
	div { margin:0; padding:0;}
8
	img { border:0; outline: none; vertical-align:middle;width:100%; height:100%;}
9
</style>
10
<title>加载中</title>
11
</head>
12
<body>
13
<img src="../biz/img/welcome-eci.jpg" />
14
</body>
15
</html>

+ 1 - 0
wade-mobile-func/.classpath

@ -10,5 +10,6 @@
10 10
	<classpathentry kind="lib" path="libs/wade-mobile-ui.jar"/>
11 11
	<classpathentry kind="lib" path="libs/unirest-java-1.3.2-SNAPSHOT-withDependency-ShadedForAndroid.jar"/>
12 12
	<classpathentry combineaccessrules="false" kind="src" path="/wade-mobile-com"/>
13
	<classpathentry kind="lib" path="libs/wade-mobile.jar"/>
13 14
	<classpathentry kind="output" path="bin"/>
14 15
</classpath>

BIN
wade-mobile-func/libs/wade-mobile.jar


+ 9 - 1
wade-mobile-func/src/com/wade/mobile/func/MobileDevice.java

@ -4,13 +4,16 @@ import org.json.JSONArray;
4 4
import org.json.JSONObject;
5 5

6 6
import android.content.Intent;
7
import android.os.Build;
7 8
import android.os.Bundle;
8 9
import android.os.Handler;
9 10

11
import com.wade.mobile.app.MobileAppInfo;
10 12
import com.wade.mobile.common.nfc.activity.NfcActivity;
11 13
import com.wade.mobile.common.nfc.util.NfcConstant;
12 14
import com.wade.mobile.frame.IWadeMobile;
13 15
import com.wade.mobile.frame.plugin.Plugin;
16
import com.wade.mobile.ui.helper.HintHelper;
14 17
import com.wade.mobile.util.EscapeUnescape;
15 18

16 19
public class MobileDevice extends Plugin {
@ -27,7 +30,12 @@ public class MobileDevice extends Plugin {
27 30
	 * @param param
28 31
	 * @throws Exception
29 32
	 */
30
	public void initDfc(JSONArray param) throws Exception {
33
	public void initNfc(JSONArray param) throws Exception {
34
		if (Build.VERSION.SDK_INT < MobileAppInfo.Android_2_3_3) {
35
			HintHelper.alert(context, "版本过低,不能使用NFC");
36
			return;
37
		}
38
		
31 39
		NfcConstant.handler = handler;
32 40

33 41
		String cmdsStr = param.getString(0);