詹子聪 пре 5 година
родитељ
комит
3cad0de893

+ 2 - 2
app/src/main/java/com/miekir/ocr/PermissionActivity.java

@@ -51,8 +51,8 @@ public class PermissionActivity extends AppCompatActivity {
     protected void showDenyDialog() {
         AlertDialog dialog = new AlertDialog
                 .Builder(this)
-                .setMessage("Camera or Storage Permissions Denied")
-                .setPositiveButton("Confirm", (dialogInterface, i) -> {
+                .setMessage(getString(R.string.permission_msg))
+                .setPositiveButton(getString(R.string.confirm), (dialogInterface, i) -> {
                     finish();
                 }).create();
         dialog.show();

+ 4 - 4
app/src/main/java/com/miekir/ocr/ui/MenuActivity.java

@@ -29,14 +29,14 @@ public class MenuActivity extends CameraActivity implements CropView.onLocationL
     private static final int REQUEST_CODE_CHOOSE = 6;
 
     private CropView pcv_scan;
-    private int mCurrentType = CropView.SCAN_TYPE_EMAIL;
-    private int[] MENU_ID_LIST = {R.id.it_email, R.id.it_address, R.id.it_name, R.id.it_all};
+    private int mCurrentType = CropView.SCAN_TYPE_ALL;
+    private int[] MENU_ID_LIST = {R.id.it_postal, R.id.it_address, R.id.it_name, R.id.it_all};
 
     @Override
     public void initViews(Bundle savedInstanceState) {
         super.initViews(savedInstanceState);
 
-        int[] clickIds = new int[]{R.id.it_email, R.id.it_address, R.id.it_name, R.id.it_all,
+        int[] clickIds = new int[]{R.id.it_postal, R.id.it_address, R.id.it_name, R.id.it_all,
                 R.id.fl_take, R.id.fl_album};
         ViewTool.setOnClickListener(this, clickIds, this);
 
@@ -66,7 +66,7 @@ public class MenuActivity extends CameraActivity implements CropView.onLocationL
                         .forResult(REQUEST_CODE_CHOOSE);
                 break;
 
-            case R.id.it_email:
+            case R.id.it_postal:
             case R.id.it_address:
             case R.id.it_name:
             case R.id.it_all:

+ 3 - 3
app/src/main/java/com/miekir/ocr/view/CropView.java

@@ -19,11 +19,11 @@ import android.view.WindowManager;
 import com.miekir.ocr.R;
 
 public class CropView extends View {
-    public static final int SCAN_TYPE_EMAIL = 0;
+    public static final int SCAN_TYPE_POSTAL = 0;
     public static final int SCAN_TYPE_ADDRESS = 1;
     public static final int SCAN_TYPE_NAME = 1;
     public static final int SCAN_TYPE_ALL = 2;
-    public static final int[] SCAN_TYPES = {SCAN_TYPE_EMAIL, SCAN_TYPE_ADDRESS, SCAN_TYPE_NAME, SCAN_TYPE_ALL};
+    public static final int[] SCAN_TYPES = {SCAN_TYPE_POSTAL, SCAN_TYPE_ADDRESS, SCAN_TYPE_NAME, SCAN_TYPE_ALL};
     private static final String TAG = "PhotoCropView";
 
     private onLocationListener locationListener;/*listen to the Rect */
@@ -87,7 +87,7 @@ public class CropView extends View {
      */
     public void setScanArea(int scanType) {
         switch (scanType) {
-            case SCAN_TYPE_EMAIL:
+            case SCAN_TYPE_POSTAL:
                 // 邮箱
                 coverWidth = (int) (getWidth()*0.815);
                 coverHeight = (int) (getWidth()*0.3);

+ 5 - 5
app/src/main/res/layout/activity_camera.xml

@@ -77,10 +77,10 @@
                         android:layout_weight="1" />
 
                     <com.miekir.ocr.view.IndicatorText
-                        android:id="@+id/it_email"
+                        android:id="@+id/it_postal"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:text="邮政编码" />
+                        app:text="@string/postal_code" />
 
                     <Space
                         android:layout_width="0dp"
@@ -91,7 +91,7 @@
                         android:id="@+id/it_address"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:text="住址"/>
+                        app:text="@string/address"/>
 
                     <Space
                         android:layout_width="0dp"
@@ -102,7 +102,7 @@
                         android:id="@+id/it_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:text="姓名"/>
+                        app:text="@string/name"/>
 
                     <Space
                         android:layout_width="0dp"
@@ -113,7 +113,7 @@
                         android:id="@+id/it_all"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:text="整单识别"
+                        app:text="@string/full"
                         app:focused="true"/>
 
                     <Space

+ 3 - 1
app/src/main/res/layout/view_indicator.xml

@@ -5,7 +5,9 @@
     android:gravity="center_horizontal"
     android:orientation="vertical"
     android:paddingTop="@dimen/margin_s"
-    android:paddingBottom="@dimen/margin_default">
+    android:paddingBottom="@dimen/margin_default"
+    android:paddingStart="@dimen/margin_ss"
+    android:paddingEnd="@dimen/margin_ss">
 
     <View
         android:id="@+id/view_dot"

+ 15 - 0
app/src/main/res/values-zh_CN/strings.xml

@@ -0,0 +1,15 @@
+<resources>
+    <string name="app_name">NRI AIOCR</string>
+    <string name="copy">复制</string>
+    <string name="cancel">返回</string>
+    <string name="done">完成</string>
+    <string name="loading">请稍候...</string>
+    <string name="postal_code">邮政编号</string>
+    <string name="address">住址</string>
+    <string name="name">姓名</string>
+    <string name="full">全范围</string>
+    <string name="result"># 识别结果</string>
+    <string name="copy_success">复制成功</string>
+    <string name="permission_msg">相机或读写权限被拒绝</string>
+    <string name="confirm">确认</string>
+</resources>

+ 12 - 3
app/src/main/res/values/strings.xml

@@ -1,6 +1,15 @@
 <resources>
     <string name="app_name">NRI AIOCR</string>
-
-
-
+    <string name="copy">Copy</string>
+    <string name="cancel">Cancel</string>
+    <string name="done">Finish</string>
+    <string name="loading">Loading...</string>
+    <string name="postal_code">Postcode</string>
+    <string name="address">Address</string>
+    <string name="name">Name</string>
+    <string name="full">Full DN</string>
+    <string name="result"># Result</string>
+    <string name="copy_success">Copy succeeded</string>
+    <string name="permission_msg">Camera or Storage Permissions Denied</string>
+    <string name="confirm">Confirm</string>
 </resources>