Skip to content

H
hadalive
Commit f1dfa9af by yichen
Options

1、增加4个母包

parent f429a202
Showing with 396 additions and 62 deletions
app/build.gradle
......@@ -59,6 +59,56 @@ android {
myAppNamePY : "${myAppNamePY}",
UMENG_CHANNEL_VALUE: "qj_02"]
}
qj_mubao {
def myAppName = "球聚体育"
def myAppNamePY = "qiujutiyu"
manifestPlaceholders = [
myAppName : "${myAppName}",
myAppNamePY : "${myAppNamePY}",
API_CHANNEL_ID : "0",
UMENG_CHANNEL_VALUE: "mubao"
]
}
qj_mubao1 {
def myAppName = "球聚体育"
def myAppNamePY = "qiujutiyu"
manifestPlaceholders = [
myAppName : "${myAppName}",
myAppNamePY : "${myAppNamePY}",
API_CHANNEL_ID : "0",
UMENG_CHANNEL_VALUE: "mubao1"
]
}
qj_mubao2 {
def myAppName = "球聚体育"
def myAppNamePY = "qiujutiyu"
manifestPlaceholders = [
myAppName : "${myAppName}",
myAppNamePY : "${myAppNamePY}",
API_CHANNEL_ID : "0",
UMENG_CHANNEL_VALUE: "mubao2"
]
}
qj_mubao3 {
def myAppName = "球聚体育"
def myAppNamePY = "qiujutiyu"
manifestPlaceholders = [
myAppName : "${myAppName}",
myAppNamePY : "${myAppNamePY}",
API_CHANNEL_ID : "0",
UMENG_CHANNEL_VALUE: "mubao3"
]
}
qj_mubao4 {
def myAppName = "球聚体育"
def myAppNamePY = "qiujutiyu"
manifestPlaceholders = [
myAppName : "${myAppName}",
myAppNamePY : "${myAppNamePY}",
API_CHANNEL_ID : "0",
UMENG_CHANNEL_VALUE: "mubao4"
]
}
qj_1001 {
def myAppName = "球聚体育"
def myAppNamePY = "qiujutiyu"
......@@ -120,6 +170,17 @@ android {
UMENG_CHANNEL_VALUE: "qj_xiaomi_01"
]
}
qj_yingyongbao {
def myAppName = "球聚体育"
def myAppNamePY = "qiujutiyu"
manifestPlaceholders = [
myAppName : "${myAppName}",
myAppNamePY : "${myAppNamePY}",
API_CHANNEL_ID : "6",
UMENG_CHANNEL_VALUE: "qj_yingyongbao"
]
}
qj_vivo_01 {
def myAppName = "球聚体育"
def myAppNamePY = "qiujutiyu"
......
app/src/main/java/com/hupu/tv/player/app/api/RetrofitClient.kt
......@@ -35,8 +35,8 @@ object RetrofitClient {
get() {
val builder = OkHttpClient.Builder() //设置超时
.connectTimeout(15, TimeUnit.SECONDS)
.readTimeout(20, TimeUnit.SECONDS)
.writeTimeout(20, TimeUnit.SECONDS) //错误重连
.readTimeout(15, TimeUnit.SECONDS)
.writeTimeout(15, TimeUnit.SECONDS) //错误重连
.retryOnConnectionFailure(false) //需要对请求参数进行处理的时候添加
// .addInterceptor(ParameterInterceptor())// 拦截器
.addInterceptor(loggingInterceptor)
......
app/src/main/java/com/hupu/tv/player/app/app/Constants.kt
......@@ -527,7 +527,7 @@ object Constants {
const val SUBSCRIBE_MATCH = "SUBSCRIBE_MATCH"
const val SUBSCRIBE_FOLLOW = "SUBSCRIBE_FOLLOW"
const val MATCH_POSITION = "MATCH_POSITION"
const val PUSH_SWITCH = "PUSH_SWITCH"
}
\ No newline at end of file
app/src/main/java/com/hupu/tv/player/app/ui/activity/LiveActivity.kt
......@@ -224,7 +224,7 @@ class LiveActivity : RefreshActivity<LiveActivityPresenter>(), LiveActivityConta
}
private fun initIm(userName: String) {
if (userName.isEmpty()){
if (userName.isEmpty()) {
initTabLayout(false)
return
}
......@@ -439,11 +439,21 @@ class LiveActivity : RefreshActivity<LiveActivityPresenter>(), LiveActivityConta
iv_follow.visibility = View.GONE
tv_follow.text = "已关注"
ll_follow.background = getDrawable(R.drawable.shape_followed_live)
if (mFragment[0] is LiveConversationFragment) {
val liveConversationFragment = mFragment[0] as? LiveConversationFragment
liveConversationFragment?.sendMessage("关注了直播间")
}
} else {
isFollow = false
iv_follow.visibility = View.VISIBLE
tv_follow.text = "关注"
ll_follow.background = getDrawable(R.drawable.shape_follow_live)
if (mFragment[0] is LiveConversationFragment) {
val liveConversationFragment = mFragment[0] as? LiveConversationFragment
liveConversationFragment?.sendMessage("取消关注了直播间")
}
}
EventBus.getDefault().post(FollowAnchorEvent())
......
app/src/main/java/com/hupu/tv/player/app/ui/activity/LoginActivity.kt
......@@ -20,15 +20,12 @@ import com.softgarden.baselibrary.utils.ToastUtil
import com.hupu.tv.player.app.R
import com.hupu.tv.player.app.app.Constants
import com.hupu.tv.player.app.base.RefreshActivity
import com.hupu.tv.player.app.event.MessageEvent
import com.hupu.tv.player.app.event.RegisterEvent
import com.hupu.tv.player.app.ui.contact.LoginActivityContact
import com.hupu.tv.player.app.ui.presenter.LoginActivityPresenter
import com.hupu.tv.player.app.utils.CommonUtils
import com.hupu.tv.player.app.utils.DialogUtils
import com.hupu.tv.player.app.utils.ProductFlavors
import com.hupu.tv.player.app.utils.VersionControl
import com.mirkowu.statusbarutil.StatusBarUtil
import com.quanmingxing.app.widget.widget.BiggerDotPasswordTransformationMethod
import com.softgarden.baselibrary.base.BaseActivity
import kotlinx.android.synthetic.main.activity_login.*
......@@ -157,7 +154,7 @@ class LoginActivity : RefreshActivity<LoginActivityPresenter>(), LoginActivityCo
DialogUtils.showLoginAgreement(
this@LoginActivity,
getString(R.string.string_user_agreement_title_private),
if (VersionControl.getCurrentFlavor() == VersionControl.XIAOMI){
if (VersionControl.getCurrentFlavor() == VersionControl.YINGYONGBAO){
getString(R.string.string_user_private_xiaomi)
}else{
getString(R.string.string_user_private)
......
app/src/main/java/com/hupu/tv/player/app/ui/activity/MainActivity.kt
......@@ -46,7 +46,7 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
private lateinit var haveAvatar: ImageView
private var oldSelected = 0
private var mFragment: ArrayList<Fragment> =
if (VersionControl.isXiaomi()) {
if (VersionControl.isYingYongBao()) {
arrayListOf(
MatchFragment.newInstance(),
MainFragment.newInstance(),
......@@ -136,7 +136,7 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
fun toMineFragment() {
if (UserHelper.isLogin()) {
if (VersionControl.isXiaomi()) {
if (VersionControl.isYingYongBao()) {
mTabLayout.currentTab = 2
mViewPager.currentItem = 2
} else {
......@@ -172,7 +172,7 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
mViewPager.offscreenPageLimit = mFragment.size
mViewPager.adapter = adapter
val mTitles =
if (VersionControl.isXiaomi()) {
if (VersionControl.isYingYongBao()) {
arrayOf(
getString(R.string.string_main_schedule),
getString(R.string.string_main_home),
......@@ -199,7 +199,7 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
val mIconUnSelectIds =
if (VersionControl.isXiaomi()) {
if (VersionControl.isYingYongBao()) {
intArrayOf(
R.mipmap.icon_main_match_nomal,
R.mipmap.icon_main_live_normal,
......@@ -226,7 +226,7 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
val mIconSelectIds =
if (VersionControl.isXiaomi()) {
if (VersionControl.isYingYongBao()) {
intArrayOf(
R.mipmap.icon_main_match_select,
R.mipmap.icon_main_live_selected,
......@@ -261,7 +261,7 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
mTabLayout.setOnTabSelectListener(object : OnTabSelectListener {
override fun onTabSelect(position: Int) {
val userPosition = when {
VersionControl.isXiaomi() -> 2
VersionControl.isYingYongBao() -> 2
VersionControl.showRedList() -> 4
else -> 3
}
......@@ -282,7 +282,7 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
override fun onTabReselect(position: Int) {}
})
if (VersionControl.isXiaomi()){
if (VersionControl.isYingYongBao()){
mTabLayout.currentTab = 0
mViewPager.currentItem = 0
}else{
......@@ -332,7 +332,7 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 1)
fun onEventRefreshUser(event: UserExitEvent) {
if (VersionControl.isXiaomi()){
if (VersionControl.isYingYongBao()){
mViewPager.currentItem = 0
mTabLayout.currentTab = 0
}else{
......
app/src/main/java/com/hupu/tv/player/app/ui/activity/RegisterActivity.kt
......@@ -85,7 +85,7 @@ class RegisterActivity : RefreshActivity<RegisterActivityPresenter>(),
DialogUtils.showLoginAgreement(
this@RegisterActivity,
getString(R.string.string_user_agreement_title_private),
if (VersionControl.getCurrentFlavor() == VersionControl.XIAOMI) {
if (VersionControl.getCurrentFlavor() == VersionControl.YINGYONGBAO) {
getString(R.string.string_user_private_xiaomi)
} else {
getString(R.string.string_user_private)
......
app/src/main/java/com/hupu/tv/player/app/ui/activity/ReportActivity.kt
......@@ -35,7 +35,7 @@ class ReportActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
setStatus()
initRecyclerView()
initAdapter()
tv_title_middle.text = "举报"
tv_title_middle.text = "投诉"
iv_left_icon.setOnClickListener {
finish()
}
......@@ -59,7 +59,7 @@ class ReportActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
tv_report.setOnClickListener {
if (currentResult.isEmpty()){
ToastUtil.s("请选择举报原因")
ToastUtil.s("请选择投诉原因")
return@setOnClickListener
}
......
app/src/main/java/com/hupu/tv/player/app/ui/activity/SettingActivity.kt
......@@ -53,6 +53,10 @@ class SettingActivity : RefreshActivity<SettingPresenter>(), SettingContact.Disp
switch_start_play.isChecked = SPUtil[Constants.SWITCH_START_PLAY, false] as Boolean
switch_start_small.isChecked = SPUtil[Constants.SWITCH_START_SMALL, false] as Boolean
setListener()
ll_report.onSingleClick {
startActivity(ReportActivity::class.java)
}
}
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 1)
......
app/src/main/java/com/hupu/tv/player/app/ui/activity/SplashActivity.kt
......@@ -44,6 +44,7 @@ class SplashActivity : RefreshActivity<SplashActivityPresenter>(), SplashActivit
get() = this
private fun requestPerMission() {
SPUtil.put(Constants.DEVICE_ID, DeviceUtils.getDeviceId(this@SplashActivity))
goToRequest()
}
......@@ -56,7 +57,7 @@ class SplashActivity : RefreshActivity<SplashActivityPresenter>(), SplashActivit
}
override fun initialize() {
SPUtil.put(Constants.DEVICE_ID, DeviceUtils.getDeviceId(this@SplashActivity))
if (BuildConfig.DEBUG) {
// showLogDialog()
......
app/src/main/java/com/hupu/tv/player/app/ui/activity/UserToFeedBackActivity.kt
......@@ -28,7 +28,7 @@ class UserToFeedBackActivity : RefreshActivity<UserToFeedBackPresenter>(), UserT
override fun initialize() {
setStatus()
tv_title_middle.text = "举报"
tv_title_middle.text = "投诉"
iv_left_icon.setOnClickListener {
finish()
}
......@@ -70,7 +70,7 @@ class UserToFeedBackActivity : RefreshActivity<UserToFeedBackPresenter>(), UserT
tv_feed.setOnClickListener {
if (et_detail.text.isNullOrEmpty()){
ToastUtil.s("请填写举报内容")
ToastUtil.s("请填写投诉内容")
return@setOnClickListener
}
......
app/src/main/java/com/hupu/tv/player/app/ui/fragment/ChatFragment.java
......@@ -189,7 +189,10 @@ public class ChatFragment extends CustomEaseChatFragment implements OnRecallMess
sendFakeMessage();
isSend = true;
}
}
public void sendMessage(String message){
chatLayout.sendTextMessage(message);
}
private void sendFakeMessage() {
......
app/src/main/java/com/hupu/tv/player/app/ui/fragment/LiveConversationFragment.kt
......@@ -21,6 +21,7 @@ import com.hupu.tv.player.app.ui.activity.UserToFeedBackActivity
import com.hupu.tv.player.app.ui.contact.LiveConversationFragmentContact
import com.hupu.tv.player.app.ui.presenter.LiveConversationFragmentPresenter
import com.hupu.tv.player.app.utils.DialogUtils
import com.hupu.tv.player.app.utils.VersionControl
import kotlinx.android.synthetic.main.fragment_live_conversation.*
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
......@@ -84,8 +85,17 @@ class LiveConversationFragment : RefreshVP2Fragment<LiveConversationFragmentPres
}
}
fun sendMessage(message:String){
chatFragment?.sendMessage(message)
}
private fun needLogin() {
ll_need_login.visibility = View.GONE
iv_gift.visibility = if (VersionControl.isYingYongBao()){
View.GONE
}else{
View.VISIBLE
}
if (SPUtil[Constants.USER_LOGIN, false] == false) {
ll_need_login.visibility = View.VISIBLE
ll_need_login.setOnClickListener {
......
app/src/main/java/com/hupu/tv/player/app/ui/fragment/NewMineFragment.kt
......@@ -62,9 +62,7 @@ class NewMineFragment : RefreshFragment<NewMineFragmentPresenter>(),
ll_level.onSingleClick {
startActivity(UserLevelActivity::class.java)
}
ll_report.onSingleClick {
startActivity(ReportActivity::class.java)
}
ll_follow.onSingleClick{
startActivity(FollowActivity::class.java)
......@@ -87,6 +85,10 @@ class NewMineFragment : RefreshFragment<NewMineFragmentPresenter>(),
ll_about.onSingleClick {
startActivity(AboutActivity::class.java)
}
switch_recommend.isChecked = SPUtil[Constants.PUSH_SWITCH, true] as Boolean
switch_recommend.setOnCheckedChangeListener { buttonView, isChecked ->
SPUtil.put(Constants.PUSH_SWITCH, isChecked)
}
}
......
app/src/main/java/com/hupu/tv/player/app/utils/DialogUtils.kt
......@@ -460,7 +460,7 @@ object DialogUtils {
val rlUserAgreement = v.findViewById<RelativeLayout>(R.id.rl_user_agreement)
val rlUserPrivate = v.findViewById<RelativeLayout>(R.id.rl_user_private)
val tvContentPrivate = v.findViewById<TextView>(R.id.tv_content_private)
tvContentPrivate.text = if (VersionControl.getCurrentFlavor() == VersionControl.XIAOMI){
tvContentPrivate.text = if (VersionControl.getCurrentFlavor() == VersionControl.YINGYONGBAO){
activity?.getString(R.string.string_user_private_xiaomi)
}else{
activity?.getString(R.string.string_user_private)
......@@ -540,7 +540,7 @@ object DialogUtils {
val tvCancel = v.findViewById<TextView>(R.id.tv_cancel)
val tvContentPrivate = v.findViewById<TextView>(R.id.tv_content_private)
val style = SpannableStringBuilder(activity?.getString(R.string.string_first_login))
tvContentPrivate.text = if (VersionControl.getCurrentFlavor() == VersionControl.XIAOMI){
tvContentPrivate.text = if (VersionControl.getCurrentFlavor() == VersionControl.YINGYONGBAO){
activity?.getString(R.string.string_user_private_xiaomi)
}else{
activity?.getString(R.string.string_user_private)
......
app/src/main/java/com/hupu/tv/player/app/utils/VersionControl.kt
......@@ -13,7 +13,7 @@ import com.softgarden.baselibrary.utils.SPUtil
object VersionControl {
private const val OFFICIAL_1 = "qj_01"
private const val OFFICIAL_2 = "qj_02"
private const val OFFICIAL_3 = "qj_yuyan_01"
private const val OFFICIAL_3 = "qj_03"
private const val OFFICIAL_1001 = "qj_1001"
private const val OFFICIAL_1002 = "qj_1002"
private const val OFFICIAL_1003 = "qj_1003"
......@@ -21,15 +21,15 @@ object VersionControl {
private const val VIVO = "qj_vivo_01"
private const val HUAWEI = "qj_huawei_01"
private const val OPPO = "qj_oppo_01"
const val XIAOMI = "qj_xiaomi_01"
const val YINGYONGBAO = "qj_yingyongbao"
fun isShowLive(): Boolean {
return SPUtil[Constants.SHOW_LIVE_CONFIG, false] as Boolean
}
fun isXiaomi(): Boolean {
return BuildConfig.FLAVOR == XIAOMI
fun isYingYongBao(): Boolean {
return BuildConfig.FLAVOR == YINGYONGBAO
}
fun saveConfig(showConfig: Boolean) {
......@@ -43,11 +43,11 @@ object VersionControl {
}
fun showIndex(): Boolean {
return isShowLive() && !isXiaomi()
return isShowLive() && !isYingYongBao()
}
fun showRedList(): Boolean {
return isShowLive() && !isXiaomi()
return isShowLive() && !isYingYongBao()
}
fun getCurrentFlavor(): String {
......
app/src/main/java/com/hupu/tv/player/app/widget/CustomWebView.kt 0 → 100644
package com.hupu.tv.player.app.widget
import android.content.Context
import android.util.AttributeSet
import android.view.View
import android.webkit.*
import android.widget.ProgressBar
import com.hupu.tv.player.app.utils.CommonUtils
import kotlinx.android.synthetic.main.activity_news_detail.*
/**
* @author by Dell
* @date on 2022/6/16
* @describe
*/
class CustomWebView : WebView {
var progress:ProgressBar?=null
constructor(context: Context?) : super(context)
constructor(context: Context?, attributeSet: AttributeSet?) : super(context, attributeSet)
constructor(context: Context?, attributeSet: AttributeSet?, defStyleAttr: Int) : super(
context,
attributeSet,
defStyleAttr
)
init {
initView()
}
fun setProgressBar(progressBar: ProgressBar){
this.progress = progressBar
}
fun customLoadUrl(url: String?) {
val webSettings = settings
//设置自适应屏幕，两者合用
webSettings?.useWideViewPort = true //将图片调整到适合webview的大小
webSettings?.loadWithOverviewMode = true // 缩放至屏幕的大小
loadUrl(url)
}
private fun initView() {
// mWebView.setBackgroundColor(ContextCompat.getColor(this, R.color.colorTheme)); // 设置背景色
val webSettings = settings
setBackgroundColor(0)
//如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
webSettings.javaScriptEnabled = true
//支持插件
webSettings?.pluginState = WebSettings.PluginState.ON
// //设置自适应屏幕，两者合用 这样会使加载文本时 文字变小
// webSettings.setUseWideViewPort(true); //将图片调整到适合webview的大小
// webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕的大小
webSettings?.setRenderPriority(WebSettings.RenderPriority.HIGH) //提高渲染的优先级
//缩放操作
webSettings?.setSupportZoom(true) //支持缩放，默认为true。是下面那个的前提。
webSettings?.builtInZoomControls = true //设置内置的缩放控件。若为false，则该WebView不可缩放
webSettings?.displayZoomControls = false //隐藏原生的缩放控件
//开启DomStorage缓存
webSettings?.domStorageEnabled = true
// //启用数据库
webSettings?.databaseEnabled = true
// //设置定位的数据库路径
// String dir = this.getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
// webSettings.setGeolocationDatabasePath(dir);
//其他细节操作
webSettings?.cacheMode = WebSettings.LOAD_NO_CACHE //不使用缓存
webSettings?.allowFileAccess = true //设置可以访问文件
webSettings?.javaScriptCanOpenWindowsAutomatically = true //支持通过JS打开新窗口
webSettings?.loadsImagesAutomatically = true //支持自动加载图片
webSettings?.defaultTextEncodingName = "utf-8" //设置编码格式
//支持内容重新布局
webSettings?.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
//这个是加载的地址是https的，一些资源文件使用的是http方法的，
// 从安卓4.4之后对webview安全机制有了加强，webview里面加载https url的时候，
// 如果里面需要加载http的资源或者重定向的时候，webview会block页面加载。需要设置MixedContentMode
webSettings?.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
webChromeClient = object : WebChromeClient() {
override fun onProgressChanged(view: WebView, newProgress: Int) {
if (newProgress >= 99) {
progress?.visibility = View.GONE
} else {
progress?.visibility = View.VISIBLE
progress?.progress = newProgress
}
}
}
webViewClient = object : WebViewClient() {
override fun onPageFinished(view: WebView, url: String) {
super.onPageFinished(view, url)
}
override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
return true
}
}
}
}
\ No newline at end of file
app/src/main/java/com/hupu/tv/player/app/widget/customIm/CustomEaseChatLayout.java
......@@ -921,7 +921,7 @@ public class CustomEaseChatLayout extends RelativeLayout implements ICustomChatL
// menuHelper.findItemVisible(R.id.action_chat_recall, false);
// menuHelper.findItem(R.id.action_chat_delete).setTitle(getContext().getString(R.string.action_delete));
menuHelper.findItem(R.id.action_ban_member).setTitle("举报");
menuHelper.findItem(R.id.action_ban_member).setTitle("投诉");
switch (type) {
case TXT:
// menuHelper.findItemVisible(R.id.action_chat_copy, true);
......
app/src/main/java/com/hupu/tv/player/app/widget/danmuku/CustomChatPrimaryMenu.java
......@@ -26,6 +26,7 @@ import androidx.appcompat.app.AppCompatActivity;
import com.blankj.utilcode.util.LogUtils;
import com.example.zhouwei.library.CustomPopWindow;
import com.hupu.tv.player.app.utils.VersionControl;
import com.hyphenate.easeui.modules.chat.EaseInputEditText;
import com.hyphenate.easeui.modules.chat.EaseInputMenuStyle;
import com.hyphenate.easeui.modules.chat.interfaces.EaseChatPrimaryMenuListener;
......@@ -126,6 +127,9 @@ public class CustomChatPrimaryMenu extends RelativeLayout implements IChatPrimar
} else {
buttonMore.setVisibility(VISIBLE);
}
if (VersionControl.INSTANCE.isYingYongBao()){
buttonMore.setVisibility(View.GONE);
}
buttonSend.setVisibility(VISIBLE);
}
......@@ -416,12 +420,18 @@ public class CustomChatPrimaryMenu extends RelativeLayout implements IChatPrimar
buttonPressToSpeak.setVisibility(GONE);
faceLayout.setVisibility(GONE);
buttonMore.setVisibility(VISIBLE);
if (VersionControl.INSTANCE.isYingYongBao()){
buttonMore.setVisibility(View.GONE);
}
}
}
private void showSendButton(CharSequence s) {
buttonMore.setVisibility(View.VISIBLE);
buttonSend.setVisibility(View.VISIBLE);
if (VersionControl.INSTANCE.isYingYongBao()){
buttonMore.setVisibility(View.GONE);
}
checkMenuType();
}
......
app/src/main/res/layout/activity_report.xml
......@@ -38,7 +38,7 @@
android:textColor="@color/black"
android:textSize="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_10"
android:text="举报详情（选填）"
android:text="投诉详情（选填）"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
......
app/src/main/res/layout/activity_setting.xml
......@@ -338,6 +338,44 @@
android:layout_marginStart="@dimen/dp_7"
android:src="@mipmap/icon_more" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/color_F5F6F7" />
<LinearLayout
android:id="@+id/ll_report"
style="@style/style_mine_list">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:text="投诉"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_15" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="查看更多"
android:textColor="@color/normal_text_3"
android:textSize="@dimen/dp_13"
android:visibility="gone" />
<ImageView
android:layout_width="@dimen/dp_8"
android:layout_height="@dimen/dp_13"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_7"
android:src="@mipmap/icon_more" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/activity_user_to_feedback.xml
......@@ -20,7 +20,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="举报类型"
android:text="投诉类型"
android:textColor="@color/black"
android:textSize="@dimen/dp_16"
android:textStyle="bold" />
......
app/src/main/res/layout/fragment_live_conversation.xml
......@@ -41,7 +41,7 @@
android:visibility="gone"
android:background="@drawable/shape_first_confirm"
android:layout_marginEnd="@dimen/dp_5"
android:text="举报"
android:text="投诉"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/dp_13"
......@@ -120,12 +120,13 @@
<ImageView
android:id="@+id/iv_gift"
android:layout_gravity="center_vertical"
android:layout_width="@dimen/dp_33"
android:layout_height="@dimen/dp_33"
android:src="@drawable/type_select_gift_btn"
android:button="@null"
android:visibility="visible" />
android:visibility="gone" />
<TextView
android:layout_weight="1"
......
app/src/main/res/layout/fragment_mine_main_new.xml
......@@ -174,7 +174,6 @@
<LinearLayout
android:paddingBottom="@dimen/dp_130"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
......@@ -280,20 +279,22 @@
android:src="@mipmap/icon_more" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/color_F5F6F7" />
<LinearLayout
android:id="@+id/ll_report"
android:id="@+id/ll_account_bind"
style="@style/style_mine_list">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@mipmap/icon_mine_report" />
android:src="@mipmap/icon_account_bind" />
<TextView
android:layout_width="0dp"
......@@ -301,7 +302,7 @@
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_11"
android:layout_weight="1"
android:text="投诉"
android:text="账号与绑定"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_15" />
......@@ -310,7 +311,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="查看更多"
android:textColor="@color/normal_text_3"
android:textColor="@color/mine_more_text"
android:textSize="@dimen/dp_13"
android:visibility="gone" />
......@@ -327,16 +328,15 @@
android:layout_height="1dp"
android:background="@color/color_F5F6F7" />
<LinearLayout
android:id="@+id/ll_account_bind"
android:id="@+id/ll_about"
style="@style/style_mine_list">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@mipmap/icon_account_bind" />
android:src="@mipmap/icon_about_me" />
<TextView
android:layout_width="0dp"
......@@ -344,7 +344,7 @@
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_11"
android:layout_weight="1"
android:text="账号与绑定"
android:text="关于我们"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_15" />
......@@ -353,7 +353,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="查看更多"
android:textColor="@color/mine_more_text"
android:textColor="@color/normal_text_3"
android:textSize="@dimen/dp_13"
android:visibility="gone" />
......@@ -364,21 +364,22 @@
android:layout_marginStart="@dimen/dp_7"
android:src="@mipmap/icon_more" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/color_F5F6F7" />
<LinearLayout
android:id="@+id/ll_about"
android:id="@+id/ll_swtich"
style="@style/style_mine_list">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="@color/black"
android:layout_width="20dp"
android:layout_height="@dimen/dp_16"
android:layout_gravity="center"
android:src="@mipmap/icon_about_me" />
android:src="@mipmap/icon_share"
tools:ignore="UseAppTint" />
<TextView
android:layout_width="0dp"
......@@ -386,9 +387,9 @@
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_11"
android:layout_weight="1"
android:text="关于我们"
android:text="个性化推荐"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_15" />
android:textSize="@dimen/sp_15" />
<TextView
android:layout_width="wrap_content"
......@@ -396,12 +397,13 @@
android:layout_gravity="center"
android:text="查看更多"
android:textColor="@color/normal_text_3"
android:textSize="@dimen/dp_13"
android:textSize="@dimen/sp_13"
android:visibility="gone" />
<ImageView
android:layout_width="@dimen/dp_8"
android:layout_height="@dimen/dp_13"
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/switch_recommend"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_7"
android:src="@mipmap/icon_more" />
......
app/src/main/res/values/strings.xml
......@@ -99,7 +99,7 @@
<string name="string_user_agreement_title">阅读并接受《用户协议》和《隐私协议》</string>
<string name="string_user_agreement_title_new">注册登录即代表您已同意《用户协议》和《隐私协议》</string>
<string name="string_user_feed_back">请再次简单描述您再使用中遇到的问题或者对我们产品的建议，您的每一条反馈都将成为我么们不断前进的动力</string>
<string name="string_user_report">请填写举报的详细原因</string>
<string name="string_user_report">请填写投诉的详细原因</string>
<string name="string_user_feed_back_contact">方便我们的工作人员尽快联系你</string>
<string name="string_user_agreement_title_user">用户协议</string>
<string name="string_user_agreement_title_private">隐私协议</string>
......
qj_01/release/output.json 0 → 100644
{
"version": 1,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.qiuju.app",
"variantName": "qj_01Release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"properties": [],
"versionCode": 1,
"versionName": "1",
"enabled": true,
"outputFile": "qjLive_v1.0.0_release_qj_01_20220619.apk"
}
]
}
\ No newline at end of file
qj_03/release/output.json 0 → 100644
{
"version": 1,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.qiuju.app",
"variantName": "qj_03Release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"properties": [],
"versionCode": 1,
"versionName": "1",
"enabled": true,
"outputFile": "qjLive_v1.0.0_release_qj_03_20220621.apk"
}
]
}
\ No newline at end of file
qj_huawei_01/release/output.json 0 → 100644
{
"version": 1,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.qiuju.app",
"variantName": "qj_huawei_01Release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"properties": [],
"versionCode": 1,
"versionName": "1",
"enabled": true,
"outputFile": "qjLive_v1.0.0_release_qj_huawei_01_20220619.apk"
}
]
}
\ No newline at end of file
qj_xiaomi_01/release/output.json
......@@ -4,7 +4,7 @@
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.qiuju.live.app",
"applicationId": "com.qiuju.app",
"variantName": "qj_xiaomi_01Release",
"elements": [
{
......@@ -14,7 +14,7 @@
"versionCode": 1,
"versionName": "1",
"enabled": true,
"outputFile": "qjLive_v1.0.0_release_qj_xiaomi_01_20220614.apk"
"outputFile": "qjLive_v1.0.0_release_qj_xiaomi_01_20220615.apk"
}
]
}
\ No newline at end of file
qj_yingyongbao/release/output.json 0 → 100644
{
"version": 1,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.qiuju.app",
"variantName": "qj_yingyongbaoRelease",
"elements": [
{
"type": "SINGLE",
"filters": [],
"properties": [],
"versionCode": 1,
"versionName": "1",
"enabled": true,
"outputFile": "qjLive_v1.0.0_release_qj_yingyongbao_20220621.apk"
}
]
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment