39c1b9566c5f809b2ace53764854091e8R4">4 
    android:layout_height="fill_parent" >
5
6 
    <SurfaceView
7 
        android:id="@+id/preview_view"
8 
        android:layout_width="wrap_content"
9 
        android:layout_height="wrap_content"
10 
        android:layout_gravity="center" />
11
12 
    <RelativeLayout
13 
        android:layout_width="match_parent"
14 
        android:layout_height="match_parent"
15 
        android:layout_gravity="center">
16
17 
        <ImageButton
18 
            android:id="@+id/btn_cancel_scan"
19 
            android:layout_width="wrap_content"
20 
            android:layout_height="wrap_content"
21 
            android:layout_alignParentLeft="true"
22 
            android:layout_alignParentTop="true"
23 
            android:src="@drawable/scan_cancel_normal" />
24
25 
        <ImageButton
26 
            android:id="@+id/btn_flashlight"
27 
            android:layout_width="wrap_content"
28 
            android:layout_height="wrap_content"
29 
            android:layout_alignParentRight="true"
30 
            android:layout_alignParentTop="true"
31 
            android:src="@drawable/scan_flashlight_off" />
32
33 
        <com.wade.mobile.common.scan.view.ViewfinderView
34 
	        android:id="@+id/viewfinder_view"
35 
	        android:layout_width="wrap_content"
36 
	        android:layout_height="wrap_content"/>
37
38 
    </RelativeLayout>
39 
</FrameLayout>

+ 77 - 0
wade-mobile-common/res/layout/share_apk_activity.xml
Voir le fichier 

@ -0,0 +1,77 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:layout_width="300dp"
4 
    android:layout_height="400dp"
5 
    android:background="#060514"
6 
    android:orientation="vertical" >
7
8 
    <TextView
9 
        android:id="@+id/share"
10 
        android:layout_width="match_parent"
11 
        android:layout_height="wrap_content"
12 
        android:gravity="center"
13 
        android:text="@string/sa_share"
14 
        android:textColor="#FFFFFF"
15 
        android:textSize="20sp" />
16
17 
    <View
18 
        android:layout_width="match_parent"
19 
        android:layout_height="1dp"
20 
        android:layout_marginBottom="2dp"
21 
        android:layout_marginTop="2dp"
22 
        android:background="#696969" />
23
24 
    <ListView
25 
        android:id="@+id/deviceListView"
26 
        android:layout_width="match_parent"
27 
        android:layout_height="0dp"
28 
        android:layout_weight="1"
29 
        android:isScrollContainer="true"
30 
        android:paddingTop="5dp" >
31 
    </ListView>
32
33 
    <View
34 
        android:layout_width="match_parent"
35 
        android:layout_height="1dp"
36 
        android:layout_marginBottom="2dp"
37 
        android:layout_marginTop="2dp"
38 
        android:background="#696969" />
39
40 
    <RelativeLayout
41 
        android:layout_width="wrap_content"
42 
        android:layout_height="50dp" >
43
44 
        <Button
45 
            android:id="@+id/exit"
46 
            android:layout_width="140dp"
47 
            android:layout_height="wrap_content"
48 
            android:layout_marginRight="5dp"
49 
            android:paddingLeft="20dp"
50 
            android:text="@string/sa_exit"
51 
            android:textColor="#FFFFFF"
52 
            android:textSize="20sp" />
53
54 
        <View
55 
            android:layout_width="1dip"
56 
            android:layout_height="50dp"
57 
            android:layout_gravity="center_horizontal"
58 
            android:layout_centerInParent="true"
59 
            android:background="#696969"
60 
            android:layout_marginLeft="3dp"
61 
            android:layout_marginRight="3dp"
62 
             />
63
64 
        <Button
65 
            android:id="@+id/search"
66 
            android:layout_width="140dp"
67 
            android:layout_height="wrap_content"
68 
            android:layout_alignParentRight="true"
69 
            android:layout_alignTop="@id/exit"
70 
            android:layout_marginRight="5dp"
71 
            android:paddingRight="20dp"
72 
            android:text="@string/sa_search"
73 
            android:textColor="#FFFFFF"
74 
            android:textSize="20sp" />
75 
    </RelativeLayout>
76
77 
</LinearLayout>

+ 39 - 0
wade-mobile-common/res/layout/share_apk_device_list_item.xml
Voir le fichier 

@ -0,0 +1,39 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:layout_width="fill_parent"
4 
    android:layout_height="fill_parent"
5 
    android:orientation="horizontal" >
