Browse Source

提交pageHandler代码

leijie 8 years ago
parent
commit
8f3a02420a

+ 13 - 6
display-client/AndroidManifest.xml

@ -59,7 +59,10 @@
59 59
        android:label="@string/app_name"
60 60
        android:theme="@style/AppTheme" 
61 61
        android:hardwareAccelerated="true"> <!-- Application级应用加速,可以降低到Activity级 -->
62
        <meta-data
62
        <!-- <meta-data
63
            android:name="com.amap.api.v2.apikey"
64
            android:value="6afee5dced4c3b3a43c0feb11399bded"/> -->
65
            <meta-data
63 66
            android:name="com.amap.api.v2.apikey"
64 67
            android:value="6afee5dced4c3b3a43c0feb11399bded"/>
65 68
        <activity
@ -105,6 +108,10 @@
105 108
        <activity
106 109
            android:name="com.wade.mobile.ui.activity.CustomWindowActivity">
107 110
        </activity>
111
        <!-- openUrl -->
112
        <activity
113
            android:name="com.wade.mobile.ui.activity.OpenUrlActivity">
114
        </activity>
108 115
        <!-- 侧滑菜单 -->
109 116
        <activity android:name="com.wade.mobile.ui.activity.SlidingMenuActivity"
110 117
            android:theme="@style/SlidingMenuTheme" >
@ -234,11 +241,11 @@
234 241
            android:name="com.baidu.speech.VoiceRecognitionService"
235 242
            android:exported="false" />
236 243
		<activity
237
                android:name="com.baidu.voicerecognition.android.ui.BaiduASRDigitalDialog"
238
                android:configChanges="orientation|keyboardHidden|screenLayout"
239
                android:theme="@android:style/Theme.Dialog"
240
                android:exported="false"
241
                android:screenOrientation="portrait">
244
            android:name="com.baidu.voicerecognition.android.ui.BaiduASRDigitalDialog"
245
            android:configChanges="orientation|keyboardHidden|screenLayout"
246
            android:theme="@android:style/Theme.Dialog"
247
            android:exported="false"
248
            android:screenOrientation="portrait">
242 249
            <intent-filter>
243 250
                <action android:name="com.baidu.action.RECOGNIZE_SPEECH" />
244 251
                <category android:name="android.intent.category.DEFAULT" />

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

@ -28,6 +28,7 @@
28 28
	<action name="tip" class="com.wade.mobile.func.MobileUI" method="tip"/>
29 29
    <action name="alert" class="com.wade.mobile.func.MobileUI" method="alert"/>
30 30
	<action name="loadUrl" class="com.wade.mobile.func.MobileUI" method="loadUrl"/>
31
	<action name="openUrl" class="com.wade.mobile.func.MobileUI" method="openUrl"/>
31 32
	<action name="openPage" class="com.wade.mobile.func.MobileUI" method="openPage"/>
32 33
	<action name="openTemplate" class="com.wade.mobile.func.MobileUI" method="openTemplate"/>
33 34
	<action name="loadPage" class="com.wade.mobile.func.MobileUI" method="loadPage"/>

+ 2 - 2
display-server/src/main/webapp/biz/js/plugin/pageHandler/pageHandler.js

@ -18,7 +18,7 @@ require(["domReady!","wadeMobile","mobile","util"], function(doc,WadeMobile,Mobi
18 18
	$("#loadUrl").tap(function(){
19 19
		Mobile.loadUrl("https://www.baidu.com");
20 20
	});
21
	$("#openBrower").tap(function(){
22
		WadeMobile.openBrower("https://www.baidu.com");
21
	$("#openBrowser").tap(function(){
22
		WadeMobile.openBrowser("https://www.baidu.com");
23 23
	});
24 24
});

+ 2 - 0
display-server/src/main/webapp/res/js/mobile/wade-mobile.js

@ -62,6 +62,8 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
62 62
				execute("dataRequest", [dataAction,param,encode,conTimeout,readTimeout],err);
63 63
			},loadUrl:function(url,err){
64 64
				execute("loadUrl", [encodeURIComponent(url)],err);
65
			},openUrl:function(url,err){
66
				execute("openUrl", [encodeURIComponent(url)],err);
65 67
			},openPage:function(action,data,err){
66 68
				execute("openPage", [action,data],err);
67 69
			},openTemplate:function(action,context,err){

+ 2 - 2
display-server/src/main/webapp/template/webapp/PluginIndex.html

@ -81,10 +81,10 @@
81 81
		<div class="text">视频压缩</div>
82 82
	</li>
83 83
	
84
	<li action="PageHandler">
84
<!-- 	<li action="PageHandler">
85 85
		<div class="pic"><span class="e_ico-conect"></span></div>
86 86
		<div class="text">界面操作</div>
87
	</li>
87
	</li> -->
88 88

89 89
   <!--  <li action="AppPlugins">
90 90
        <div class="pic"><span class="e_ico-data"></span></div>

+ 2 - 2
display-server/src/main/webapp/template/webapp/plugin/PageHandler/PageHandler.html

@ -63,9 +63,9 @@
63 63
					</div>
64 64
				</li>
65 65
				
66
				<li id="openBrower">
66
				<li id="openBrowser">
67 67
					<div class="content">
68
						<div class="main">openBrower</div>
68
						<div class="main">openBroswer</div>
69 69
						<div class="fn fn-2">测试</div>
70 70
					</div>
71 71
				</li>