根据scan删除多余

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

@@ -8,14 +8,14 @@ require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
	});
	$("#scanSingle").tap(function() {
		WadeMobile.scanSingle(function(result){
			$("#result").html(result);
			$("#result").removeClass("e_placeholder");
			$("#resultSingle").html(result);
			$("#resultSingle").removeClass("e_placeholder");
		});
	});
	$("#scanMultiple").tap(function() {
		WadeMobile.scanMultiple(function(result){
			$("#result").html(result);
			$("#result").removeClass("e_placeholder");
			$("#resultMultiple").html(result);
			$("#resultMultiple").removeClass("e_placeholder");
		});
	});
	$("#create").tap(function(){

display-server/web/template/webapp/plugin/QR.html

@@ -30,7 +30,7 @@
				<div class="content">
					<div class="main" ontap=";">
						<div class="title">扫描结果</div>
						<div class="info e_placeholder" id="result" >请点击右侧按钮开始扫描</div>
						<div class="info e_placeholder" id="resultSingle" >请点击右侧按钮开始扫描</div>
					</div>
					<div class="fn" id="scanSingle" ><span class="e_ico-scan"></span></div>
				</div>
@@ -47,7 +47,7 @@
				<div class="content">
					<div class="main" ontap=";">
						<div class="title">扫描结果</div>
						<div class="info e_placeholder" id="result" >请点击右侧按钮开始扫描</div>
						<div class="info e_placeholder" id="resultMultiple" >请点击右侧按钮开始扫描</div>
					</div>
					<div class="fn" id="scanMultiple" ><span class="e_ico-scan"></span></div>
				</div>
@@ -64,7 +64,8 @@
					<div class="main" ontap=";">
						<div class="title">字符串</div>
						<div class="info">
							<textarea style="height:1rem;" id="info" >湖南移动开展客户回馈：现在回复“A”，关注湖南移动飞信公众帐号，就有机会获赠30M手机上网流量！</textarea>
							<textarea style="height:1rem;" id="info" >http://www.aiipu.com/
							</textarea>
						</div>
					</div>
					<div class="fn" id="create" ><span class="e_ico-qr"></span></div>

wade-mobile-common/res/drawable/scan_cancel.xml

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

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

@@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent" >
    <SurfaceView
        android:id="@+id/preview_view"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center" />
    
    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_gravity="center">
        <ImageButton
            android:id="@+id/btn_cancel_scan"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentLeft="true"
            android:layout_alignParentTop="true"
            android:src="@drawable/scan_cancel_normal" />
        <ImageButton
            android:id="@+id/btn_flashlight"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentRight="true"
            android:layout_alignParentTop="true"
            android:src="@drawable/scan_flashlight_off" />
        <com.wade.mobile.common.scan.view.ViewfinderView
	        android:id="@+id/viewfinder_view"
	        android:layout_width="wrap_content"
	        android:layout_height="wrap_content"/>
    </RelativeLayout>
</FrameLayout>

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

@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
  
  <color name="bg_color">#EDEDED</color>
  <color name="contents_text">#ff000000</color>
  <color name="encode_view">#ffffffff</color>
  <color name="help_button_view">#ffcccccc</color>
  <color name="help_view">#ff404040</color>
  <color name="possible_result_points">#c0ffff00</color>  
  <color name="result_image_border">#ffffffff</color>
  <color name="result_minor_text">#ffc0c0c0</color>
  <color name="result_points">#c000ff00</color>
  <color name="result_text">#ffffffff</color>
  <color name="result_view">#b0000000</color>
  <color name="sbc_header_text">#ff808080</color>
  <color name="sbc_header_view">#ffffffff</color>
  <color name="sbc_list_item">#fffff0e0</color>
  <color name="sbc_layout_view">#ffffffff</color>
  <color name="sbc_page_number_text">#ff000000</color>
  <color name="sbc_snippet_text">#ff4b4b4b</color>
  <color name="share_text">#ff000000</color>
  <color name="share_view">#ffffffff</color>
  <color name="status_view">#50000000</color>
  <color name="status_text">#ffffffff</color>
  <color name="transparent">#00000000</color>
  <color name="viewfinder_frame">#ff000000</color>
  <color name="viewfinder_laser">#ffff0000</color>
  <color name="viewfinder_mask">#60000000</color>
  <color name="header">#58567D</color>
  <color name="grgray">#686868</color>
      
</resources>

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

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