6
7 
    <LinearLayout
8 
        android:layout_width="0dp"
9 
        android:layout_height="wrap_content"
10 
        android:orientation="vertical"
11 
        android:layout_weight="1"
12 
        android:paddingBottom="5dp"
13 
         >
14 
        <!-- 设备名 -->
15 
        <TextView
16 
            android:id="@+id/deviceNameTV"
17 
            android:layout_width="wrap_content"
18 
            android:layout_height="wrap_content"
19 
            android:paddingLeft="5dp"
20 
            android:textColor="#fff"
21 
            android:textSize="20sp" />
22 
        <LinearLayout
23 
            android:layout_width="fill_parent"
24 
            android:layout_height="wrap_content"
25 
            android:orientation="horizontal" >
26 
            <!-- MAC地址 -->
27 
            <TextView
28 
                android:layout_width="wrap_content"
29 
                android:layout_height="wrap_content"
30 
                android:layout_marginLeft="15dp"
31 
                android:text="@string/sa_mac_address" />
32 
            <!-- MAC地址字符串 -->
33 
            <TextView
34 
                android:id="@+id/macAddressTV"
35 
                android:layout_width="wrap_content"
36 
                android:layout_height="wrap_content" />
37 
        </LinearLayout>
38 
    </LinearLayout>
39 
</LinearLayout>

+ 11 - 0
wade-mobile-common/res/values-v11/styles.xml
Voir le fichier 

@ -0,0 +1,11 @@
1 
<resources>
2
3 
    <!--
4 
        Base application theme for API 11+. This theme completely replaces
5 
        AppBaseTheme from res/values/styles.xml on API 11+ devices.
6 
    -->
7 
    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
8 
        <!-- API 11 theme customizations can go here. -->
9 
    </style>
10
11 
</resources>

+ 12 - 0
wade-mobile-common/res/values-v14/styles.xml
Voir le fichier 

@ -0,0 +1,12 @@
1 
<resources>
2
3 
    <!--
4 
        Base application theme for API 14+. This theme completely replaces
5 
        AppBaseTheme from BOTH res/values/styles.xml and
6 
        res/values-v11/styles.xml on API 14+ devices.
7 
    -->
8 
    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
9 
        <!-- API 14 theme customizations can go here. -->
10 
    </style>
11
12 
</resources>

+ 32 - 0
wade-mobile-common/res/values/scan_zxing_colors.xml
Voir le fichier 

@ -0,0 +1,32 @@
1 
<?xml version="1.0" encoding="UTF-8"?>
2 
<resources>
3
4 
  <color name="bg_color">#EDEDED</color>
5 
  <color name="contents_text">#ff000000</color>
6 
  <color name="encode_view">#ffffffff</color>
7 
  <color name="help_button_view">#ffcccccc</color>
8 
  <color name="help_view">#ff404040</color>
9 
  <color name="possible_result_points">#c0ffff00</color>
10 
  <color name="result_image_border">#ffffffff</color>
11 
  <color name="result_minor_text">#ffc0c0c0</color>
12 
  <color name="result_points">#c000ff00</color>
13 
  <color name="result_text">#ffffffff</color>
14 
  <color name="result_view">#b0000000</color>
15 
  <color name="sbc_header_text">#ff808080</color>
16 
  <color name="sbc_header_view">#ffffffff</color>
17 
  <color name="sbc_list_item">#fffff0e0</color>
18 
  <color name="sbc_layout_view">#ffffffff</color>
19 
  <color name="sbc_page_number_text">#ff000000</color>
20 
  <color name="sbc_snippet_text">#ff4b4b4b</color>
21 
  <color name="share_text">#ff000000</color>
22 
  <color name="share_view">#ffffffff</color>
23 
  <color name="status_view">#50000000</color>
24 
  <color name="status_text">#ffffffff</color>
25 
  <color name="transparent">#00000000</color>
26 
  <color name="viewfinder_frame">#ff000000</color>
27 
  <color name="viewfinder_laser">#ffff0000</color>
28 
  <color name="viewfinder_mask">#60000000</color>
29 
  <color name="header">#58567D</color>
30 
  <color name="grgray">#686868</color>
31
32 
</resources>

+ 31 - 0
wade-mobile-common/res/values/scan_zxing_ids.xml
Voir le fichier 

@ -0,0 +1,31 @@
1 
<?xml version="1.0" encoding="UTF-8"?>
2 
<!--
3 
 Copyright (C) 2008 ZXing authors
4
5 
 Licensed under the Apache License, Version 2.0 (the "License");
6 
 you may not use this file except in compliance with the License.
7 
 You may obtain a copy of the License at
8
9 
      http://www.apache.org/licenses/LICENSE-2.0
10
11 
 Unless required by applicable law or agreed to in writing, software
12 
 distributed under the License is distributed on an "AS IS" BASIS,
13 
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 
 See the License for the specific language governing permissions and
15 
 limitations under the License.
16 
 -->
17 
<resources>
18 
  <!-- Messages IDs -->
19 
  <item type="id" name="auto_focus"/>
20 
  <item type="id" name="decode"/>
21 
  <item type="id" name="decode_failed"/>
22 
  <item type="id" name="decode_succeeded"/>
23 
  <item type="id" name="encode_failed"/>
24 
  <item type="id" name="encode_succeeded"/>
25 
  <item type="id" name="launch_product_query"/>
26 
  <item type="id" name="quit"/>
27 
  <item type="id" name="restart_preview"/>
28 
  <item type="id" name="return_scan_result"/>
29 
  <item type="id" name="search_book_contents_failed"/>
30 
  <item type="id" name="search_book_contents_succeeded"/>
31 
</resources>

+ 5 - 0
wade-mobile-common/res/values/strings.xml
Voir le fichier 

@ -0,0 +1,5 @@
1 
<resources>
2
3 
    <string name="app_name">wade-mobile-com</string>
4
5 
</resources>

+ 5 - 0
wade-mobile-common/res/values/strings_audio.xml
Voir le fichier 

@ -0,0 +1,5 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<resources>
3 
    <string name="recording">正在录音……</string>
4 
    <string name="pressTip">按下说话</string>
5 
</resources>

+ 113 - 0
wade-mobile-common/res/values/strings_map.xml
Voir le fichier 

@ -0,0 +1,113 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<resources>
3 
    <string name="action_settings">Settings</string>
4
5 
    <string name="animate">Animate</string>
6 
    <string name="basic_map">基本地图</string>
7 
    <string name="basic_description">介绍如何创建一个基本地图</string>
8 
    <string name="camera_demo">Camera功能</string>
9 
    <string name="camera_description">介绍在地图中操作Camera各种功能</string>
10 
    <string name="clear_map">Clear</string>
11 
    <string name="compass">指南针</string>
12 
    <string name="custom_info_contents">Custom info contents</string>
13 
    <string name="custom_info_window">Custom info window</string>
14 
    <string name="default_info_window">Default info window</string>
15 
    <string name="demo_title">AMaps2D  Demos</string>
16 
    <string name="down_arrow">\u2193</string>
17 
    <string name="drag_melbourne">Drag Melbourne</string>
18 
    <string name="events_demo">Events功能</string>
19 
    <string name="events_description">介绍对地图的点击，长按，拖动地图事件功能</string>
20 
    <string name="fill_stroke">Fill Stroke</string>
21 
    <string name="fill_color">Fill Color</string>
22 
    <string name="go_to_zhongguancun">中关村</string>
23 
    <string name="go_to_lujiazui">陆家嘴</string>
24 
    <string name="hybrid">Hybrid</string>
25 
    <string name="location">正在定位中</string>
26
27 
    <string-array name="layers_array">
28 
        <item>@string/normal</item>
29 
        <item>@string/satellite</item>
30 
    </string-array>
31
32 
    <string name="layers_demo">Layers图层功能</string>
33 
    <string name="layers_description">介绍地图分别以正常、卫星模式展示出</string>
34 
    <string name="left_arrow">\u2190</string>
35 
    <string name="locationsource_demo">Location小蓝点功能</string>
36 
    <string name="locationsource_description">介绍对系统定位显示小蓝点功能</string>
37 
    <string name="locationGPS_demo">gps定位功能</string>
38 
    <string name="locationGPS_description">介绍如何使用gps定位</string>
39 
     <string name="locationSensorGPS_demo">gps追随功能</string>
40 
      <string name="locationSensorGPS_demo_description">介绍如何用gps定位图标箭头随手机转动而转动</string>
41 
    <string name="locationNetwork_description">介绍如何使用网络定位</string>
42 
    <string name="locationNetwork_demo">网络定位功能</string>
43 
    <string name="marker_demo">Markers功能</string>
44 
    <string name="marker_description">介绍在地图上添加marker和infoWindow</string>
45 
    <string name="mapOption_demo">AMapOptions实现地图</string>
46 
    <string name="mapOption_description">介绍用AMapOptions展示一个地图</string>
