Browse Source

根据scan删除多余

leijie 9 years ago
parent
commit
1f5d25838f

+ 4 - 4
display-server/web/biz/js/plugin/qr.js

8
	});
8
	});
9
	$("#scanSingle").tap(function() {
9
	$("#scanSingle").tap(function() {
10
		WadeMobile.scanSingle(function(result){
10
		WadeMobile.scanSingle(function(result){
11
			$("#result").html(result);
12
			$("#result").removeClass("e_placeholder");
11
			$("#resultSingle").html(result);
12
			$("#resultSingle").removeClass("e_placeholder");
13
		});
13
		});
14
	});
14
	});
15
	$("#scanMultiple").tap(function() {
15
	$("#scanMultiple").tap(function() {
16
		WadeMobile.scanMultiple(function(result){
16
		WadeMobile.scanMultiple(function(result){
17
			$("#result").html(result);
18
			$("#result").removeClass("e_placeholder");
17
			$("#resultMultiple").html(result);
18
			$("#resultMultiple").removeClass("e_placeholder");
19
		});
19
		});
20
	});
20
	});
21
	$("#create").tap(function(){
21
	$("#create").tap(function(){

+ 4 - 3
display-server/web/template/webapp/plugin/QR.html

30
				<div class="content">
30
				<div class="content">
31
					<div class="main" ontap=";">
31
					<div class="main" ontap=";">
32
						<div class="title">扫描结果</div>
32
						<div class="title">扫描结果</div>
33
						<div class="info e_placeholder" id="result" >请点击右侧按钮开始扫描</div>
33
						<div class="info e_placeholder" id="resultSingle" >请点击右侧按钮开始扫描</div>
34
					</div>
34
					</div>
35
					<div class="fn" id="scanSingle" ><span class="e_ico-scan"></span></div>
35
					<div class="fn" id="scanSingle" ><span class="e_ico-scan"></span></div>
36
				</div>
36
				</div>
47
				<div class="content">
47
				<div class="content">
48
					<div class="main" ontap=";">
48
					<div class="main" ontap=";">
49
						<div class="title">扫描结果</div>
49
						<div class="title">扫描结果</div>
50
						<div class="info e_placeholder" id="result" >请点击右侧按钮开始扫描</div>
50
						<div class="info e_placeholder" id="resultMultiple" >请点击右侧按钮开始扫描</div>
51
					</div>
51
					</div>
52
					<div class="fn" id="scanMultiple" ><span class="e_ico-scan"></span></div>
52
					<div class="fn" id="scanMultiple" ><span class="e_ico-scan"></span></div>
53
				</div>
53
				</div>
64
					<div class="main" ontap=";">
64
					<div class="main" ontap=";">
65
						<div class="title">字符串</div>
65
						<div class="title">字符串</div>
66
						<div class="info">
66
						<div class="info">
67
							<textarea style="height:1rem;" id="info" >湖南移动开展客户回馈:现在回复“A”,关注湖南移动飞信公众帐号,就有机会获赠30M手机上网流量!</textarea>
67
							<textarea style="height:1rem;" id="info" >http://www.aiipu.com/
68
							</textarea>
68
						</div>
69
						</div>
69
					</div>
70
					</div>
70
					<div class="fn" id="create" ><span class="e_ico-qr"></span></div>
71
					<div class="fn" id="create" ><span class="e_ico-qr"></span></div>

BIN
wade-mobile-common/libs/wade-mobile-com.jar


+ 0 - 5
wade-mobile-common/res/drawable/scan_cancel.xml

1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">  
3
    <item android:drawable="@drawable/scan_cancel_normal" android:state_pressed="false"/>  
4
    <item android:drawable="@drawable/scan_cancel_press" android:state_pressed="true"/>  
5
</selector>

BIN
wade-mobile-common/res/drawable/scan_cancel_normal.png


BIN
wade-mobile-common/res/drawable/scan_cancel_press.png


BIN
wade-mobile-common/res/drawable/scan_flashlight_off.png


BIN
wade-mobile-common/res/drawable/scan_flashlight_on.png


+ 0 - 39
wade-mobile-common/res/layout/scan_zxing_capture.xml

1
<?xml version="1.0" encoding="utf-8"?>
2
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="fill_parent"
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>

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

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>

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

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>