Commit f429a202 by yichen

1、更改build.gradle

parent 497bd738
......@@ -13,8 +13,8 @@ def releaseTime() {
android {
compileSdkVersion config.compileSdkVersion
defaultConfig {
// applicationId "com.qiuju.live.app"
applicationId "com.qiuju.app"
// applicationId "com.hslive.app"
minSdkVersion config.minSdkVersion
targetSdkVersion config.targetSdkVersion
versionCode config.versionCode
......
......@@ -61,7 +61,7 @@
<!-- android:authorities="com.hslive.app.FileProvider"-->
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.qiuju.app.FileProvider"
android:authorities="${applicationId}.FileProvider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
......
......@@ -46,6 +46,13 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
private lateinit var haveAvatar: ImageView
private var oldSelected = 0
private var mFragment: ArrayList<Fragment> =
if (VersionControl.isXiaomi()) {
arrayListOf(
MatchFragment.newInstance(),
MainFragment.newInstance(),
NewMineFragment.newInstance()
)
} else {
if (VersionControl.showRedList()) {
arrayListOf(
MatchFragment.newInstance(),
......@@ -62,6 +69,7 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
NewMineFragment.newInstance()
)
}
}
override val layoutId: Int
......@@ -128,13 +136,18 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
fun toMineFragment() {
if (UserHelper.isLogin()) {
if (VersionControl.showRedList()){
if (VersionControl.isXiaomi()) {
mTabLayout.currentTab = 2
mViewPager.currentItem = 2
} else {
if (VersionControl.showRedList()) {
mTabLayout.currentTab = 4
mViewPager.currentItem = 4
}else{
} else {
mTabLayout.currentTab = 3
mViewPager.currentItem = 3
}
}
} else {
......@@ -159,6 +172,13 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
mViewPager.offscreenPageLimit = mFragment.size
mViewPager.adapter = adapter
val mTitles =
if (VersionControl.isXiaomi()) {
arrayOf(
getString(R.string.string_main_schedule),
getString(R.string.string_main_home),
getString(R.string.string_main_mine)
)
} else {
if (VersionControl.showRedList()) {
arrayOf(
getString(R.string.string_main_schedule),
......@@ -175,9 +195,17 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
getString(R.string.string_main_mine)
)
}
}
val mIconUnSelectIds =
if (VersionControl.isXiaomi()) {
intArrayOf(
R.mipmap.icon_main_match_nomal,
R.mipmap.icon_main_live_normal,
R.mipmap.icon_main_mine_normal
)
} else {
if (VersionControl.showRedList()) {
intArrayOf(
R.mipmap.icon_main_match_nomal,
......@@ -194,9 +222,17 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
R.mipmap.icon_main_mine_normal
)
}
}
val mIconSelectIds =
if (VersionControl.isXiaomi()) {
intArrayOf(
R.mipmap.icon_main_match_select,
R.mipmap.icon_main_live_selected,
R.mipmap.icon_main_mine_selected
)
} else {
if (VersionControl.showRedList()) {
intArrayOf(
R.mipmap.icon_main_match_select,
......@@ -213,6 +249,8 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
R.mipmap.icon_main_mine_selected
)
}
}
val mTabEntities = ArrayList<CustomTabEntity>()
for (i in mTitles.indices) {
......@@ -222,7 +260,11 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
mTabLayout.setOnTabSelectListener(object : OnTabSelectListener {
override fun onTabSelect(position: Int) {
val userPosition = if (VersionControl.showRedList()) 4 else 3
val userPosition = when {
VersionControl.isXiaomi() -> 2
VersionControl.showRedList() -> 4
else -> 3
}
if (position == userPosition) {
if (SPUtil[Constants.USER_LOGIN, false] == true) {
oldSelected = position
......@@ -239,8 +281,16 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
override fun onTabReselect(position: Int) {}
})
if (VersionControl.isXiaomi()){
mTabLayout.currentTab = 0
mViewPager.currentItem = 0
}else{
mTabLayout.currentTab = 2
mViewPager.currentItem = 2
}
}
......@@ -282,10 +332,16 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 1)
fun onEventRefreshUser(event: UserExitEvent) {
if (VersionControl.isXiaomi()){
mViewPager.currentItem = 0
mTabLayout.currentTab = 0
}else{
mViewPager.currentItem = 2
mTabLayout.currentTab = 2
}
}
/**
* 再按一次退出程序
......
......@@ -194,7 +194,8 @@ class MatchContentFragment : RefreshVP2Fragment<MatchContentPresenter>(),
contentAdapter.data.forEachIndexed { index, matchInfoEntity ->
if (matchInfoEntity.id == id) {
matchInfoEntity.subscribe = status
contentAdapter.notifyItemChanged(index)
val realPosition = if (currentPosition == 2) index.plus(1) else index
contentAdapter.notifyItemChanged(realPosition)
}
}
}
......
......@@ -28,9 +28,13 @@ object VersionControl {
return SPUtil[Constants.SHOW_LIVE_CONFIG, false] as Boolean
}
fun isXiaomi(): Boolean {
return BuildConfig.FLAVOR == XIAOMI
}
fun saveConfig(showConfig: Boolean) {
when (BuildConfig.FLAVOR) {
BAIDU, VIVO, HUAWEI, OPPO, XIAOMI, OFFICIAL_1001, OFFICIAL_1002, OFFICIAL_1003 -> SPUtil.put(
BAIDU, VIVO, HUAWEI, OPPO, OFFICIAL_1001, OFFICIAL_1002, OFFICIAL_1003 -> SPUtil.put(
Constants.SHOW_LIVE_CONFIG,
showConfig
)
......@@ -39,11 +43,11 @@ object VersionControl {
}
fun showIndex(): Boolean {
return isShowLive()
return isShowLive() && !isXiaomi()
}
fun showRedList(): Boolean {
return isShowLive()
return isShowLive() && !isXiaomi()
}
fun getCurrentFlavor(): String {
......
{
"version": 1,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.qiuju.live.app",
"variantName": "qj_xiaomi_01Release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"properties": [],
"versionCode": 1,
"versionName": "1",
"enabled": true,
"outputFile": "qjLive_v1.0.0_release_qj_xiaomi_01_20220614.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