d

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>

.idea/gradle.xml

@@ -4,8 +4,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
@@ -21,6 +19,7 @@
             <option value="$PROJECT_DIR$/user" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

app/src/main/java/com/swago/app/SplashVm.kt

@@ -112,9 +112,8 @@ class SplashVm(application: Application) : BaseViewModel(application) {
 
     private fun setBaseUrl(baseUrl: String) {
         if (BuildConfig.DEBUG) {
-            UrlConstant.BASE_URL =   "http:test-api.swago.cn"
-//            UrlConstant.BASE_URL =   "http:huawei.swago.cn"
-//            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
+//            UrlConstant.BASE_URL =   "http:test-api.swago.cn"
+            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
         } else {
             UrlConstant.BASE_URL = baseUrl
         }

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

app/src/main/res/drawable/default_splash.xml

@@ -6,7 +6,7 @@
     </item>
 
     <item>
-        <bitmap android:src="@drawable/bg_splash"/>
+        <bitmap android:src="@drawable/default_bg"/>
     </item>
 
     <item android:gravity="center">

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

@@ -1,5 +1,5 @@
 <?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"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?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"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Swago</string>
+    <string name="app_name">MeLiv</string>
 </resources>

baseswago/src/main/java/com/swago/baseswago/constant/UrlConstant.kt

@@ -14,9 +14,8 @@ import java.io.File
 object UrlConstant {
 
     var BASE_URL = if (BuildConfig.DEBUG) {
-            "http:test-api.swago.cn"
-//            "http:huawei.swago.cn"
-//        "https://pro-api.swago.cn"
+//            "http:test-api.swago.cn"
+        "https://pro-api.swago.cn"
     } else {
             "https://pro-api.swago.cn"
         }

baseswago/src/main/res/layout/layout_toolbar.xml

@@ -19,7 +19,6 @@
         android:id="@+id/tvTitle"
         android:textColor="#000"
         android:textSize="18dp"
-        tools:text="Swago"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"

baseswago/src/main/res/values-ar/strings.xml

@@ -21,7 +21,7 @@
     <string name="leave">مغادرة</string>
     <string name="join_room">دخل غرفة البث</string>
     <string name="id_x">ID:%s</string>
-    <string name="swago_offical_msg">المعلومات الرسمية Swago</string>
+    <string name="swago_offical_msg">المعلومات الرسمية MeLiv</string>
     <string name="message">رسالة</string>
     <string name="coin">كوينز</string>
     <string name="diamond">ماس</string>

baseswago/src/main/res/values-in/strings.xml

@@ -21,7 +21,7 @@
     <string name="leave">Keluarkan</string>
     <string name="join_room">bergabung di live room</string>
     <string name="id_x">ID:%s</string>
-    <string name="swago_offical_msg">Informasi resmi Swago</string>
+    <string name="swago_offical_msg">Informasi resmi MeLiv</string>
     <string name="message">Pesan</string>
     <string name="coin">Koin</string>
     <string name="diamond">Diamond</string>

baseswago/src/main/res/values-ms/strings.xml

@@ -21,7 +21,7 @@
     <string name="leave">Tercicir keluar</string>
     <string name="join_room">Menyertai bilik</string>
     <string name="id_x">ID:%s</string>
-    <string name="swago_offical_msg">Maklumat rasmi Swago</string>
+    <string name="swago_offical_msg">Maklumat rasmi MeLiv</string>
     <string name="message">mesej</string>
     <string name="coin">koin</string>
     <string name="diamond">berlian</string>

baseswago/src/main/res/values-zh/strings.xml

@@ -21,7 +21,7 @@
     <string name="leave">离开</string>
     <string name="join_room">进入直播间</string>
     <string name="id_x">ID:%s</string>
-    <string name="swago_offical_msg">Swago官方信息</string>
+    <string name="swago_offical_msg">MeLiv官方信息</string>
     <string name="message">信息</string>
     <string name="coin">金币</string>
     <string name="diamond">钻石</string>

baseswago/src/main/res/values/strings.xml

@@ -25,7 +25,7 @@
     <string name="leave">Back</string>
     <string name="join_room">join room</string>
     <string name="id_x">ID:%s</string>
-    <string name="swago_offical_msg">Swago official information</string>
+    <string name="swago_offical_msg">MeLiv official information</string>
     <string name="message">Message</string>
     <string name="coin">Coins</string>
     <string name="diamond">Diamonds</string>

home/src/main/java/com/swago/home/MineFragment.kt

@@ -32,7 +32,7 @@ class MineFragment : BaseXFragment<FragmentMineBinding>() {
             binding.tvXWithdrawal.visibility = View.GONE
         }else{
             if (SwagoInfo.getLanguageCode() == "id"){
-                binding.tvXWithdrawal.visibility = View.VISIBLE
+                binding.tvXWithdrawal.visibility = View.GONE
             }else{
                 binding.tvXWithdrawal.visibility = View.GONE
             }

home/src/main/res/layout/fragment_message.xml

@@ -47,7 +47,7 @@
             android:layout_width="match_parent"
             android:layout_height="80dp">
 
-            <ImageView
+            <de.hdodenhof.circleimageview.CircleImageView
                 android:id="@+id/iv_msg"
                 android:src="@mipmap/icon_system_message"
                 android:layout_marginStart="15dp"

login/src/main/res/layout/activity_login.xml

@@ -6,10 +6,9 @@
     android:layout_height="match_parent">
 
     <ImageView
-        android:background="@mipmap/bg_home"
-        app:layout_constraintTop_toTopOf="parent"
+        android:background="@mipmap/default_bg"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="match_parent"/>
 
     <ImageView
         android:id="@+id/ivLogo"
@@ -17,20 +16,10 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:src="@mipmap/logo_login"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:src="@mipmap/default_logo"
+        android:layout_width="200dp"
+        android:layout_height="200dp"/>
 
-    <com.swago.baseswago.cusview.BoldTextView
-        android:textSize="18dp"
-        android:textColor="#131B23"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ivLogo"
-        android:layout_marginTop="14dp"
-        android:text="Swago Live"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
 
     <com.swago.baseswago.cusview.MediumTextView
         android:id="@+id/tvAccountLogin"
@@ -38,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_marginBottom="20dp"
         android:textSize="16dp"
-        android:textColor="#131B23"
+        android:textColor="#ffffff"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/tvAgreement"
@@ -175,7 +164,7 @@
         android:id="@+id/and"
         android:text="@string/and"
         android:textSize="12dp"
-        android:textColor="#868686"
+        android:textColor="#CDCDCD"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
         app:layout_constraintStart_toEndOf="@+id/tvAgreement"
@@ -201,7 +190,7 @@
 
     <com.swago.baseswago.cusview.MediumTextView
         android:textSize="12dp"
-        android:textColor="#868686"
+        android:textColor="#CDCDCD"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

room/src/main/java/com/swago/room/service/AgoraForegroundService.java

@@ -21,7 +21,7 @@ public class AgoraForegroundService extends Service {
     public static final String ACTION_STOP_FOREGROUND_SERVICE = "ACTION_STOP_FOREGROUND_SERVICE";
 
     private String ID = "com.swago.room.service.AgoraForegroundService";	//这里的id里面输入自己的项目的包的路径
-    private String NAME = "Swago";
+    private String NAME = "MeLiv";
 
     public AgoraForegroundService() {
     }
@@ -83,7 +83,7 @@ public class AgoraForegroundService extends Service {
         }
 
         builder.setContentTitle(NAME)
-                .setContentText("Swago is running")
+                .setContentText("MeLiv is running")
                 .setWhen(System.currentTimeMillis())
                 .setSmallIcon(R.drawable.ic_launcher)
                 .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher))

user/src/main/java/com/swago/user/CustomServiceActivity.kt

@@ -26,7 +26,6 @@ class CustomServiceActivity : BaseXActivity<ActivityCustomServiceBinding>() {
 
     override fun initLiveData() {
         UrlConstant.getConfigModel()?.let {
-            binding.tvGmail.text = "gmail:${it.app_gmail}"
             binding.tvWhatsApp.text = it.app_phone
         }
     }

user/src/main/res/layout/activity_custom_service.xml

@@ -27,6 +27,7 @@
         android:text="Gmail"
         android:drawablePadding="6dp"
         android:textSize="18dp"
+        android:visibility="gone"
         android:textColor="#131B23"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
         app:layout_constraintStart_toStartOf="parent"
@@ -40,6 +41,7 @@
         app:layout_constraintTop_toBottomOf="@+id/gmailTitle"
         android:layout_marginTop="10dp"
         android:textSize="16dp"
+        android:visibility="gone"
         android:textColor="#131b23"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"