Merge branch 'kd855_main' of http://139.59.124.127:9000/dola/SBC_Main_Android into kd855_main

.idea/misc.xml

@@ -13,6 +13,7 @@
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/layout_main_module.xml" value="0.36666666666666664" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/layout/layout_sub_module.xml" value="0.18802083333333333" />
         <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.295" />
+        <entry key="..\:/3-Work/Android/SBC_Main_Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.196" />
         <entry key="..\:/3-Work/Android/Yuki-Mobile/app/src/main/res/layout/bet_detail_item.xml" value="0.33" />
         <entry key="..\:/3-Work/Android/Yuki-Mobile/app/src/main/res/layout/betting_detail.xml" value="0.36666666666666664" />
         <entry key="..\:/3-Work/Android/Yuki-Mobile/app/src/main/res/layout/fragment_play.xml" value="0.2807971014492754" />
@@ -71,6 +72,8 @@
         <entry key="..\:/PartTimeProject/Yuki/Yuki-Mobile/app/src/main/res/layout/view_square.xml" value="0.18802083333333333" />
         <entry key="..\:/PartTimeProject/Yuki/Yuki-Mobile/app/src/main/res/mipmap-anydpi-v26/ic_logo.xml" value="0.196" />
         <entry key="..\:/android/SBC_Main_Android/app/src/main/res/drawable/app_background.xml" value="0.185" />
+        <entry key="..\:/android/SBC_Main_Android/app/src/main/res/layout/activity_login.xml" value="0.25416666666666665" />
+        <entry key="..\:/android/SBC_Main_Android/app/src/main/res/layout/activity_splash.xml" value="0.14673913043478262" />
         <entry key="..\:/android/SBC_Main_Android/app/src/main/res/layout/app_bar.xml" value="0.25416666666666665" />
         <entry key="..\:/android/SBC_Main_Android/app/src/main/res/layout/bet_detail_item.xml" value="0.25416666666666665" />
         <entry key="..\:/android/SBC_Main_Android/app/src/main/res/layout/betting_detail.xml" value="0.25416666666666665" />

app/src/main/res/layout/activity_splash.xml

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

app/src/prod/java/com/khmer9/lotto/config/Config.kt

@@ -1,7 +1,7 @@
 package com.khmer9.kdmain.config
 
 object Config {
-    const val BASE_URL = "https://playerapi.cf9.live"//"http://playerapi.cf2888.net"
+    const val BASE_URL = "https://playerapi.kd855.com"//"http://playerapi.cf2888.net"
     const val SOCKET_URL = ""
 
     const val MAIN_PACKAGE = "com.khmer9.kdmain"