47 
    <string name="map_not_ready">SupportMapFragment初始化失败</string>
48 
    <string name="move_the_camera">移动camera</string>
49 
    <string name="my_location">My Location</string>
50 
    <string name="mylocation_layer">我的位置图层</string>
51 
    <string name="no_demos">No demos</string>
52 
    <string name="normal">Normal</string>
53 
    <string name="polygon_demo">Polygons功能</string>
54 
    <string name="polygon_description">介绍在地图绘制多边形</string>
55 
    <string name="polyline_demo">Polylines功能</string>
56 
    <string name="polyline_description">介绍在地图中绘制线条</string>
57 
    <string name="groundoverlay_demo">GroundOverlay功能</string>
58 
    <string name="groundoverlay_description">介绍在地图中绘制GroundOverlay功能</string>
59 
    <string name="tileoverlay_demo">TileOverlay功能</string>
60 
    <string name="tileoverlay_description">介绍在地图中绘制TileOverlay功能</string>
61 
    <string name="circle_demo">Circles功能</string>
62 
    <string name="circle_description">介绍在地图中绘制圆形</string>
63 
    <string name="screenshot_demo">地图截屏功能</string>
64 
    <string name="screenshot_description">介绍对地图进行截屏</string>
65 
    <string name="properties_polyline">设置Polyline属性</string>
66 
    <string name="properties_polygon">设置Polygon属性</string>
67 
    <string name="properties_circle">设置Circle属性</string>
68 
    <string name="busline_demo">Busline公交查询</string>
69 
    <string name="busline_description">介绍如何在地图中绘制BusLine</string>
70 
    <string name="route_demo">Route路径规划</string>
71 
    <string name="route_description">介绍如何在地图中绘制Route</string>
72 
    <string name="rotate">旋转手势</string>
73 
    <string name="reset_map">Reset</string>
74 
    <string name="right_arrow">\u2192</string>
75 
    <string name="satellite">Satellite</string>
76 
    <string name="scroll">滑动手势</string>
77 
    <string name="stop_animation">\u25A0</string>
78 
    <string name="stroke_width">Stroke Width</string>
79 
    <string name="tap_instructions">点击或者长按地图</string>
80 
    <string name="terrain">Terrain</string>
81 
    <string name="tilt">倾斜手势</string>
82 
    <string name="traffic">Traffic</string>
83 
    <string name="transparency">Transparency</string>
84 
    <string name="uisettings_demo">UI Settings功能</string>
85 
    <string name="uisettings_description">介绍地图中UI Settings功能</string>
86 
    <string name="geocoder_demo">地理编码 功能</string>
87 
    <string name="geocoder_description">介绍 geocoder地理编码 功能</string>
88 
    <string name="poikeywordsearch_demo">poi关键字搜索</string>
89 
    <string name="poikeywordsearch_description">介绍poi关键字搜索功能</string>
90 
    <string name="poiaroundsearch_demo">poi周边搜索</string>
91 
    <string name="poiaroundsearch_description">介绍poi周边搜索功能</string>
92 
    <string name="offlinemap_demo">离线地图功能</string>
93 
    <string name="offlinemap_description">介绍如何使用离线地图</string>
94 
    <string name="search_title">搜索关键字</string>
95 
    <string name="up_arrow">\u2191</string>
96 
    <string name="width">Width</string>
97 
    <string name="zoom_buttons">缩放按钮</string>
98 
    <string name="zoom_gestures">缩放手势</string>
99 
    <string name="zoom_in">+</string>
100 
    <string name="zoom_out">-</string>
101 
    <string name="scale">比例尺</string>
102 
    <string name="buttonScale">获取比例尺</string>
103 
    <string name="logo_position">logo位置</string>
104 
    <string name="bottom_left">左下</string>
105 
    <string name="bottom_center">底部居中</string>
106 
    <string name="bottom_right">右下</string>
107 
    <string name="map_screenshot">地图截屏</string>
108 
    <string name="error_network">搜索失败,请检查网络连接！</string>
109 
    <string name="error_key">key验证无效！</string>
110 
    <string name="error_other">未知错误，请稍后重试!错误码为</string>
111 
    <string name="no_result">对不起，没有搜索到相关数据！</string>
112
113 
</resources>

+ 10 - 0
wade-mobile-common/res/values/strings_share_apk.xml
Voir le fichier 

@ -0,0 +1,10 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<resources>
3 
    <string name="sa_share">应用分享</string>
4 
	<string name="sa_mac_address">MAC地址：</string>
