tianka 2 weeks ago
parent
commit
588b5bb724
23 changed files with 27 additions and 27 deletions
  1. 1 1
      app/src/main/res/values/strings.xml
  2. 1 1
      module_base/src/main/java/com/yc/module_base/view/cell/MessageUserVH.kt
  3. 1 1
      module_base/src/main/java/com/yc/module_base/websocket/WebSocketService.kt
  4. 1 1
      module_base/src/main/res/layout/module_main_teenagers_dialog.xml
  5. 2 2
      module_base/src/main/res/values/strings.xml
  6. BIN
      module_home/src/main/res/drawable-xhdpi/icon_rank_home_top_rank.png
  7. BIN
      module_home/src/main/res/drawable-xxhdpi/icon_home_search.png
  8. 1 1
      module_live/src/main/java/com/yc/module_live/view/dialog/RoomChatDialog.kt
  9. 1 1
      module_live/src/main/res/layout/module_room_top_layer_fragment.xml
  10. 1 1
      module_live/src/main/res/layout/module_room_top_live_layer_fragment.xml
  11. 2 2
      module_main/src/main/java/com/mita/module_main/view/dialog/UserPrivacyProtocolDialog.kt
  12. 1 1
      module_main/src/main/java/com/mita/module_main/view/login/LoginHomeActivity.kt
  13. 2 2
      module_main/src/main/java/com/mita/module_main/view/login/phonecode/PhoneCodeActivity.kt
  14. 1 1
      module_main/src/main/res/layout/module_main_privacy_protocol_dialog.xml
  15. 1 1
      module_main/src/main/res/values/strings.xml
  16. 2 2
      module_me/src/main/java/com/mita/module_me/view/aboutus/AboutUsActivity.kt
  17. 4 4
      module_me/src/main/java/com/mita/module_me/view/invite/InviteEarningsViewModel.kt
  18. 1 1
      module_me/src/main/res/layout/module_me_dialog_invite_share.xml
  19. 1 1
      module_me/src/main/res/layout/module_me_item_enter.xml
  20. 1 1
      module_me/src/main/res/layout/module_me_item_user_enter.xml
  21. 1 1
      module_me/src/main/res/values/strings.xml
  22. 1 1
      module_message/src/main/java/com/mita/module_message/view/chat/ChatActivity.kt
  23. BIN
      module_message/src/main/res/drawable-xxhdpi/icon_tab_indicator.png

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">甜咖直播</string>
+    <string name="app_name">寻星直播</string>
 </resources>

+ 1 - 1
module_base/src/main/java/com/yc/module_base/view/cell/MessageUserVH.kt

@@ -161,7 +161,7 @@ class MessageUserVH(
 //                        strokeColor = color(R.color.white),
                         circle = true
                     )
