瀏覽代碼

+ add logout function

Dola TENG 2 年之前
父節點
當前提交
4213b1efe8
共有 27 個文件被更改,包括 66 次插入31 次删除
  1. 1 0
      .idea/misc.xml
  2. 45 20
      app/src/main/java/com/khmer9/cock8888main/screen/main/MainModuleViewHolder.kt
  3. 0 1
      app/src/main/java/com/khmer9/cock8888main/screen/splash/SplashScreenActivity.kt
  4. 二進制
      app/src/main/res/drawable-hdpi/ic_logo_big.png
  5. 二進制
      app/src/main/res/drawable-v24/ic_logo_big.png
  6. 二進制
      app/src/main/res/drawable-xhdpi/ic_logo_big.png
  7. 二進制
      app/src/main/res/drawable-xxhdpi/ic_logo_big.png
  8. 二進制
      app/src/main/res/drawable-xxxhdpi/ic_logo_big.png
  9. 二進制
      app/src/main/res/drawable/bg_card.jpg
  10. 二進制
      app/src/main/res/drawable/bg_snk.jpg
  11. 二進制
      app/src/main/res/drawable/ic_card.png
  12. 二進制
      app/src/main/res/drawable/ic_logo_big.png
  13. 二進制
      app/src/main/res/drawable/ic_snk.png
  14. 二進制
      app/src/main/res/drawable/lottobg.jpg
  15. 1 1
      app/src/main/res/layout/activity_login.xml
  16. 1 0
      app/src/main/res/layout/activity_splash.xml
  17. 1 1
      app/src/main/res/layout/app_bar.xml
  18. 1 0
      app/src/main/res/layout/content_main.xml
  19. 1 1
      app/src/main/res/layout/layout_sub_module.xml
  20. 1 1
      app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  21. 二進制
      app/src/main/res/mipmap-hdpi/ic_launcher.png
  22. 二進制
      app/src/main/res/mipmap-mdpi/ic_launcher.png
  23. 二進制
      app/src/main/res/mipmap-xhdpi/ic_launcher.png
  24. 二進制
      app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  25. 二進制
      app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  26. 2 2
      app/src/main/res/values/colors.xml
  27. 12 4
      app/src/prod/java/com/khmer9/lotto/config/Config.kt

+ 1 - 0
.idea/misc.xml

@@ -8,6 +8,7 @@
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/activity_main.xml" value="0.36666666666666664" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/activity_splash.xml" value="0.3523550724637681" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/app_bar.xml" value="0.36666666666666664" />
+        <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/content_main.xml" value="0.3582427536231884" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/fragment_report.xml" value="0.18802083333333333" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/layout_fragment_main_yuki.xml" value="0.36666666666666664" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/layout_main_module.xml" value="0.36666666666666664" />

+ 45 - 20
app/src/main/java/com/khmer9/cock8888main/screen/main/MainModuleViewHolder.kt

@@ -49,7 +49,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                     Config.LOTTO_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_lotto_80)
-                            .placeholder(R.drawable.animal_seven)
+                            .placeholder(R.drawable.ic_lotto_80)
                             .into(imgIcon)
                     }
                     Config.LOTTO_PLUS_APP_ID -> {
@@ -60,7 +60,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                     }
                     Config.COCK_FIGHT_APP_ID -> {
                         picasso
-                            .load(R.drawable.ic_logo_cock)
+                            .load(R.drawable.ic_logo_big)
                             .placeholder(R.drawable.animal_seven)
                             .into(imgIcon)
 
@@ -82,6 +82,22 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
 
                         backgroundModule.setBackgroundResource(R.drawable.apongbg)
                     }
+                    Config.CARD_APP_ID -> {
+                        picasso
+                            .load(R.drawable.ic_card)
+                            .placeholder(R.drawable.ic_card)
+                            .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.bg_card)
+                    }
+                    Config.SNK_APP_ID -> {
+                        picasso
+                            .load(R.drawable.ic_snk)
+                            .placeholder(R.drawable.ic_card)
+                            .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.bg_snk)
+                    }
                     else -> {
                         picasso
                             .load(R.drawable.ic_lotto_main)
@@ -102,29 +118,29 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
         } else if (item is SubModuleData) {
             tvName.text = item.name
 
-            try {
-                val displayMetrics = itemView.context.resources.displayMetrics
-                val pxWidth = displayMetrics.widthPixels
-                val pxHeight = displayMetrics.heightPixels
-                val dpWidth = pxWidth / displayMetrics.density
-                val dpHeight = pxHeight / displayMetrics.density
+            val displayMetrics = itemView.context.resources.displayMetrics
+            val pxWidth = displayMetrics.widthPixels
+            val pxHeight = displayMetrics.heightPixels
+            val dpWidth = pxWidth / displayMetrics.density
+            val dpHeight = pxHeight / displayMetrics.density
 
-                // high resolution pixel 14400
-                var height = dpHeight * 0.5804f
+            // high resolution pixel 14400
+            var height = dpHeight * 0.5804f
 
-                //low resolution
-                if (pxWidth < 1000) {
-                    height = dpHeight * 0.2804f
-                }
+            //low resolution
+            if (pxWidth < 1000) {
+                height = dpHeight * 0.2804f
+            }
 
-                imgIcon.layoutParams.height = height.toInt()
-                imgIcon.layoutParams.width = height.toInt()
+            imgIcon.layoutParams.height = height.toInt()
+            imgIcon.layoutParams.width = height.toInt()
 
+            try {
                 when (item.appId) {
                     Config.LOTTO_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_lotto_80)
-                            .placeholder(R.drawable.animal_seven)
+                            .placeholder(R.drawable.ic_lotto_80)
                             .into(imgIcon)
 
                         backgroundModule.setBackgroundResource(R.drawable.lottobg)
@@ -132,7 +148,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                     Config.LOTTO_PLUS_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_lotto_plus)
-                            .placeholder(R.drawable.animal_seven)
+                            .placeholder(R.drawable.ic_lotto_plus)
                             .into(imgIcon)
 
                         backgroundModule.setBackgroundResource(R.drawable.lottobg)
@@ -140,7 +156,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                     Config.YUKI_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_yuki)
-                            .placeholder(R.drawable.animal_seven)
+                            .placeholder(R.drawable.ic_yuki)
                             .into(imgIcon)
 
                         backgroundModule.setBackgroundResource(R.drawable.yukibg)
@@ -148,11 +164,20 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                     Config.APONG_APP_ID -> {
                         picasso
                             .load(R.drawable.ic_apong)
-                            .placeholder(R.drawable.animal_seven)
+                            .placeholder(R.drawable.ic_apong)
                             .into(imgIcon)
 
                         backgroundModule.setBackgroundResource(R.drawable.apongbg)
                     }
+
+                    Config.CARD_APP_ID -> {
+                        picasso
+                            .load(R.drawable.ic_card)
+                            .placeholder(R.drawable.ic_card)
+                            .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.bg_card)
+                    }
                     else -> {
                         picasso
                             .load(item.smallIcon)

+ 0 - 1
app/src/main/java/com/khmer9/cock8888main/screen/splash/SplashScreenActivity.kt

@@ -13,7 +13,6 @@ import com.khmer9.cock8888main.app.ShareActivity
 import com.khmer9.cock8888main.base.BaseActivity
 import com.khmer9.cock8888main.screen.login.LoginActivity
 
-
 class SplashScreenActivity : BaseActivity() {
     lateinit var imageLading: ImageView
     lateinit var rotateAnimation: Animation

二進制
app/src/main/res/drawable-hdpi/ic_logo_big.png


二進制
app/src/main/res/drawable-v24/ic_logo_big.png


二進制
app/src/main/res/drawable-xhdpi/ic_logo_big.png


二進制
app/src/main/res/drawable-xxhdpi/ic_logo_big.png


二進制
app/src/main/res/drawable-xxxhdpi/ic_logo_big.png


二進制
app/src/main/res/drawable/bg_card.jpg


二進制
app/src/main/res/drawable/bg_snk.jpg


二進制
app/src/main/res/drawable/ic_card.png


二進制
app/src/main/res/drawable/ic_logo_big.png


二進制
app/src/main/res/drawable/ic_snk.png


二進制
app/src/main/res/drawable/lottobg.jpg


+ 1 - 1
app/src/main/res/layout/activity_login.xml

@@ -4,9 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/colorPrimary"
     tools:context=".screen.login.LoginActivity">
 
-
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/left_guideline"
         android:layout_width="wrap_content"

+ 1 - 0
app/src/main/res/layout/activity_splash.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/colorPrimary"
     tools:context=".screen.splash.SplashScreenActivity">
 
     <ImageView

+ 1 - 1
app/src/main/res/layout/app_bar.xml

@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_gravity="center_vertical"
-        android:background="@color/colorToolbar"
+        android:background="@color/colorPrimary"
         app:popupTheme="@style/PopupOverlay">
 
         <androidx.constraintlayout.widget.ConstraintLayout

+ 1 - 0
app/src/main/res/layout/content_main.xml

@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    android:background="@color/color_gray_800"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
 

+ 1 - 1
app/src/main/res/layout/layout_sub_module.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
-    android:background="@color/new_background"
+    android:background="@color/color_gray_800"
     android:orientation="vertical"
     tools:context=".screen.main.MainFragment">
 

+ 1 - 1
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <foreground android:drawable="@drawable/ic_launcher" />
+    <foreground android:drawable="@drawable/ic_logo_big" />
 </adaptive-icon>

二進制
app/src/main/res/mipmap-hdpi/ic_launcher.png


二進制
app/src/main/res/mipmap-mdpi/ic_launcher.png


二進制
app/src/main/res/mipmap-xhdpi/ic_launcher.png


二進制
app/src/main/res/mipmap-xxhdpi/ic_launcher.png


二進制
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png


+ 2 - 2
app/src/main/res/values/colors.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#334a9f</color>
-    <color name="colorPrimaryDark">#253e99</color>
+    <color name="colorPrimary">#023c2b</color>
+    <color name="colorPrimaryDark">#023c2b</color>
     <color name="colorPrimaryLight">#1776cf</color>
     <color name="colorAccent">#03DAC5</color>
     <color name="black_overlay">#3700B3</color>

+ 12 - 4
app/src/prod/java/com/khmer9/lotto/config/Config.kt

@@ -6,11 +6,11 @@ object Config {
 
     const val MAIN_PACKAGE = "com.khmer9.cock8888main"
 
-    const val LOTTO_PLUS_APP_ID = "62e397edae71cfa8782aa3a0"
+    const val LOTTO_PLUS_APP_ID = "635fd9ee1142eb139d4ad65c"
     const val LOTTO_PLUS_DOWNLOAD = "https://www.dropbox.com/s/o8c31k6xd3nh494/Lottery-Mobile_prodDebug_1.0.30.apk?dl=1"
     const val LOTTO_PLUS_PACKAGE = "com.sambath.lottoplus_cock8888"
 
-    const val LOTTO_APP_ID = "630780f0f635dd035329f5b7"
+    const val LOTTO_APP_ID = "635fd678d3d45e0479d74476"
     const val LOTTO_DOWNLOAD = "https://www.dropbox.com/s/jvg5rb6vin0amqk/Khmer9_Lotto_prodDebug_1.0.4.apk?dl=1"
     const val LOTTO_PACKAGE = "com.khmer9.lotto_cock8888"
 
@@ -18,11 +18,19 @@ object Config {
     const val APONG_DOWNLOAD = "https://www.dropbox.com/s/5wwgq6sz4jlpq0b/APONG_prodDebug_1.0.12.apk?dl=1"
     const val APONG_PACKAGE = "com.sambath.apong_cock8888"
 
-    const val YUKI_APP_ID = "630478c22983a591133f0492"
+    const val YUKI_APP_ID = "635fdd6c2d019b53e16a10f4"
     const val YUKI_DOWNLOAD = "https://www.dropbox.com/s/nhoyttx1jvfl9p6/Khmer9_Yuki_prodDebug_1.0.1.apk?dl=1"
     const val YUKI_PACKAGE = "com.khmer9.yuki_cock8888"
 
-    const val COCK_FIGHT_APP_ID = "631486275967907d6780cba6"
+    const val COCK_FIGHT_APP_ID = "6352c0c5f22aae3000a764ef"
     const val COCK_FIGHT_DOWNLOAD = "https://www.dropbox.com/s/y849kge90sumqcn/SBC-Mobile_prodDebug_1.1.2.apk?dl=1"
     const val COCK_FIGHT_PACKAGE = "com.sambath.sbc_cock8888"
+
+    const val CARD_APP_ID = "kd855"
+    const val CARD_DOWNLOAD = ""
+    const val CARD_PACKAGE = ""
+
+    const val SNK_APP_ID = "snk"
+    const val SNK_DOWNLOAD = ""
+    const val SNK_PACKAGE = ""
 }