mirror of
https://github.com/zxing/zxing.git
synced 2025-03-05 20:48:51 -08:00
Merge branch 'master' of https://github.com/zxing/zxing
This commit is contained in:
Miguel E. Hernández Cuervo
commit
5ac949d25a
6
CHANGES
6
CHANGES
|
|
@ -345,3 +345,9 @@
|
|||
|
||||
- Retire actionscript port
|
||||
- Small bug fixes
|
||||
|
||||
3.2.0 (15 Feb 2014)
|
||||
|
||||
- Several bug fixes, especially for Data Matrix and PDF417 parsing
|
||||
- Retired jruby binding
|
||||
- Barcode Scanner can now disable history
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.google.zxing.client.android"
|
||||
android:versionName="4.7.1"
|
||||
android:versionCode="101"
|
||||
android:versionName="4.7.2"
|
||||
android:versionCode="102"
|
||||
android:installLocation="auto">
|
||||
|
||||
<uses-permission android:name="android.permission.CAMERA"/>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> Feste benutzerdefinierte Suche URL Formatierung </li>
|
||||
<li> Andere Anwendungen können festlegen, welche Kamera zu verwenden, </li>
|
||||
<li> Die History-Funktion kann ausgeschaltet werden </li>
|
||||
<li> Bug-Fixes </li>
|
||||
</ul>
|
||||
<p>Übersetzt von Google Translate.</p></body>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li>Fixed custom search URL formatting</li>
|
||||
<li>Other applications can specify which camera to use</li>
|
||||
<li>The History feature can be turned off</li>
|
||||
<li>Bug fixes</li>
|
||||
</ul>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> El formato de búsqueda de URL personalizadas ha sido corregido </li>
|
||||
<li> Otras aplicaciones pueden especificar cuál cámara utilizar </li>
|
||||
<li> La función de Historia se puede apagar </li>
|
||||
<li> Corrección de errores </li>
|
||||
</ul>
|
||||
<p>Traducido por Google Translate.</p></body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> Personnalisé fixe formatage recherche URL </li>
|
||||
<li> D'autres applications peuvent spécifier la caméra à utiliser </li>
|
||||
<li> La fonction Historique peut être désactivée </li>
|
||||
<li> Corrections de bugs </li>
|
||||
</ul>
|
||||
<p>Traduite par Google Translate.</p></body>
|
||||
<p>Traduit par Google Translate.</p></body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> Formattazione di ricerca URL personalizzato fissa </li>
|
||||
<li> Altre applicazioni possono specificare quale fotocamera utilizzare </li>
|
||||
<li> La funzione Cronologia può essere disattivata </li>
|
||||
<li> Correzioni di bug </li>
|
||||
</ul>
|
||||
<p>Tradotto da Google Translate.</p></body>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> 固定カスタム検索のURLの書式 </li>
|
||||
<li> 他のアプリケーションは、使用するカメラを指定することができます </li>
|
||||
<li> 履歴機能をオフにすることができ </li>
|
||||
<li> バグ修正 </li>
|
||||
</ul>
|
||||
<p>Google翻訳で翻訳。</p></body>
|
||||
<p>Googleによって翻訳翻訳。</p></body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> 고정 맞춤 검색 URL 서식 </li>
|
||||
<li> 다른 응용 프로그램이 사용하는 카메라를 지정할 수 있습니다 </li>
|
||||
<li> 역사 기능을 해제 할 수 있습니다 </li>
|
||||
<li> 버그 수정 </li>
|
||||
</ul>
|
||||
<p>Google 번역에 의해 번역.</p></body>
|
||||
<p>구글 번역은 번역.</p></body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> Vaste custom search URL opmaak </li>
|
||||
<li> Andere toepassingen kunt opgeven welke camera te gebruiken </li>
|
||||
<li> De Geschiedenis functie kan worden uitgeschakeld </li>
|
||||
<li> Bug fixes </li>
|
||||
</ul>
|
||||
<p>Vertaald door Google Translate.</p></body>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> Costume fixa formatação busca URL </li>
|
||||
<li> Outras aplicações podem especificar qual câmera usar </li>
|
||||
<li> O recurso de História pode ser desligado </li>
|
||||
<li> Correções de bugs </li>
|
||||
</ul>
|
||||
<p>Traduzido pelo Google Translate.</p></body>
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> Исправлена пользовательское форматирование Поиск URL </li>
|
||||
<li> Другие приложения могут указать, какую камеру использовать </li>
|
||||
<li> Функция сохранения истории может быть отключен </li>
|
||||
<li> Исправление ошибок </li>
|
||||
</ul>
|
||||
<p>Перевод Google Translate.</p></body>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> 修正了自定义搜索网址格式 </li>
|
||||
<li> 其他应用程序可以指定要使用的相机 </li>
|
||||
<li> 历史特征可以被关闭 </li>
|
||||
<li> Bug修复 </li>
|
||||
</ul>
|
||||
<p>由谷歌自动翻译系统。</p></body>
|
||||
<p>由谷歌翻译翻译。</p></body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@
|
|||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li> 修正了自定義搜索網址格式 </li>
|
||||
<li> 其他應用程序可以指定要使用的相機 </li>
|
||||
<li> 歷史特徵可以被關閉 </li>
|
||||
<li> Bug修復 </li>
|
||||
</ul>
|
||||
<p>由谷歌自動翻譯系統。</p></body>
|
||||
<p>由谷歌翻譯翻譯。</p></body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>android</artifactId>
|
||||
<version>4.7.1</version>
|
||||
<version>4.7.2</version>
|
||||
<packaging>apk</packaging>
|
||||
|
||||
<dependencies>
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
<sourceDirectory>src</sourceDirectory>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
||||
<groupId>com.simpligility.maven.plugins</groupId>
|
||||
<artifactId>android-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
# be complete or up to date. (The "arithmetic" optimization can be
|
||||
# used if you are only targeting Android 2.0 or later.) Make sure you
|
||||
# test thoroughly if you go this route.
|
||||
-optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private
|
||||
-optimizations !code/simplification/cast,!field/*,!class/merging/*,!class/unboxing/enum,!code/allocation/variable,!method/marking/private
|
||||
-optimizationpasses 5
|
||||
-allowaccessmodification
|
||||
-dontpreverify
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
<sourceDirectory>src</sourceDirectory>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
||||
<groupId>com.simpligility.maven.plugins</groupId>
|
||||
<artifactId>android-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
# be complete or up to date. (The "arithmetic" optimization can be
|
||||
# used if you are only targeting Android 2.0 or later.) Make sure you
|
||||
# test thoroughly if you go this route.
|
||||
-optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private
|
||||
-optimizations !code/simplification/cast,!field/*,!class/merging/*,!class/unboxing/enum,!code/allocation/variable,!method/marking/private
|
||||
-optimizationpasses 5
|
||||
-allowaccessmodification
|
||||
-dontpreverify
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
<sourceDirectory>src</sourceDirectory>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
||||
<groupId>com.simpligility.maven.plugins</groupId>
|
||||
<artifactId>android-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
# be complete or up to date. (The "arithmetic" optimization can be
|
||||
# used if you are only targeting Android 2.0 or later.) Make sure you
|
||||
# test thoroughly if you go this route.
|
||||
-optimizations !code/simplification/cast,!field/*,!class/merging/*,!code/allocation/variable,!method/marking/private
|
||||
-optimizations !code/simplification/cast,!field/*,!class/merging/*,!class/unboxing/enum,!code/allocation/variable,!method/marking/private
|
||||
-optimizationpasses 5
|
||||
-allowaccessmodification
|
||||
-dontpreverify
|
||||
|
|
|
|||
6
pom.xml
6
pom.xml
|
|
@ -330,9 +330,9 @@
|
|||
<version>2.6</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
||||
<groupId>com.simpligility.maven.plugins</groupId>
|
||||
<artifactId>android-maven-plugin</artifactId>
|
||||
<version>4.0.0-rc.2</version>
|
||||
<version>4.1.1</version>
|
||||
<extensions>true</extensions>
|
||||
<executions>
|
||||
<execution>
|
||||
|
|
@ -625,7 +625,7 @@
|
|||
<artifactId>maven-jarsigner-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
|
||||
<groupId>com.simpligility.maven.plugins</groupId>
|
||||
<artifactId>android-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<proguard>
|
||||
|
|
|
|||
Loading…
Reference in a new issue