ソースを参照

1.修改Android RAImage图标和名称显示。

Pen Li 7 年 前
コミット
20bd686f20
20 ファイル変更187 行追加15 行削除
  1. 3 4
      ApexDrivers/RAUtilsLibrary/src/main/AndroidManifest.xml
  2. 0 5
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  3. 0 5
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  4. BIN
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-hdpi/ic_launcher.png
  5. BIN
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-hdpi/ic_launcher_round.png
  6. BIN
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-mdpi/ic_launcher.png
  7. BIN
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-mdpi/ic_launcher_round.png
  8. BIN
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xhdpi/ic_launcher.png
  9. BIN
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xhdpi/ic_launcher_round.png
  10. BIN
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xxhdpi/ic_launcher.png
  11. BIN
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
  12. BIN
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  13. BIN
      ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
  14. 3 1
      ApexDrivers/raimage/src/main/AndroidManifest.xml
  15. BIN
      ApexDrivers/raimage/src/main/res/mipmap-hdpi/ic_launcher_round.png
  16. BIN
      ApexDrivers/raimage/src/main/res/mipmap-mdpi/ic_launcher_round.png
  17. BIN
      ApexDrivers/raimage/src/main/res/mipmap-xhdpi/ic_launcher_round.png
  18. BIN
      ApexDrivers/raimage/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
  19. BIN
      ApexDrivers/raimage/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
  20. 181 0
      ApexDrivers/raimage/src/main/res/values-zh/strings.xml

+ 3 - 4
ApexDrivers/RAUtilsLibrary/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
           package="com.usai.redant.rautils">
           package="com.usai.redant.rautils">
 
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
@@ -38,11 +39,9 @@
 
 
     <application
     <application
         android:allowBackup="true"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        >
 
 
         <!-- <service -->
         <!-- <service -->
         <!-- android:name=".Service.RAService" -->
         <!-- android:name=".Service.RAService" -->

+ 0 - 5
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

+ 0 - 5
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

BIN
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-hdpi/ic_launcher.png


BIN
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-hdpi/ic_launcher_round.png


BIN
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-mdpi/ic_launcher.png


BIN
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-mdpi/ic_launcher_round.png


BIN
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xhdpi/ic_launcher.png


BIN
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xhdpi/ic_launcher_round.png


BIN
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xxhdpi/ic_launcher.png


BIN
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xxhdpi/ic_launcher_round.png


BIN
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xxxhdpi/ic_launcher.png


BIN
ApexDrivers/RAUtilsLibrary/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png


+ 3 - 1
ApexDrivers/raimage/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
           package="com.usai.redant.raimage">
           package="com.usai.redant.raimage">
 
 
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.CAMERA"/>
@@ -18,7 +19,8 @@
         android:allowBackup="true"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        >
 
 
         <!-- <activity -->
         <!-- <activity -->
         <!-- android:name=".MainActivity" -->
         <!-- android:name=".MainActivity" -->

BIN
ApexDrivers/raimage/src/main/res/mipmap-hdpi/ic_launcher_round.png


BIN
ApexDrivers/raimage/src/main/res/mipmap-mdpi/ic_launcher_round.png


BIN
ApexDrivers/raimage/src/main/res/mipmap-xhdpi/ic_launcher_round.png


BIN
ApexDrivers/raimage/src/main/res/mipmap-xxhdpi/ic_launcher_round.png


BIN
ApexDrivers/raimage/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png