5 
	<string name="sa_search">刷新</string>
6 
	<string name="sa_searching">搜索设备中……</string>
7 
	<string name="sa_exit">退出</string>
8 
	<string name="sa_confirm_share">确认要分享吗？</string>
9 
	<string name="sa_tip">请将远程蓝牙设备打开，并且保持可见……</string>
10 
</resources>

+ 9 - 0
wade-mobile-common/res/values/style_audio.xml
Voir le fichier 

@ -0,0 +1,9 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<resources>
3 
	<style name="AudioDialogTheme" parent="@android:style/Theme.Dialog">
4 
        <!-- 无标题 -->
5 
        <item name="android:windowNoTitle">true</item>
6 
        <!-- 设置背景色 -->
7 
        <item name="android:windowBackground">@drawable/audio_activity_dialog</item>
8 
    </style>
9 
</resources>

+ 7 - 0
wade-mobile-common/res/values/style_custom_dialog.xml
Voir le fichier 

@ -0,0 +1,7 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<resources>
3 
    <style name="CustomDialogTheme" parent="@android:style/Theme.Dialog">
4 
        <!-- 无标题 -->
5 
        <item name="android:windowNoTitle">true</item>
6 
    </style>
7 
</resources>

+ 7 - 0
wade-mobile-common/res/values/style_share_apk.xml
Voir le fichier 

@ -0,0 +1,7 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<resources>
3 
    <style name="ShareApkDialogTheme" parent="@android:style/Theme.Dialog">
4 
        <!-- 无标题 -->
5 
        <item name="android:windowNoTitle">true</item>
6 
    </style>
7 
</resources>

+ 7 - 0
wade-mobile-common/res/values/style_sliding_menu.xml
Voir le fichier 

@ -0,0 +1,7 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<resources>
3 
    <style name="SlidingMenuTheme" parent="@android:style/Theme.Translucent">
4 
        <!-- 无标题 -->
5 
        <item name="android:windowNoTitle">true</item>
6 
    </style>
7 
</resources>

+ 20 - 0
wade-mobile-common/res/values/styles.xml
Voir le fichier 

@ -0,0 +1,20 @@
1 
<resources>
2
3 
    <!--
4 
        Base application theme, dependent on API level. This theme is replaced
5 
        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
6 
    -->
7 
    <style name="AppBaseTheme" parent="android:Theme.Light">
8 
        <!--
9 
            Theme customizations available in newer API levels can go in
10 
            res/values-vXX/styles.xml, while customizations related to
11 
            backward-compatibility can go here.
12 
        -->
13 
    </style>
14
15 
    <!-- Application theme. -->
16 
    <style name="AppTheme" parent="AppBaseTheme">
17 
        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
18 
    </style>
19
20 
</resources>

+ 5 - 0
wade-mobile-common/更新纪要
Voir le fichier 

@ -0,0 +1,5 @@
1 
更新内容:去掉了wade-mobile-data需要依赖的第三方jar,如：json-lib-2.2.3-jdk13.jar
2 
更新人:黄波
3 
更新时间:2015.4.18
4 
更新文件:wade-mobile-data.jar
5 
更新备注:无

修复base64未显示图片的bug · b219bdb1ad - Nuosi Git Service
Página Inicial Explorar Ajuda
Entrar
ipu
/
ipu-guide
Observar 10
Favorito 1
Fork 0
Código Problemas 0 Pull Requests 0 Commits 397 Versões 1 Wiki
Ver Código Fonte

修复base64未显示图片的bug

liufl5 5 anos atrás
pai
65fccbe3ea
commit
b219bdb1ad
1 arquivos alterados com 1 adições e 1 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 1 1
      show-server/src/main/webapp/biz/js/plugins/safe/screenCapture.js

+ 1 - 1
show-server/src/main/webapp/biz/js/plugins/safe/screenCapture.js
Ver Arquivo 

@ -30,7 +30,7 @@ require(["ipuMobile","jquery","common","ipuUI"],function (WadeMobile,$,Common) {
30 30 
		var type = 1;
31 31 
		WadeMobile.fullScreenCapture(function(path) {
32 32 
			$("#screenCapture_path").html("回调结果：" + path);
33 
			$("#screenCapture_pic").html("<img src='" + path + "' style='max-width:60%;'/>");
33 
			$("#screenCapture_pic").html("<img src='"+ "data:image/jpeg;base64," + path + "' style='max-width:60%;'/>");
34 34 
		},type);
35 35 
	});
36 36