Browse Source

增加多语言

weizhengliang 2 years ago
parent
commit
0bc432f029
100 changed files with 410 additions and 18 deletions
  1. 1 0
      app/build.gradle
  2. 1 1
      app/src/main/AndroidManifest.xml
  3. 31 14
      app/src/main/java/com/wdkl/ncs/entraceguard/activity/MainActivity.kt
  4. 46 0
      app/src/main/java/com/wdkl/ncs/entraceguard/utils/LocaleMangerUtils.java
  5. 0 3
      app/src/main/res/values/strings.xml
  6. 1 0
      resource/.gitignore
  7. 32 0
      resource/build.gradle
  8. 21 0
      resource/proguard-rules.pro
  9. 2 0
      resource/src/main/AndroidManifest.xml
  10. 13 0
      resource/src/main/java/com/wdkl/ncs/resource/Resource.java
  11. BIN
      resource/src/main/res/drawable-hdpi/goods_search_more_action_item_selected_icon.png
  12. BIN
      resource/src/main/res/drawable-hdpi/javashop_groupbuy_logo.png
  13. BIN
      resource/src/main/res/drawable-hdpi/javashop_icon_category_text_white.png
  14. BIN
      resource/src/main/res/drawable-hdpi/javashop_icon_grid.png
  15. BIN
      resource/src/main/res/drawable-hdpi/javashop_icon_list.png
  16. BIN
      resource/src/main/res/drawable-hdpi/javashop_pointshop_logo.png
  17. BIN
      resource/src/main/res/drawable-hdpi/javashop_seckill_logo.png
  18. BIN
      resource/src/main/res/drawable-hdpi/javashop_setting_black.png
  19. BIN
      resource/src/main/res/drawable-hdpi/javashop_setting_white.png
  20. BIN
      resource/src/main/res/drawable-mdpi/goods_search_more_action_item_selected_icon.png
  21. BIN
      resource/src/main/res/drawable-mdpi/javashop_groupbuy_logo.png
  22. BIN
      resource/src/main/res/drawable-mdpi/javashop_icon_category_text_white.png
  23. BIN
      resource/src/main/res/drawable-mdpi/javashop_icon_grid.png
  24. BIN
      resource/src/main/res/drawable-mdpi/javashop_icon_list.png
  25. BIN
      resource/src/main/res/drawable-mdpi/javashop_pointshop_logo.png
  26. BIN
      resource/src/main/res/drawable-mdpi/javashop_seckill_logo.png
  27. BIN
      resource/src/main/res/drawable-mdpi/javashop_setting_black.png
  28. BIN
      resource/src/main/res/drawable-mdpi/javashop_setting_white.png
  29. BIN
      resource/src/main/res/drawable-xhdpi/goods_search_more_action_item_selected_icon.png
  30. BIN
      resource/src/main/res/drawable-xhdpi/javashop_groupbuy_logo.png
  31. BIN
      resource/src/main/res/drawable-xhdpi/javashop_icon_category_text_white.png
  32. BIN
      resource/src/main/res/drawable-xhdpi/javashop_icon_grid.png
  33. BIN
      resource/src/main/res/drawable-xhdpi/javashop_icon_list.png
  34. BIN
      resource/src/main/res/drawable-xhdpi/javashop_pointshop_logo.png
  35. BIN
      resource/src/main/res/drawable-xhdpi/javashop_seckill_logo.png
  36. BIN
      resource/src/main/res/drawable-xhdpi/javashop_setting_black.png
  37. BIN
      resource/src/main/res/drawable-xhdpi/javashop_setting_white.png
  38. BIN
      resource/src/main/res/drawable-xxhdpi/goods_search_more_action_item_selected_icon.png
  39. BIN
      resource/src/main/res/drawable-xxhdpi/javashop_groupbuy_logo.png
  40. BIN
      resource/src/main/res/drawable-xxhdpi/javashop_icon_category_text_white.png
  41. BIN
      resource/src/main/res/drawable-xxhdpi/javashop_icon_grid.png
  42. BIN
      resource/src/main/res/drawable-xxhdpi/javashop_icon_list.png
  43. BIN
      resource/src/main/res/drawable-xxhdpi/javashop_pointshop_logo.png
  44. BIN
      resource/src/main/res/drawable-xxhdpi/javashop_seckill_logo.png
  45. BIN
      resource/src/main/res/drawable-xxhdpi/javashop_setting_black.png
  46. BIN
      resource/src/main/res/drawable-xxhdpi/javashop_setting_white.png
  47. BIN
      resource/src/main/res/drawable-xxxhdpi/javashop_groupbuy_logo.png
  48. BIN
      resource/src/main/res/drawable-xxxhdpi/javashop_icon_grid.png
  49. BIN
      resource/src/main/res/drawable-xxxhdpi/javashop_icon_list.png
  50. BIN
      resource/src/main/res/drawable-xxxhdpi/javashop_pointshop_logo.png
  51. BIN
      resource/src/main/res/drawable-xxxhdpi/javashop_seckill_logo.png
  52. BIN
      resource/src/main/res/drawable/home_100.png
  53. BIN
      resource/src/main/res/drawable/icons8_signal_90.png
  54. BIN
      resource/src/main/res/drawable/icons8_users_90.png
  55. 9 0
      resource/src/main/res/drawable/javashop_back_black.xml
  56. 4 0
      resource/src/main/res/drawable/javashop_back_white.xml
  57. BIN
      resource/src/main/res/drawable/javashop_bg_address.png
  58. 5 0
      resource/src/main/res/drawable/javashop_bg_btn_red_selector.xml
  59. BIN
      resource/src/main/res/drawable/javashop_bg_coupon_unuse.png
  60. BIN
      resource/src/main/res/drawable/javashop_bg_coupon_useed.png
  61. 4 0
      resource/src/main/res/drawable/javashop_bg_red_shadow.xml
  62. 6 0
      resource/src/main/res/drawable/javashop_btn_balck_line_bg.xml
  63. 15 0
      resource/src/main/res/drawable/javashop_cancel_white.xml
  64. 9 0
      resource/src/main/res/drawable/javashop_cart_add_btn_bg.xml
  65. 9 0
      resource/src/main/res/drawable/javashop_cart_add_reduce_bg.xml
  66. 12 0
      resource/src/main/res/drawable/javashop_cart_center_tv.xml
  67. 9 0
      resource/src/main/res/drawable/javashop_cart_item_check.xml
  68. 11 0
      resource/src/main/res/drawable/javashop_cart_item_goods_bg.xml
  69. 9 0
      resource/src/main/res/drawable/javashop_cart_item_uncheck.xml
  70. 11 0
      resource/src/main/res/drawable/javashop_cart_left_btn.xml
  71. 4 0
      resource/src/main/res/drawable/javashop_cart_promotion_goto.xml
  72. 11 0
      resource/src/main/res/drawable/javashop_cart_right_btn.xml
  73. 5 0
      resource/src/main/res/drawable/javashop_cart_self_shop_icon.xml
  74. 4 0
      resource/src/main/res/drawable/javashop_cart_shop_icon.xml
  75. 13 0
      resource/src/main/res/drawable/javashop_category_left_item_nomal_bg.xml
  76. 4 0
      resource/src/main/res/drawable/javashop_category_left_item_select_bg.xml
  77. 5 0
      resource/src/main/res/drawable/javashop_category_my.xml
  78. 4 0
      resource/src/main/res/drawable/javashop_category_scan.xml
  79. 6 0
      resource/src/main/res/drawable/javashop_category_search_find.xml
  80. 5 0
      resource/src/main/res/drawable/javashop_check_box_selector.xml
  81. 9 0
      resource/src/main/res/drawable/javashop_circle_gray.xml
  82. 5 0
      resource/src/main/res/drawable/javashop_corner_black.xml
  83. 5 0
      resource/src/main/res/drawable/javashop_corner_blue.xml
  84. 5 0
      resource/src/main/res/drawable/javashop_corner_blue_right.xml
  85. 5 0
      resource/src/main/res/drawable/javashop_corner_gray.xml
  86. 7 0
      resource/src/main/res/drawable/javashop_corner_shadow_blue.xml
  87. 5 0
      resource/src/main/res/drawable/javashop_corners_common.xml
  88. 5 0
      resource/src/main/res/drawable/javashop_corners_red.xml
  89. 5 0
      resource/src/main/res/drawable/javashop_corners_red_left.xml
  90. 5 0
      resource/src/main/res/drawable/javashop_corners_red_right.xml
  91. 5 0
      resource/src/main/res/drawable/javashop_corners_shallow_red.xml
  92. 5 0
      resource/src/main/res/drawable/javashop_corners_white.xml
  93. BIN
      resource/src/main/res/drawable/javashop_coupon_item_bg.png
  94. BIN
      resource/src/main/res/drawable/javashop_coupon_left_bg.png
  95. BIN
      resource/src/main/res/drawable/javashop_coupon_right_bg.png
  96. 4 0
      resource/src/main/res/drawable/javashop_dotted_line_gray.xml
  97. 6 0
      resource/src/main/res/drawable/javashop_fillet_black_bg.xml
  98. 6 0
      resource/src/main/res/drawable/javashop_fillet_blue_bg.xml
  99. 6 0
      resource/src/main/res/drawable/javashop_fillet_blue_small_bg.xml
  100. 0 0
      resource/src/main/res/drawable/javashop_fillet_gray_bg.xml