+ 181 - 0
ApexDrivers/raimage/src/main/res/values-zh/strings.xml

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="title_activity_login">Sign in</string>
+    <string name="title_activity_locker">Unlock RedAnt POP</string>
+
+    <!-- Strings related to login -->
+    <string name="prompt_email">Email</string>
+    <string name="prompt_Name">Name</string>
+    <string name="prompt_password">Password</string>
+    <string name="action_sign_in_register"><b>Sign in</b> or register</string>
+    <string name="action_sign_in_short">Sign in</string>
+    <string name="str_savepass">Save Password</string>
+    <string name="action_about">About</string>
+    <string name="action_save">Save</string>
+    <string name="action_forgot_password">Recover lost password</string>
+    <string name="login_progress_signing_in">Signing in&#8230;</string>
+    <string name="error_invalid_email">This email address is invalid</string>
+    <string name="error_invalid_password">This password is too short</string>
+    <string name="error_incorrect_password">Not authorized or wrong password</string>
+    <string name="error_field_required">This field is required</string>
+    <string name="action_server_settings">Server Settings</string>
+    <string name="action_clear">Clear</string>
+    <string name="action_clearfailed">Clear Failed</string>
+    <string name="action_delete">Delete photo</string>
+    <string name="action_type_pid">Type PIID</string>
+    <string name="action_view_queue">View upload queue</string>
+    <string name="preferences_name">Settings</string>
+    <string name="app_name">RA Image</string>
+    <string name="button_ok">OK</string>
+    <string name="title_activity_scan">ScanActivity</string>
+    <string name="menu_help">Help</string>
+    <string name="menu_settings">Settings</string>
+    <string name="msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the device.</string>
+    <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.</string>
+    <string name="msg_user_wrong">Wrong user name or password.</string>
+    <string name="msg_net_error">Can not connect to server</string>
+    <string name="msg_connection_none">No available connection </string>
+    <string name="preferences_actions_title">When a barcode is found\u2026</string>
+    <string name="preferences_auto_focus_title">Use auto focus</string>
+    <string name="preferences_bulk_mode_summary">Scan and save many barcodes continuously</string>
+    <string name="preferences_bulk_mode_title">Bulk scan mode</string>
+    <string name="preferences_copy_to_clipboard_title">Copy to clipboard</string>
+    <string name="preferences_custom_product_search_summary" formatted="false">Substitutions: %s = contents, %f = format, %t = type</string>
+    <string name="preferences_custom_product_search_title">Custom search URL</string>
+    <string name="preferences_decode_1D_title">1D barcodes</string>
+    <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+    <string name="preferences_decode_QR_title">QR Codes</string>
+    <string name="preferences_device_bug_workarounds_title">Device Bug Workarounds</string>
+    <string name="preferences_disable_continuous_focus_summary">Use only standard focus mode</string>
+    <string name="preferences_disable_continuous_focus_title">No continuous focus</string>
+    <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare. Does not work on all phones.</string>
+    <string name="preferences_front_light_title">Use front light</string>
+    <string name="preferences_front_light_auto">Automatic</string>
+    <string name="preferences_front_light_off">Off</string>
+    <string name="preferences_front_light_on">On</string>
+    <string name="preferences_general_title">General settings</string>
+    <string name="preferences_invert_scan_title">Invert scan</string>
+    <string name="preferences_invert_scan_summary">Scan for white barcodes on black background. Not available on some devices.</string>
+    <string name="preferences_play_beep_title">Beep</string>
+    <string name="preferences_remember_duplicates_summary">Store multiple scans of the same barcode in History</string>
+    <string name="preferences_remember_duplicates_title">Remember duplicates</string>
+    <string name="preferences_result_title">Result settings</string>
+    <string name="preferences_scanning_title">When scanning for barcodes, decode\u2026</string>
+    <string name="preferences_search_country">Search country</string>
+    <string name="preferences_try_bsplus">Try Barcode Scanner+</string>
+    <string name="preferences_try_bsplus_summary">Enhanced with new features and interface</string>
+    <string name="preferences_supplemental_summary">Try to retrieve more information about the barcode contents</string>
+    <string name="preferences_supplemental_title">Retrieve more info</string>
+    <string name="preferences_vibrate_title">Vibrate</string>
+    <string name="title_activity_main_activity1">MainActivity1</string>
+    <string name="title_input_pid">Input PID</string>
+    <string name="confirm_to_upload">Confirm to upload</string>
+    <string name="confirm_to_delete">Confirm to Delete</string>
+    <string name="location_changed">Location changed</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="str_tech_support">Tech support:\nusairedant@united-us.net</string>
+    <string name="str_version">version:</string>
+    <string name="str_ver">ver:</string>
+    <string name="title_activity_about">About</string>
+    <string name="title_activity_license">License</string>
+    <string name="title_activity_service_setting">Server setting</string>
+
+    <string name="title_activity_fullscreen_login">FullscreenLoginActivity</string>
+    <string name="dummy_button">Dummy Button</string>
+    <string name="dummy_content">DUMMY\nCONTENT</string>
+    <string name="title_activity_full_screen_login">RA Image</string>
+    <string name="large_text">
+        "Material is the metaphor.\n\n"
+
+        "A material metaphor is the unifying theory of a rationalized space and a system of motion."
+        "The material is grounded in tactile reality, inspired by the study of paper and ink, yet "
+        "technologically advanced and open to imagination and magic.\n"
+        "Surfaces and edges of the material provide visual cues that are grounded in reality. The "
+        "use of familiar tactile attributes helps users quickly understand affordances. Yet the "
+        "flexibility of the material creates new affordances that supercede those in the physical "
+        "world, without breaking the rules of physics.\n"
+        "The fundamentals of light, surface, and movement are key to conveying how objects move, "
+        "interact, and exist in space and in relation to each other. Realistic lighting shows "
+        "seams, divides space, and indicates moving parts.\n\n"
+
+        "Bold, graphic, intentional.\n\n"
+
+        "The foundational elements of print based design typography, grids, space, scale, color, "
+        "and use of imagery guide visual treatments. These elements do far more than please the "
+        "eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge "
+        "imagery, large scale typography, and intentional white space create a bold and graphic "
+        "interface that immerse the user in the experience.\n"
+        "An emphasis on user actions makes core functionality immediately apparent and provides "
+        "waypoints for the user.\n\n"
+
+        "Motion provides meaning.\n\n"
+
+        "Motion respects and reinforces the user as the prime mover. Primary user actions are "
+        "inflection points that initiate motion, transforming the whole design.\n"
+        "All action takes place in a single environment. Objects are presented to the user without "
+        "breaking the continuity of experience even as they transform and reorganize.\n"
+        "Motion is meaningful and appropriate, serving to focus attention and maintain continuity. "
+        "Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n"
+
+        "3D world.\n\n"
+
+        "The material environment is a 3D space, which means all objects have x, y, and z "
+        "dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the "
+        "positive z-axis extending towards the viewer. Every sheet of material occupies a single "
+        "position along the z-axis and has a standard 1dp thickness.\n"
+        "On the web, the z-axis is used for layering and not for perspective. The 3D world is "
+        "emulated by manipulating the y-axis.\n\n"
+
+        "Light and shadow.\n\n"
+
+        "Within the material environment, virtual lights illuminate the scene. Key lights create "
+        "directional shadows, while ambient light creates soft shadows from all angles.\n"
+        "Shadows in the material environment are cast by these two light sources. In Android "
+        "development, shadows occur when light sources are blocked by sheets of material at "
+        "various positions along the z-axis. On the web, shadows are depicted by manipulating the "
+        "y-axis only. The following example shows the card with a height of 6dp.\n\n"
+
+        "Resting elevation.\n\n"
+
+        "All material objects, regardless of size, have a resting elevation, or default elevation "
+        "that does not change. If an object changes elevation, it should return to its resting "
+        "elevation as soon as possible.\n\n"
+
+        "Component elevations.\n\n"
+
+        "The resting elevation for a component type is consistent across apps (e.g., FAB elevation "
+        "does not vary from 6dp in one app to 16dp in another app).\n"
+        "Components may have different resting elevations across platforms, depending on the depth "
+        "of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n"
+
+        "Responsive elevation and dynamic elevation offsets.\n\n"
+
+        "Some component types have responsive elevation, meaning they change elevation in response "
+        "to user input (e.g., normal, focused, and pressed) or system events. These elevation "
+        "changes are consistently implemented using dynamic elevation offsets.\n"
+        "Dynamic elevation offsets are the goal elevation that a component moves towards, relative "
+        "to the component’s resting state. They ensure that elevation changes are consistent "
+        "across actions and component types. For example, all components that lift on press have "
+        "the same elevation change relative to their resting elevation.\n"
+        "Once the input event is completed or cancelled, the component will return to its resting "
+        "elevation.\n\n"
+
+        "Avoiding elevation interference.\n\n"
+
+        "Components with responsive elevations may encounter other components as they move between "
+        "their resting elevations and dynamic elevation offsets. Because material cannot pass "
+        "through other material, components avoid interfering with one another any number of ways, "
+        "whether on a per component basis or using the entire app layout.\n"
+        "On a component level, components can move or be removed before they cause interference. "
+        "For example, a floating action button (FAB) can disappear or move off screen before a "
+        "user picks up a card, or it can move if a snackbar appears.\n"
+        "On the layout level, design your app layout to minimize opportunities for interference. "
+        "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
+        "when a user tries to pick up one of cards.\n\n"
+    </string>
+    <string name="title_activity_scrolling">ScrollingActivity</string>
+
+    <string name="title_activity_testfull">testfullActivity</string>
+
+</resources>