diff --git a/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt index a8fdee11e..2e51db652 100644 --- a/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt @@ -12,8 +12,6 @@ import com.chwl.app.UIHelper import com.chwl.app.base.BaseViewBindingActivity import com.chwl.app.common.widget.dialog.DialogManager.OkCancelDialogListener import com.chwl.app.databinding.ActivitySettingBinding -import com.chwl.app.decoration.view.MyDecorationActivity -import com.chwl.app.notify.GlobalNotifyManager import com.chwl.app.notify.RoomNotifyManager import com.chwl.app.ui.im.avtivity.BlackListManageActivity import com.chwl.app.ui.language.LanguageActivity @@ -35,13 +33,11 @@ import com.chwl.library.common.util.SPUtils import com.chwl.library.utils.ResUtil import com.chwl.library.utils.file.JXFileUtils import com.example.lib_utils.log.ILog -import com.google.gson.Gson import com.netease.nim.uikit.StatusBarUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import java.io.File -import kotlin.random.Random /** @@ -222,35 +218,5 @@ class SettingActivity : BaseViewBindingActivity(), View. // startActivity(Intent(this, LanguageActivity::class.java)) // MyDecorationActivity.start(this,0) - debugTemplate() - } - - var i = 0 - private fun debugTemplate() { - GlobalNotifyManager.queue.addLast("G#" + i) - notify?.queue?.addLast("R#" + i) - i++ - - val jsonImage = - "{\"template\":{\"zh-TW\":\"你好,我是{谁},在{这里}等你\"},\"textColor\":\"#EEEEEE\",\"fontSize\":12,\"skipType\":1,\"skipContent\":\"54\",\"contents\":[{\"key\":\"谁\",\"type\":\"TEXT\",\"text\":{\"zh-TW\":\"Name189\"},\"textColor\":\"#FFFF00\",\"skipType\":1,\"skipContent\":\"54\"},{\"key\":\"这里\",\"type\":\"TEXT\",\"text\":{\"zh-TW\":\"广州路口\"},\"textColor\":\"#00FF00\"}],\"resourceType\":\"IMAGE\",\"resourceContent\":\"https://image.hiyoo.fun/bg_zoo_notice.png\"}" - val jsonImage2 = - "{\"template\":{\"zh-TW\":\"你好,我是{谁},在{这里}等你\"},\"textColor\":\"#EEEEEE\",\"fontSize\":12,\"skipType\":1,\"skipContent\":\"54\",\"contents\":[{\"key\":\"谁\",\"type\":\"TEXT\",\"text\":{\"zh-TW\":\"Name189\"},\"textColor\":\"#FFFF00\",\"skipType\":1,\"skipContent\":\"54\"},{\"key\":\"这里\",\"type\":\"TEXT\",\"text\":{\"zh-TW\":\"广州路口\"},\"textColor\":\"#00FF00\"}],\"resourceType\":\"IMAGE\",\"resourceContent\":\"https://img2.baidu.com/it/u=861101866,1488660334&fm=253&fmt=auto&app=138&f=JPEG?w=650&h=244\"}" - val jsonSvga = - "{\"template\":{\"zh-TW\":\"S你好,我是{谁},在{这里}等你\"},\"textColor\":\"#EEEEEE\",\"fontSize\":24,\"skipType\":1,\"skipContent\":\"54\",\"contents\":[{\"key\":\"谁\",\"type\":\"TEXT\",\"text\":{\"zh-TW\":\"Name189\"},\"textColor\":\"#FFFF00\",\"skipType\":1,\"skipContent\":\"54\"},{\"key\":\"这里\",\"type\":\"TEXT\",\"text\":{\"zh-TW\":\"广州路口\"},\"textColor\":\"#00FF00\"}],\"resourceType\":\"SVGA\",\"resourceContent\":\"https://image.hiyoo.fun/fengkuangdongwuyuanjinchangpiaoping.svga\"}" - val json: String - var i: Int = Random.Default.nextInt() - i = 1 - json = if (i % 3 == 0) { - jsonImage - } else if (i % 3 == 1) { - jsonImage2 - } else { - jsonSvga - } - val data = Gson().fromJson( - json, - RoomTemplateNotifyMsgBean::class.java - ) - notify?.queue?.addLast(data) } } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java b/app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java index dff644799..70859ab40 100644 --- a/app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java +++ b/app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java @@ -13,7 +13,7 @@ import android.text.TextUtils; import com.chwl.app.avroom.activity.AVRoomActivity; import com.chwl.app.ui.im.RouterHandler; import com.chwl.app.ui.webview.CommonWebViewActivity; -import com.chwl.core.home.bean.IRouterData; +import com.chwl.core.bean.IRouterData; import com.chwl.library.utils.JavaUtil; /** diff --git a/core/src/main/java/com/chwl/core/bean/IRouterData.kt b/core/src/main/java/com/chwl/core/bean/IRouterData.kt index dd2970df1..07bf6ec2f 100644 --- a/core/src/main/java/com/chwl/core/bean/IRouterData.kt +++ b/core/src/main/java/com/chwl/core/bean/IRouterData.kt @@ -1,4 +1,4 @@ -package com.chwl.core.home.bean +package com.chwl.core.bean import java.io.Serializable diff --git a/core/src/main/java/com/chwl/core/home/bean/BannerInfo.java b/core/src/main/java/com/chwl/core/home/bean/BannerInfo.java index d514a9c0f..a9cd3f642 100644 --- a/core/src/main/java/com/chwl/core/home/bean/BannerInfo.java +++ b/core/src/main/java/com/chwl/core/home/bean/BannerInfo.java @@ -3,6 +3,8 @@ package com.chwl.core.home.bean; import android.os.Parcel; import android.os.Parcelable; +import com.chwl.core.bean.IRouterData; + import java.io.Serializable; import lombok.Data; diff --git a/core/src/main/java/com/chwl/core/im/custom/bean/TemplateMessage.kt b/core/src/main/java/com/chwl/core/im/custom/bean/TemplateMessage.kt index 360838454..4526bd041 100644 --- a/core/src/main/java/com/chwl/core/im/custom/bean/TemplateMessage.kt +++ b/core/src/main/java/com/chwl/core/im/custom/bean/TemplateMessage.kt @@ -2,7 +2,7 @@ package com.chwl.core.im.custom.bean import androidx.annotation.Keep import com.chwl.core.bean.I18N -import com.chwl.core.home.bean.IRouterData +import com.chwl.core.bean.IRouterData import com.example.lib_utils.StringUtils2 import java.io.Serializable import java.util.regex.Pattern diff --git a/core/src/main/java/com/chwl/core/room/bean/RoomIcon.kt b/core/src/main/java/com/chwl/core/room/bean/RoomIcon.kt index c6c6863bd..52d1eb0c4 100644 --- a/core/src/main/java/com/chwl/core/room/bean/RoomIcon.kt +++ b/core/src/main/java/com/chwl/core/room/bean/RoomIcon.kt @@ -1,7 +1,7 @@ package com.chwl.core.room.bean import androidx.annotation.Keep -import com.chwl.core.home.bean.IRouterData +import com.chwl.core.bean.IRouterData /** * Created by Max on 2024/2/20 11:49