+ 1 - 0
app/build.gradle

@@ -140,6 +140,7 @@ dependencies {
     compile 'com.alibaba:fastjson:1.2.23'
 
 
+    compile project(':resource')
 
     compile project(':framework')
 

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -44,7 +44,7 @@
     <application
         android:name="com.wdkl.ncs.entraceguard.application.Application"
         android:allowBackup="true"
-        android:icon="@mipmap/launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_http_config"
         android:roundIcon="@mipmap/ic_launcher_round"

+ 31 - 14
app/src/main/java/com/wdkl/ncs/entraceguard/activity/MainActivity.kt

@@ -27,6 +27,7 @@ import com.wdkl.ncs.entraceguard.tcp.channel.EntraceGuardUtil
 import com.wdkl.ncs.entraceguard.tcp.dto.TcpModel
 import com.wdkl.ncs.entraceguard.tcp.enums.TcpAction
 import com.wdkl.ncs.entraceguard.tcp.enums.TcpType
+import com.wdkl.ncs.entraceguard.utils.LocaleMangerUtils
 import com.wdkl.ncs.framework.base.BaseActivity
 import com.wdkl.ncs.framework.common.Constants
 import com.wdkl.ncs.framework.di.ApiProviders
@@ -86,6 +87,8 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
 
     var room: Room? = null
 
+    private var language = "zh"
+
     override fun getLayId(): Int {
         return R.layout.activity_main
     }
@@ -100,7 +103,7 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
     override fun init() {
 
         if(!NetHelper.getInstance().netAvailable){
-            showTipView(R.drawable.net_inavailable,"没有网络,无法通讯")
+            showTipView(R.drawable.net_inavailable,R.string.no_network)
             exitApp(5000)
         }else {
 
@@ -130,6 +133,8 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
 
 
         }
+
+        language = LocaleMangerUtils.getApplicationLocale().language
     }
 
     override fun bindEvent() {
@@ -170,7 +175,7 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
 //            SocketManager.getInstance().connect(Urls.WS, Constants.sipId, 0)
             TcpClient.getInstance().sendMsg(EntraceGuardUtil.startVisit(Constants.deviceId).toJson())
         }else{
-            showTipView(R.drawable.unregister,"设备未注册或未启用")
+            showTipView(R.drawable.unregister,R.string.device_unregister)
             exitApp(3000)
         }
 
@@ -216,7 +221,7 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
                         TcpAction.EntraceGuardAction.FAILED ->{  //护士主机不在线
                             //取消响应计时
                             responseCountDownTimer?.cancel()
-                            showTipView(R.drawable.host_offline,"对方不在线,无法连接")
+                            showTipView(R.drawable.host_offline,R.string.call_failed)
                             exitApp(3000)
                         }
 
@@ -226,10 +231,12 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
                             cancelCountDownTimer()
                             // 通过,亮起绿色灯光,并开门
                             gpioHelper!!.setPassStatus(true)
-                            gpioHelper!!.setWhiteLedStatus(true);
-                            play(passSoundID!!)
+                            gpioHelper!!.setWhiteLedStatus(true)
+                            if (Locale.CHINESE.getLanguage().equals(language)) {
+                                play(passSoundID!!)
+                            }
 
-                            showTipView(R.drawable.allow_in,"欢迎光临,正在为您开门")
+                            showTipView(R.drawable.allow_in,R.string.door_opened)
                             //结束通话
                             janusClient!!.destroyRoom(janusClient!!.currentHandleId, null)
                             janusClient!!.disConnect()
@@ -244,8 +251,10 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
                         TcpAction.EntraceGuardAction.REJECT ->{
                             //停止等待音乐,停止倒计时
                             cancelCountDownTimer()
-                            play(strangerSoundID!!)
-                            showTipView(R.drawable.busyline,"对方正忙,请稍候在试")
+                            if (Locale.CHINESE.getLanguage().equals(language)) {
+                                play(strangerSoundID!!)
+                            }
+                            showTipView(R.drawable.busyline,R.string.call_busy)
 
                             janusClient!!.destroyRoom(janusClient!!.currentHandleId, null)
                             janusClient!!.disConnect()
@@ -256,7 +265,9 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
                         TcpAction.EntraceGuardAction.LOCKDOOR -> {
                             // 陌生人,亮起红外灯光
                             gpioHelper!!.setPassStatus(false)
-                            play(strangerSoundID!!)
+                            if (Locale.CHINESE.getLanguage().equals(language)) {
+                                play(strangerSoundID!!)
+                            }
                         }
 
                         TcpAction.EntraceGuardAction.OPENSPEAKER -> { //打开音频
@@ -288,8 +299,10 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
                         TcpAction.EntraceGuardAction.HANGUP -> { //主机直接挂断,不开门显示
                             //停止等待音乐,停止倒计时
                             cancelCountDownTimer()
-                            play(strangerSoundID!!)
-                            showTipView(R.drawable.not_allow,"未授权通行")
+                            if (Locale.CHINESE.getLanguage().equals(language)) {
+                                play(strangerSoundID!!)
+                            }
+                            showTipView(R.drawable.not_allow,R.string.not_allowed)
                             janusClient!!.destroyRoom(janusClient!!.currentHandleId, null)
                             janusClient!!.disConnect()
 //                            SkyEngineKit.Instance().endCall()
@@ -433,7 +446,8 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
         countDownTimer = object : CountDownTimer(100 * 1000L, 1000) {
             override fun onTick(millisUntilFinished: Long) {
                 val time = millisUntilFinished / 1000
-                counter_down.setText("等待响应倒计时: " + time + " 秒")
+                val text = getString(R.string.call_timeout, time)
+                counter_down.setText(text)
             }
             override fun onFinish() {
                 //呼叫超时,返回到主界面
@@ -442,7 +456,7 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
                 janusClient!!.disConnect()
                 RingPlayHelper.stopRingTone()
                 TcpClient.getInstance().sendMsg(EntraceGuardUtil.timeOut(interactionVO).toJson())
-                showTipView(R.drawable.no_reponse,"无人应答,请稍候再试")
+                showTipView(R.drawable.no_reponse,R.string.call_no_response)
                 exitApp(3000)
             }
         }
@@ -460,12 +474,15 @@ class MainActivity : BaseActivity<MainActivityPresenter, ActivityMainBinding>(),
 
            }
            override fun onFinish() {
-               showTipView(R.drawable.no_reponse,"对方无响应,请稍候再试")
+               showTipView(R.drawable.no_reponse,R.string.call_no_response)
                exitApp(3000)
            }
        }
     }
 
+    fun showTipView(imageId: Int, resId: Int) {
+        showTipView(imageId, getString(resId))
+    }
 
     fun showTipView(imageId :Int, message:String){
         counter_down_wrap.visibility=View.GONE

+ 46 - 0
app/src/main/java/com/wdkl/ncs/entraceguard/utils/LocaleMangerUtils.java

@@ -0,0 +1,46 @@
+package com.wdkl.ncs.entraceguard.utils;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.util.Log;
+
+import androidx.annotation.RequiresApi;
+
+import com.wdkl.ncs.framework.base.BaseApplication;
+
+import java.util.Locale;
+
+public class LocaleMangerUtils {
+
+    public static Locale getSystemLocale() {
+        return Locale.getDefault();
+    }
+
+    public static void setApplicationLanguage(Context context, Locale locale) {
+        Log.d("locale", "set locale language: " + locale.getLanguage());
+        Configuration configuration = context.getResources().getConfiguration();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            configuration.setLocale(locale);
+        } else {
+            configuration.locale = locale;
+        }
+        // 更新context中的语言设置
+        Resources resources = context.getResources();
+        DisplayMetrics dm = resources.getDisplayMetrics();
+        resources.updateConfiguration(configuration, dm);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    public static Locale getApplicationLocale() {
+        Configuration config = BaseApplication.appContext.getResources().getConfiguration();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return config.locale;
+        } else {
+            return config.getLocales().get(0);
+        }
+    }
+
+}

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

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">门禁陌生访客</string>
-</resources>

+ 1 - 0
resource/.gitignore

@@ -0,0 +1 @@
+/build

+ 32 - 0
resource/build.gradle

@@ -0,0 +1,32 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion target_sdk_version
+    buildToolsVersion build_tools_version
+
+    defaultConfig {
+        minSdkVersion min_sdk_version
+        targetSdkVersion target_sdk_version
+        versionCode app_version_code
+        versionName app_version
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+   dependencies{
+       /**
+        * 单元测试
+        */
+       testCompile 'junit:junit:4.12'
+   }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+

+ 21 - 0
resource/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

+ 2 - 0
resource/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.wdkl.ncs.resource"/>

+ 13 - 0
resource/src/main/java/com/wdkl/ncs/resource/Resource.java

@@ -0,0 +1,13 @@
+package com.wdkl.ncs.resource;
+
+/**
+ * Created by LDD on 2017/12/13.
+ */
+
+public class Resource {
+
+    public static void main(String[] args){
+
+    }
+
+}

BIN
resource/src/main/res/drawable-hdpi/goods_search_more_action_item_selected_icon.png


BIN
resource/src/main/res/drawable-hdpi/javashop_groupbuy_logo.png


BIN
resource/src/main/res/drawable-hdpi/javashop_icon_category_text_white.png


BIN
resource/src/main/res/drawable-hdpi/javashop_icon_grid.png


BIN
resource/src/main/res/drawable-hdpi/javashop_icon_list.png


BIN
resource/src/main/res/drawable-hdpi/javashop_pointshop_logo.png


BIN
resource/src/main/res/drawable-hdpi/javashop_seckill_logo.png


BIN
resource/src/main/res/drawable-hdpi/javashop_setting_black.png


BIN
resource/src/main/res/drawable-hdpi/javashop_setting_white.png


BIN
resource/src/main/res/drawable-mdpi/goods_search_more_action_item_selected_icon.png


BIN
resource/src/main/res/drawable-mdpi/javashop_groupbuy_logo.png


BIN
resource/src/main/res/drawable-mdpi/javashop_icon_category_text_white.png


BIN
resource/src/main/res/drawable-mdpi/javashop_icon_grid.png


BIN
resource/src/main/res/drawable-mdpi/javashop_icon_list.png


BIN
resource/src/main/res/drawable-mdpi/javashop_pointshop_logo.png


BIN
resource/src/main/res/drawable-mdpi/javashop_seckill_logo.png


BIN
resource/src/main/res/drawable-mdpi/javashop_setting_black.png


BIN
resource/src/main/res/drawable-mdpi/javashop_setting_white.png


BIN
resource/src/main/res/drawable-xhdpi/goods_search_more_action_item_selected_icon.png


BIN
resource/src/main/res/drawable-xhdpi/javashop_groupbuy_logo.png


BIN
resource/src/main/res/drawable-xhdpi/javashop_icon_category_text_white.png


BIN
resource/src/main/res/drawable-xhdpi/javashop_icon_grid.png


BIN
resource/src/main/res/drawable-xhdpi/javashop_icon_list.png


BIN
resource/src/main/res/drawable-xhdpi/javashop_pointshop_logo.png


BIN
resource/src/main/res/drawable-xhdpi/javashop_seckill_logo.png


BIN
resource/src/main/res/drawable-xhdpi/javashop_setting_black.png


BIN
resource/src/main/res/drawable-xhdpi/javashop_setting_white.png


BIN
resource/src/main/res/drawable-xxhdpi/goods_search_more_action_item_selected_icon.png


BIN
resource/src/main/res/drawable-xxhdpi/javashop_groupbuy_logo.png


BIN
resource/src/main/res/drawable-xxhdpi/javashop_icon_category_text_white.png


BIN
resource/src/main/res/drawable-xxhdpi/javashop_icon_grid.png


BIN
resource/src/main/res/drawable-xxhdpi/javashop_icon_list.png


BIN
resource/src/main/res/drawable-xxhdpi/javashop_pointshop_logo.png


BIN
resource/src/main/res/drawable-xxhdpi/javashop_seckill_logo.png


BIN
resource/src/main/res/drawable-xxhdpi/javashop_setting_black.png


BIN
resource/src/main/res/drawable-xxhdpi/javashop_setting_white.png


BIN
resource/src/main/res/drawable-xxxhdpi/javashop_groupbuy_logo.png


BIN
resource/src/main/res/drawable-xxxhdpi/javashop_icon_grid.png


BIN
resource/src/main/res/drawable-xxxhdpi/javashop_icon_list.png


BIN
resource/src/main/res/drawable-xxxhdpi/javashop_pointshop_logo.png


BIN
resource/src/main/res/drawable-xxxhdpi/javashop_seckill_logo.png


BIN
resource/src/main/res/drawable/home_100.png


BIN
resource/src/main/res/drawable/icons8_signal_90.png


BIN
resource/src/main/res/drawable/icons8_users_90.png


+ 9 - 0
resource/src/main/res/drawable/javashop_back_black.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="48dp"
+        android:height="48dp"
+        android:viewportWidth="1024.0"
+        android:viewportHeight="1024.0">
+    <path
+        android:pathData="M348,512l405.6,-386.3c14.5,-13.7 14.5,-36.1 0,-49.8 -14.5,-13.8 -37.9,-13.8 -52.4,0L270.3,486.3c-7.4,7.1 -11,16.4 -10.8,25.7 -0.2,9.3 3.4,18.6 10.8,25.7l431.1,410.5c7.2,6.9 16.7,10.3 26.1,10.3 9.5,0 18.9,-3.4 26.2,-10.3 14.5,-13.8 14.5,-36.1 0,-49.8L348,512z"
+        android:fillColor="#222c3f"/>
+</vector>

+ 4 - 0
resource/src/main/res/drawable/javashop_back_white.xml

@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="1024.0"
+    android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M348,512l405.6,-386.3c14.5,-13.7 14.5,-36.1 0,-49.8 -14.5,-13.8 -37.9,-13.8 -52.4,0L270.3,486.3c-7.4,7.1 -11,16.4 -10.8,25.7 -0.2,9.3 3.4,18.6 10.8,25.7l431.1,410.5c7.2,6.9 16.7,10.3 26.1,10.3 9.5,0 18.9,-3.4 26.2,-10.3 14.5,-13.8 14.5,-36.1 0,-49.8L348,512z"/>
+</vector>

BIN
resource/src/main/res/drawable/javashop_bg_address.png


+ 5 - 0
resource/src/main/res/drawable/javashop_bg_btn_red_selector.xml

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

BIN
resource/src/main/res/drawable/javashop_bg_coupon_unuse.png


BIN
resource/src/main/res/drawable/javashop_bg_coupon_useed.png


+ 4 - 0
resource/src/main/res/drawable/javashop_bg_red_shadow.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#ff447a" android:centerColor="#ef2c38" android:endColor="#e8262a"/>
+</shape>

+ 6 - 0
resource/src/main/res/drawable/javashop_btn_balck_line_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/javashop_color_white" />
+    <stroke android:color="#313131" android:width="1px"/>
+    <corners android:radius="2dp"/>
+</shape>

+ 15 - 0
resource/src/main/res/drawable/javashop_cancel_white.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="48dp"
+        android:height="48dp"
+        android:viewportWidth="1024.0"
+        android:viewportHeight="1024.0">
+    <path
+        android:pathData="M786.9,669.5 L629.6,512.3l155.1,-155.1c32,-32 34,-83 2.1,-115l-0.8,-0.8c-32,-32 -85.4,-32.3 -117.4,-0.3L513.5,396.2 358.8,241.4c-32,-32 -85.4,-32.1 -117.4,-0.2l-0.8,0.8c-32,32 -29.9,83.5 2.1,115.5l154.8,154.8L240.5,669.2c-32,32 -29.7,83.5 2.2,115.5l0.8,0.8c32,32 81.1,31.8 113.1,-0.2l156.9,-156.9 157.2,157.2c32,32 81.1,31.6 113.1,-0.3l0.8,-0.8C816.6,752.5 818.8,701.4 786.9,669.5L786.9,669.5z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M788,670.5"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M768.1,659.1"
+        android:fillColor="#ffffff"/>
+</vector>

+ 9 - 0
resource/src/main/res/drawable/javashop_cart_add_btn_bg.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="48dp"
+        android:height="48dp"
+        android:viewportWidth="1024.0"
+        android:viewportHeight="1024.0">
+    <path
+        android:pathData="M863.328 482.56l-317.344-1.12L545.984 162.816c0-17.664-14.336-32-32-32s-32 14.336-32 32l0 318.4L159.616 480.064c-0.032 0-0.064 0-0.096 0-17.632 0-31.936 14.24-32 31.904C127.424 529.632 141.728 544 159.392 544.064l322.592 1.152 0 319.168c0 17.696 14.336 32 32 32s32-14.304 32-32l0-318.944 317.088 1.12c0.064 0 0.096 0 0.128 0 17.632 0 31.936-14.24 32-31.904C895.264 496.992 880.96 482.624 863.328 482.56z"
+        android:fillColor="#404141"/>
+</vector>

+ 9 - 0
resource/src/main/res/drawable/javashop_cart_add_reduce_bg.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="48dp"
+        android:height="48dp"
+        android:viewportWidth="1024.0"
+        android:viewportHeight="1024.0">
+    <path
+        android:pathData="M863.7,544 L163.4,544c-17.7,0 -32,-14.3 -32,-32s14.3,-32 32,-32l700.3,0c17.7,0 32,14.3 32,32S881.4,544 863.7,544z"
+        android:fillColor="#404141"/>
+</vector>

+ 12 - 0
resource/src/main/res/drawable/javashop_cart_center_tv.xml

@@ -0,0 +1,12 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="-2px"
+        android:right="-2px">
+        <shape>
+            <solid android:color="#ffffff"/>
+            <stroke
+                android:width="1px"
+                android:color="@color/javashop_color_cart_addbtn_line"/>
+        </shape>
+    </item>
+</layer-list>

+ 9 - 0
resource/src/main/res/drawable/javashop_cart_item_check.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="48dp"
+        android:height="48dp"
+        android:viewportWidth="1024.0"
+        android:viewportHeight="1024.0">
+    <path
+        android:pathData="M510.5,62.4c-247.5,0 -448.2,200.6 -448.2,448.2 0,247.5 200.6,448.2 448.2,448.2 247.6,0 448.2,-200.6 448.2,-448.2C958.7,263 758.1,62.4 510.5,62.4L510.5,62.4 510.5,62.4zM427,728.2 L226.8,527.9l45.3,-45.3 155,155 322,-322 45.3,45.3L427,728.2 427,728.2 427,728.2zM427,728.2"
+        android:fillColor="#ed252b"/>
+</vector>

+ 11 - 0
resource/src/main/res/drawable/javashop_cart_item_goods_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:topLeftRadius="5.0dip" android:topRightRadius="5.0dip" android:bottomLeftRadius="5.0dip" android:bottomRightRadius="5.0dip" />
+            <solid android:color="#00000000" />
+            <stroke android:width="1.0dip" android:color="@color/javashop_color_cart_goods_bg_line" />
+        </shape>
+    </item>
+</selector>

+ 9 - 0
resource/src/main/res/drawable/javashop_cart_item_uncheck.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="48dp"
+        android:height="48dp"
+        android:viewportWidth="1024.0"
+        android:viewportHeight="1024.0">
+    <path
+        android:pathData="M512,64C264.6,64 64,264.6 64,512c0,247.4 200.6,448 448,448s448,-200.6 448,-448C960,264.6 759.4,64 512,64zM512,896c-212.1,0 -384,-171.9 -384,-384s171.9,-384 384,-384 384,171.9 384,384S724.1,896 512,896z"
+        android:fillColor="#828584"/>
+</vector>

+ 11 - 0
resource/src/main/res/drawable/javashop_cart_left_btn.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:topLeftRadius="3.0dip" android:topRightRadius="0.0dip" android:bottomLeftRadius="3.0dip" android:bottomRightRadius="0.0dip" />
+            <solid android:color="#ffffff" />
+            <stroke android:width="1px" android:color="@color/javashop_color_cart_addbtn_line" />
+        </shape>
+    </item>
+</selector>

+ 4 - 0
resource/src/main/res/drawable/javashop_cart_promotion_goto.xml

@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="1024.0"
+    android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#E05A5A" android:pathData="M730.8,593.8 L804.3,525.9 273.7,0.5 219.7,54 694.6,524.2 220.6,970 274.4,1023.4 731,593.9Z"/>
+</vector>

+ 11 - 0
resource/src/main/res/drawable/javashop_cart_right_btn.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:topLeftRadius="0.0dip" android:topRightRadius="3.0dip" android:bottomLeftRadius="0.0dip" android:bottomRightRadius="3.0dip" />
+            <solid android:color="#ffffff" />
+            <stroke android:width="1px" android:color="@color/javashop_color_cart_addbtn_line" />
+        </shape>
+    </item>
+</selector>

+ 5 - 0
resource/src/main/res/drawable/javashop_cart_self_shop_icon.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="1024.0"
+    android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#383838" android:pathData="M416,176l-160,0 0,425c0,105.2 -36.1,134.5 -98.8,134.5 -29.4,0 -55.9,-5 -76.5,-12.1L64,847.8c29.4,10.1 74.5,16.2 109.8,16.2C317.9,864 416,796.3 416,602L416,176 416,176z"/>
+    <path android:fillColor="#383838" android:pathData="M764.9,160C610,160 512,248 512,364.3c0,100.2 75.5,162.9 185.3,203.3 79.4,28.3 110.8,53.6 110.8,95.1 0,45.5 -36.3,74.8 -104.9,74.8 -63.7,0 -121.6,-21.3 -160.8,-42.5l0,-0L512,821.5c37.3,21.3 106.9,42.5 182.3,42.5C875.7,864 960,766.9 960,652.6c0,-97.1 -53.9,-159.8 -170.6,-204.3 -86.3,-34.4 -122.5,-53.6 -122.5,-97.1 0,-34.4 31.4,-65.7 96.1,-65.7 63.7,0 107.5,21.4 133,34.6l38.3,-128C894.3,174.4 840.4,160 764.9,160L764.9,160z"/>
+</vector>

File diff suppressed because it is too large
+ 4 - 0
resource/src/main/res/drawable/javashop_cart_shop_icon.xml


+ 13 - 0
resource/src/main/res/drawable/javashop_category_left_item_nomal_bg.xml

@@ -0,0 +1,13 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="-2dp"
+        android:bottom="-2dp"
+        android:top="-2dp">
+        <shape>
+            <solid android:color="#ffffff"/>
+            <stroke
+                android:width="1px"
+                android:color="#DFE1E1"/>
+        </shape>
+    </item>
+</layer-list>

+ 4 - 0
resource/src/main/res/drawable/javashop_category_left_item_select_bg.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#f1f5f6"></solid>
+</shape>

+ 5 - 0
resource/src/main/res/drawable/javashop_category_my.xml

@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:viewportHeight="1024.0"
+    android:viewportWidth="1024.0" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3c4148" android:pathData="M616.5,618.7c106.7,-42.7 181.3,-147.2 181.3,-266.7C797.9,192 669.9,64 509.9,64c-157.9,0 -288,128 -288,288 0,121.6 74.7,224 181.3,266.7 -134.4,38.4 -241.1,151.5 -268.8,294.4 -2.1,6.4 0,12.8 4.3,17.1 2.1,4.3 8.5,8.5 14.9,8.5h712.5c6.4,0 12.8,-2.1 17.1,-8.5 4.3,-4.3 6.4,-10.7 4.3,-17.1 -29.9,-142.9 -136.5,-256 -270.9,-294.4z"/>
+</vector>
+

File diff suppressed because it is too large
+ 4 - 0
resource/src/main/res/drawable/javashop_category_scan.xml


+ 6 - 0
resource/src/main/res/drawable/javashop_category_search_find.xml

@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="1024.0"
+        android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<path android:fillColor="#c0c3c8"
+      android:pathData="M959.8,905.3l-139.7,-139.7c72.7,-79.6 117.1,-185.5 117.1,-301.8 0,-247.1 -200.3,-447.4 -447.4,-447.4S42.5,216.7 42.5,463.8c0,247.1 200.3,447.4 447.4,447.4 80.9,0 156.7,-21.5 222.2,-59l150.4,150.4c26.9,26.9 70.4,26.9 97.3,0C986.7,975.7 986.7,932.2 959.8,905.3zM489.8,808c-190.1,0 -344.2,-154.1 -344.2,-344.1 0,-190.1 154.1,-344.1 344.2,-344.1 190.1,0 344.1,154.1 344.1,344.1C834,653.9 679.9,808 489.8,808z"
+    />
+</vector>

+ 5 - 0
resource/src/main/res/drawable/javashop_check_box_selector.xml

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

+ 9 - 0
resource/src/main/res/drawable/javashop_circle_gray.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false">
+        <shape>
+            <solid android:color="#eef2f3" />
+            <corners android:radius="100dp"/>
+        </shape>
+    </item>
+</selector>

+ 5 - 0
resource/src/main/res/drawable/javashop_corner_black.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#000000" />
+    <corners android:radius="4dp"/>
+</shape>

+ 5 - 0
resource/src/main/res/drawable/javashop_corner_blue.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#4d91ce" />
+    <corners android:radius="2dp"/>
+</shape>

+ 5 - 0
resource/src/main/res/drawable/javashop_corner_blue_right.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#4d91ce" />
+    <corners android:topRightRadius="2dp" android:bottomRightRadius="2dp"/>
+</shape>

+ 5 - 0
resource/src/main/res/drawable/javashop_corner_gray.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#c2c2c2" />
+    <corners android:radius="2dp"/>
+</shape>

+ 7 - 0
resource/src/main/res/drawable/javashop_corner_shadow_blue.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#4d91ce" />
+    <gradient android:startColor="#5597d3" android:endColor="#5f76d1"  android:centerColor="#5289d3" />
+    <stroke android:color="#4d91ce" android:width="1dp"/>
+    <corners android:radius="100dp"/>
+</shape>

+ 5 - 0
resource/src/main/res/drawable/javashop_corners_common.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff" />
+    <corners android:radius="5dp"/>
+</shape>

+ 5 - 0
resource/src/main/res/drawable/javashop_corners_red.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#F13237" />
+    <corners android:radius="2dp"/>
+</shape>

+ 5 - 0
resource/src/main/res/drawable/javashop_corners_red_left.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ff4e5a" />
+    <corners android:topLeftRadius="6.5dp" android:bottomLeftRadius="6.5dp"/>
+</shape>

+ 5 - 0
resource/src/main/res/drawable/javashop_corners_red_right.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#F13237" />
+    <corners android:bottomRightRadius="2dp" android:topRightRadius="2dp"/>
+</shape>

+ 5 - 0
resource/src/main/res/drawable/javashop_corners_shallow_red.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#cccccc" />
+    <corners android:radius="2dp"/>
+</shape>

+ 5 - 0
resource/src/main/res/drawable/javashop_corners_white.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff" />
+    <corners android:radius="15dp"/>
+</shape>

BIN
resource/src/main/res/drawable/javashop_coupon_item_bg.png


BIN
resource/src/main/res/drawable/javashop_coupon_left_bg.png


BIN
resource/src/main/res/drawable/javashop_coupon_right_bg.png


+ 4 - 0
resource/src/main/res/drawable/javashop_dotted_line_gray.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:color="#cccccc" android:width="0.5dp" android:dashGap="5dp" android:dashWidth="3dp"/>
+</shape>

+ 6 - 0
resource/src/main/res/drawable/javashop_fillet_black_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF" />
+    <stroke android:color="@color/javashop_color_black" android:width="0.5dp"/>
+    <corners android:radius="2dp"/>
+</shape>

+ 6 - 0
resource/src/main/res/drawable/javashop_fillet_blue_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff" />
+    <stroke android:color="#4d91ce" android:width="1dp"/>
+    <corners android:radius="100dp"/>
+</shape>

+ 6 - 0
resource/src/main/res/drawable/javashop_fillet_blue_small_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff" />
+    <stroke android:color="#4d91ce" android:width="1dp"/>
+    <corners android:radius="2dp"/>
+</shape>

+ 0 - 0
resource/src/main/res/drawable/javashop_fillet_gray_bg.xml


Some files were not shown because too many files changed in this diff