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

修改display-clientbluetooth中的相关配置文件

display-client/AndroidManifest.xml

@@ -106,10 +106,16 @@
            android:theme="@style/SlidingMenuTheme" >
        </activity>
        <!-- 蓝牙分享 -->
        <!-- 
        <activity
            android:name="com.wade.mobile.common.bluetooth.activity.ShareByBluetoothActivity"
            android:theme="@style/ShareApkDialogTheme" >
        </activity>
         -->
         <activity
             android:name="com.ai.ipu.bluetooth.activity.ShareByBluetoothActivity"
             android:theme="@style/ShareApkDialogTheme">
         </activity>
          <!-- 二维码扫描 -->
		<!--        
		<activity

display-client/assets/mobile-action.xml

@@ -14,7 +14,9 @@
	<action name="httpRequest" class="com.wade.mobile.func.MobileNetWork" method="httpRequest"/>
	<action name="storageDataByThread" class="com.wade.mobile.func.MobileNetWork" method="storageDataByThread"/>
	<action name="httpDownloadFile" class="com.wade.mobile.func.MobileNetWork" method = "httpDownloadFile"/>
	<!-- 
	<action name="shareByBluetooth" class="com.wade.mobile.func.MobileNetWork" method="shareByBluetooth"></action>
	 -->
	<action name="setSmsListener" class="com.wade.mobile.func.MobileNetWork" method="setSmsListener"></action>
	<action name="downloadWithServlet" class="com.wade.mobile.func.MobileNetWork" method="downloadWithServlet"></action>
	<action name="uploadWithServlet" class="com.wade.mobile.func.MobileNetWork" method="uploadWithServlet"></action>
@@ -141,4 +143,7 @@
	<action name="startListen" class="com.ai.ipu.voice.IpuVoicePlugin" method="startListen"></action>
	<action name="endListen" class="com.ai.ipu.voice.IpuVoicePlugin" method="endListen"></action>
	<action name="voiceSpeak" class="com.ai.ipu.voice.IpuVoicePlugin" method="voiceSpeak"></action>
	
	<!-- BlutTooth -->
		<action name="shareByBluetooth" class="com.ai.ipu.bluetooth.func.MobileNetWork" method="shareByBluetooth"></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://172.20.10.2:8080"/>
	<config name="request_host" value="http://169.254.90.90:8080"/>
	<!-- 必须。10.0.2.2为Android模拟器的保留ip地址。访问到本机电脑时使用 -->
	<!-- <config name="request_host" value="http://10.0.2.2:8080"/> -->
	<!-- 必须。容器应用名或请求根路径 -->
@@ -37,4 +37,4 @@
	<!-- 非必须，默认false。打开调试模式，不再比对资源版本，客户端每次下载所有资源-->
	<config name="is_debug" value="false"/>
	<config name="remote_url" value="http://10.0.2.2:8080/g/html/myindex.html" />
</configs>
</configs>