-                    tvName.text = "甜咖直播"
+                    tvName.text = "寻星直播"
                 } else {
                     ivIcon.loadImage(
                         url = it.picture,

+ 1 - 1
module_base/src/main/java/com/yc/module_base/websocket/WebSocketService.kt

@@ -33,7 +33,7 @@ class WebSocketService : Service() {
 
         // 创建通知
         val notification = NotificationCompat.Builder(this, channelId)
-            .setContentTitle("甜咖直播")
+            .setContentTitle("寻星直播")
             .setContentText("年轻人的直播平台")
             .setSmallIcon(R.drawable.app_logo)
             .build()

+ 1 - 1
module_base/src/main/res/layout/module_main_teenagers_dialog.xml

@@ -141,7 +141,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_8"
             android:gravity="center_horizontal"
-            android:text="该时间段内青少年模式的用户无法使用甜咖直播"
+            android:text="该时间段内青少年模式的用户无法使用寻星直播"
             android:textColor="#99000000"
             android:textSize="@dimen/sp_10"
             app:layout_constraintStart_toStartOf="parent"

+ 2 - 2
module_base/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">甜咖直播</string>
+    <string name="app_name">寻星直播</string>
     <string name="text_phone_num">手机号</string>
     <string name="text_base_send_code_success">验证码已发送</string>
     <string name="text_phone_num_des">验证码登录</string>
@@ -31,7 +31,7 @@
     <string name="super_admin_cancel">取消</string>
     <string name="live_room_end_anchor_data">本次直播数据</string>
     <string name="short_msg_content">你输入的内容太长了!</string>
-    <string name="privacy_content">尊敬的用户您好,在您使用甜咖直播前,辛苦您认真阅读并了解《用户注册协议》和《甜咖用户隐私协议》,点击"同意"表示您已阅读并同意全部条款。</string>
+    <string name="privacy_content">尊敬的用户您好,在您使用寻星直播前,辛苦您认真阅读并了解《用户注册协议》和《甜咖用户隐私协议》,点击"同意"表示您已阅读并同意全部条款。</string>
     <string name="treenagers_msg_content">在青少年模式中,我们选择了一批适合青少年观看的内容,且无法进行充值、打赏等操作。禁用时间无法使用**直播,且单日使用时长超过设置时间后,需输入密码才能继续使用</string>
     <string name="treenagers_dialog_content">在青少年模式中,我们精选了一批教育、知识类内容进行展示,且无法进行充值、打赏等操作,每日晚22:00至次日06:00期间无法使用,单日累计时长超过40分钟需要输入监护密码才能继续使用。</string>
 

BIN
module_home/src/main/res/drawable-xhdpi/icon_rank_home_top_rank.png


BIN
module_home/src/main/res/drawable-xxhdpi/icon_home_search.png


+ 1 - 1
module_live/src/main/java/com/yc/module_live/view/dialog/RoomChatDialog.kt

@@ -419,7 +419,7 @@ class RoomChatDialog(
 
     private fun setTitle() {
         if (user?.userId == 999L) {
-            tvName.text = "甜咖直播"
+            tvName.text = "寻星直播"
         } else {
             tvName.text = (user?.nickName)
         }

+ 1 - 1
module_live/src/main/res/layout/module_room_top_layer_fragment.xml

@@ -131,7 +131,7 @@
                         android:textSize="@dimen/sp_12"
                         android:textStyle="bold"
                         app:layout_constrainedWidth="true"
-                        tools:text="甜咖直播" />
+                        tools:text="寻星直播" />
 
                     <com.yc.baselibrary.widget.MarqueTextView
                         android:id="@+id/tvRoomId"

+ 1 - 1
module_live/src/main/res/layout/module_room_top_live_layer_fragment.xml

@@ -94,7 +94,7 @@
                         android:textSize="@dimen/sp_12"
                         android:textStyle="bold"
                         app:layout_constrainedWidth="true"
-                        tools:text="甜咖直播" />
+                        tools:text="寻星直播" />
 
                     <com.yc.baselibrary.widget.MarqueTextView
                         android:id="@+id/tvAnchorId"

+ 2 - 2
module_main/src/main/java/com/mita/module_main/view/dialog/UserPrivacyProtocolDialog.kt

@@ -44,7 +44,7 @@ class UserPrivacyProtocolDialog(
     }
 
     private fun setText() {
-        val str = "尊敬的用户您好,在您使用甜咖直播前,辛苦您认真阅读并了解《用户注册协议》和《甜咖用户隐私协议》,点击\"同意\"表示您已阅读并同意全部条款。"
+        val str = "尊敬的用户您好,在您使用寻星直播前,辛苦您认真阅读并了解《用户注册协议》和《甜咖用户隐私协议》,点击\"同意\"表示您已阅读并同意全部条款。"
         val builder = SpannableStringBuilder(str)
         builder.setClickable(
             textColor = color(R.color.colorPrimary),
@@ -65,7 +65,7 @@ class UserPrivacyProtocolDialog(
             clickable = {
                 it.context.launchActivity<NormalWebView> {
                     putExtra(NormalWebViewVm.H5_URL, CONCEAL)
-                    putExtra(NormalWebViewVm.H5_TITLE, "甜咖直播用户隐私协议")
+                    putExtra(NormalWebViewVm.H5_TITLE, "寻星直播用户隐私协议")
                     putExtra(WebViewVm.IS_NO_TOKEN, true)
                 }
             })

+ 1 - 1
module_main/src/main/java/com/mita/module_main/view/login/LoginHomeActivity.kt

@@ -132,7 +132,7 @@ class LoginHomeActivity : BaseActivity<LoginHomeVM>() {
 
         ll_WX.setSafeListener {
             if (!isSelectNotice) {
-                toast("同意《用户协议》和《甜咖直播用户隐私协议》")
+                toast("同意《用户协议》和《寻星直播用户隐私协议》")
                 return@setSafeListener
             }
             LoginManager.getConfig(this).startWxLogin(this, object : LoginManager.ThreeListener {

+ 2 - 2
module_main/src/main/java/com/mita/module_main/view/login/phonecode/PhoneCodeActivity.kt

@@ -159,7 +159,7 @@ class PhoneCodeActivity : BaseActivity<PhoneCodeVM>() {
 
         ivID.setSafeListener {
             if (!isSelectNotice) {
-                toast("同意《用户协议》和《甜咖直播用户隐私协议》")
+                toast("同意《用户协议》和《寻星直播用户隐私协议》")
                 return@setSafeListener
             }
             launchActivity<IdLoginActivity> { }
@@ -169,7 +169,7 @@ class PhoneCodeActivity : BaseActivity<PhoneCodeVM>() {
 
         tvLogin.setOnClickListener {
             if (!isSelectNotice) {
-                toast("同意《用户协议》和《甜咖直播用户隐私协议》")
+                toast("同意《用户协议》和《寻星直播用户隐私协议》")
                 return@setOnClickListener
             }
             val phoneValue = editPhoneInput.text.toString()

+ 1 - 1
module_main/src/main/res/layout/module_main_privacy_protocol_dialog.xml

@@ -18,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
-            android:text="欢迎使用甜咖直播"
+            android:text="欢迎使用寻星直播"
             android:layout_marginTop="@dimen/dp_20"
             android:textColor="@color/black2"
             android:textSize="@dimen/sp_18"

+ 1 - 1
module_main/src/main/res/values/strings.xml

@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
 
     <string name="text_login">登录</string>
-    <string name="wel_app_name">欢迎来到甜咖直播</string>
+    <string name="wel_app_name">欢迎来到寻星直播</string>
     <string name="text_login_home_other">其他方式登录</string>
     <string name="text_login_home_phone">手机登录</string>
     <string name="text_login_phone_num">手机号</string>

+ 2 - 2
module_me/src/main/java/com/mita/module_me/view/aboutus/AboutUsActivity.kt

@@ -21,7 +21,7 @@ class AboutUsActivity : BaseActivity<AboutUsVM>() {
     override fun initView() {
         this.window.decorView.systemUiVisibility =
             android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-        tvAppName.text = "甜咖直播 v${AppUtils.getAppVersionName()}"
+        tvAppName.text = "寻星直播 v${AppUtils.getAppVersionName()}"
         user.setOnClickListener {
             launchActivity<WebViewActivity> {
                 putExtra(WebViewVm.H5_URL, AGREE)
@@ -31,7 +31,7 @@ class AboutUsActivity : BaseActivity<AboutUsVM>() {
         userPrivacy.setOnClickListener {
             launchActivity<WebViewActivity> {
                 putExtra(WebViewVm.H5_URL, CONCEAL)
-                putExtra(WebViewVm.H5_TITLE, "甜咖直播用户隐私协议")
+                putExtra(WebViewVm.H5_TITLE, "寻星直播用户隐私协议")
             }
         }
         anchorPrivacy.setOnClickListener {

+ 4 - 4
module_me/src/main/java/com/mita/module_me/view/invite/InviteEarningsViewModel.kt

@@ -186,10 +186,10 @@ class InviteEarningsViewModel(
                 val map = res.data.orEmpty()
                 val cfg = InviteShareConfig(
                     inviteBaseUrl = map["invite_base_url"] ?: "https://share.sweetee.live/invite/",
-                    shareTitle = map["share_title"] ?: "甜咖直播",
+                    shareTitle = map["share_title"] ?: "寻星直播",
                     shareDesc = map["share_desc"] ?: "邀请好友领取丰厚礼",
                     shareIcon = map["share_icon"] ?: "",
-                    posterAppName = map["poster_app_name"] ?: "甜咖直播",
+                    posterAppName = map["poster_app_name"] ?: "寻星直播",
                     posterSubtitle = map["poster_subtitle"] ?: "邀请您加入"
                 )
                 cfg
@@ -204,10 +204,10 @@ class InviteEarningsViewModel(
                     Log.e("InviteEarningsViewModel", "requestInviteShareConfig error: ${it.message}", it)
                     val fallback = InviteShareConfig(
                         inviteBaseUrl = "https://share.sweetee.live/invite/",
-                        shareTitle = "甜咖直播",
+                        shareTitle = "寻星直播",
                         shareDesc = "邀请好友领取丰厚礼",
                         shareIcon = "",
-                        posterAppName = "甜咖直播",
+                        posterAppName = "寻星直播",
                         posterSubtitle = "邀请您加入"
                     )
                     cachedInviteShareConfig = fallback

+ 1 - 1
module_me/src/main/res/layout/module_me_dialog_invite_share.xml

@@ -211,7 +211,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="甜咖直播"
+                    android:text="寻星直播"
                     android:textColor="@color/white"
                     android:textSize="20sp"
                     android:textStyle="bold" />

+ 1 - 1
module_me/src/main/res/layout/module_me_item_enter.xml

@@ -69,7 +69,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
-                        android:text="甜咖直播进入房间"
+                        android:text="寻星直播进入房间"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_12" />
                 </RelativeLayout>

+ 1 - 1
module_me/src/main/res/layout/module_me_item_user_enter.xml

@@ -69,7 +69,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
-                        android:text="甜咖直播进入房间"
+                        android:text="寻星直播进入房间"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_12" />
                 </RelativeLayout>

+ 1 - 1
module_me/src/main/res/values/strings.xml

@@ -73,7 +73,7 @@
 	<string name="setting_clear_cache">清除缓存</string>
 	<string name="setting_teenagers">青少年模式</string>
 	<string name="setting_check_update">检查更新</string>
-	<string name="setting_about_us">关于甜咖直播</string>
+	<string name="setting_about_us">关于寻星直播</string>
 	<string name="setting_about_bind_phone_title">绑定手机号</string>
 	<string name="setting_about_update_phone_title">绑定手机号(1/2)</string>
 	<string name="setting_about_update_phone_title_2">更换手机号(2/2)</string>

+ 1 - 1
module_message/src/main/java/com/mita/module_message/view/chat/ChatActivity.kt

@@ -428,7 +428,7 @@ class ChatActivity : BaseActivity<ChatVm>(), ChatBottomView.OnClickIconListener,
 
     private fun setTitle() {
         if (viewModel.user?.userId == 999L) {
-            tvName.text = "甜咖直播"
+            tvName.text = "寻星直播"
         } else {
             tvName.text = (viewModel.user?.nickName)
         }

BIN
module_message/src/main/res/drawable-xxhdpi/icon_tab_indicator.png