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

Conflicts:
	wade-mobile-common/.classpath
	wade-mobile-common/libs/wade-mobile-com.jar

display-client/AndroidManifest.xml

@@ -112,6 +112,10 @@
        <activity
            android:name="com.wade.mobile.ui.activity.OpenUrlActivity">
        </activity>
        <!-- 打开自定义浏览器 -->
        <activity
            android:name="com.wade.mobile.common.browser.BrowserActivity">
        </activity>
        <!-- 侧滑菜单 -->
        <activity android:name="com.wade.mobile.ui.activity.SlidingMenuActivity"
            android:theme="@style/SlidingMenuTheme" >

display-client/assets/mobile-action.xml

@@ -22,6 +22,8 @@
	<action name="downloadWithServlet" class="com.wade.mobile.func.MobileNetWork" method="downloadWithServlet"></action>
	<action name="uploadWithServlet" class="com.wade.mobile.func.MobileNetWork" method="uploadWithServlet"></action>
	<action name="openBrowser" class="com.wade.mobile.func.MobileNetWork" method="openBrowser" ></action>
	<!-- 打开浏览器插件 -->
	<action name="openIpuBrowser" class="com.wade.mobile.func.MobileBrowser" method="openIpuBrowser" ></action>
	<!-- NFC -->
	<action name="initNfc" class="com.wade.mobile.func.MobileDevice" method="initNfc"></action>
	

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

@@ -12,15 +12,22 @@ require(["domReady!","wadeMobile","mobile","util"], function(doc,WadeMobile,Mobi
	$("#loadTemplate").tap(function(){
		Mobile.loadTemplate("PageA");
	});
	// 被打开的url，不管停留在哪一层页面，按返回会提示退出
	$("#openUrl").tap(function(){
		Mobile.openUrl("https://www.baidu.com");
	});
	// 被打开的url，不管停留在哪一层页面，直接退出至ipu主页面
	$("#loadUrl").tap(function(){
		Mobile.loadUrl("https://www.baidu.com");
	});
	// 打开原生的浏览器窗口
	$("#openBrowser").tap(function(){
		WadeMobile.openBrowser("https://www.baidu.com");
	});
	// 在IPU应用中集成浏览器功能，打开自定义浏览器
	$("#openIpuBroswer").tap(function() {
		WadeMobile.openIpuBrowser("https://www.baidu.com","true");
	});
	$("#back").tap(function(){
		Mobile.openPage("KeyDownListen");
	});

display-server/src/main/webapp/res/js/mobile/expand-mobile.js

@@ -162,6 +162,8 @@ define(["require"],function(require) {
				execute("shareByBluetooth", [],err);
			},openBrowser:function(url,err){
				execute("openBrowser",[url],err);
			},openIpuBrowser:function(url,hasTitle,err){
				execute("openIpuBrowser",[url,hasTitle],err);
			},setSmsListener:function(callback,telString,err){
				storageCallback("setSmsListener", callback);
				execute("setSmsListener", [telString],err);

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

@@ -69,6 +69,13 @@
						<div class="fn fn-2">测试</div>
					</div>
				</li>
				
				<li id="openIpuBroswer">
					<div class="content">
						<div class="main">openIpuBroswer</div>
						<div class="fn fn-2">测试</div>
					</div>
				</li>
			</ul>
		</div>
		

wade-mobile-common/.classpath

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

wade-mobile-common/project.properties

@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-22
target=android-19
android.library=true

wade-mobile-common/res/layout/browser.xml

@@ -0,0 +1,77 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:background="#ffffff"
    android:orientation="vertical" >
    <LinearLayout
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical" >
        <LinearLayout
            android:id="@+id/layout"
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
            android:visibility="gone" >
            <EditText
                android:id="@+id/et_url"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:inputType="textUri"
                android:singleLine="true" />
            <Button
                android:id="@+id/btn_visit"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="@string/visit" />
        </LinearLayout>
        <LinearLayout
            android:id="@+id/ll_btn"
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:gravity="center_horizontal"
            android:orientation="horizontal" >
            <Button
                android:id="@+id/btn_home"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="@string/home" />
            <Button
                android:id="@+id/btn_left"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="@string/left" />
            <Button
                android:id="@+id/btn_right"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="@string/right" />
            <Button
                android:id="@+id/btn_exit"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="@string/exit" />
        </LinearLayout>
        <WebView
            android:id="@+id/web"
            android:layout_width="fill_parent"
            android:layout_height="fill_parent" />
    </LinearLayout>
</LinearLayout>

wade-mobile-common/res/values/strings_browser.xml

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <string name="home">主页</string>
    <string name="left">后退</string>
    <string name="right">前进</string>
    <string name="exit">退出</string>
    <string name="visit">访问</string>
</resources>

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

@@ -0,0 +1,35 @@
package com.wade.mobile.func;
import org.json.JSONArray;
import android.content.Intent;
import android.os.Bundle;
import com.wade.mobile.common.browser.BrowserActivity;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
/**
 * 打开浏览器插件
 * @author wangyujuan
 *
 */
public class MobileBrowser extends Plugin {
	
	private int BROWSER = 90004;
	public MobileBrowser(IWadeMobile wademobile) {
		super(wademobile);
	}
	public void openIpuBrowser(JSONArray param) throws Exception {
		String url = param.getString(0);
		String hasTitle = param.getString(1);
		Intent intent = new Intent(context, BrowserActivity.class);
	    Bundle bundle=new Bundle();
	    bundle.putString("url", url);
	    bundle.putString("hasTitle", hasTitle);
	    intent.putExtras(bundle);
	    startActivityForResult(intent, BROWSER);
	}
}