Commit f429a202 by yichen

1、更改build.gradle

parent 497bd738
...@@ -13,8 +13,8 @@ def releaseTime() { ...@@ -13,8 +13,8 @@ def releaseTime() {
android { android {
compileSdkVersion config.compileSdkVersion compileSdkVersion config.compileSdkVersion
defaultConfig { defaultConfig {
// applicationId "com.qiuju.live.app"
applicationId "com.qiuju.app" applicationId "com.qiuju.app"
// applicationId "com.hslive.app"
minSdkVersion config.minSdkVersion minSdkVersion config.minSdkVersion
targetSdkVersion config.targetSdkVersion targetSdkVersion config.targetSdkVersion
versionCode config.versionCode versionCode config.versionCode
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<!-- android:authorities="com.hslive.app.FileProvider"--> <!-- android:authorities="com.hslive.app.FileProvider"-->
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.qiuju.app.FileProvider" android:authorities="${applicationId}.FileProvider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true">
<meta-data <meta-data
......
...@@ -46,21 +46,29 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay { ...@@ -46,21 +46,29 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
private lateinit var haveAvatar: ImageView private lateinit var haveAvatar: ImageView
private var oldSelected = 0 private var oldSelected = 0
private var mFragment: ArrayList<Fragment> = private var mFragment: ArrayList<Fragment> =
if (VersionControl.showRedList()) { if (VersionControl.isXiaomi()) {
arrayListOf( arrayListOf(
MatchFragment.newInstance(), MatchFragment.newInstance(),
MainNewsFragment.newInstance(),
MainFragment.newInstance(), MainFragment.newInstance(),
MainHaveMaterialFragment.newInstance(),
NewMineFragment.newInstance() NewMineFragment.newInstance()
) )
} else { } else {
arrayListOf( if (VersionControl.showRedList()) {
MatchFragment.newInstance(), arrayListOf(
MainNewsFragment.newInstance(), MatchFragment.newInstance(),
MainFragment.newInstance(), MainNewsFragment.newInstance(),
NewMineFragment.newInstance() MainFragment.newInstance(),
) MainHaveMaterialFragment.newInstance(),
NewMineFragment.newInstance()
)
} else {
arrayListOf(
MatchFragment.newInstance(),
MainNewsFragment.newInstance(),
MainFragment.newInstance(),
NewMineFragment.newInstance()
)
}
} }
...@@ -128,12 +136,17 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay { ...@@ -128,12 +136,17 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
fun toMineFragment() { fun toMineFragment() {
if (UserHelper.isLogin()) { if (UserHelper.isLogin()) {
if (VersionControl.showRedList()){ if (VersionControl.isXiaomi()) {
mTabLayout.currentTab = 4 mTabLayout.currentTab = 2
mViewPager.currentItem = 4 mViewPager.currentItem = 2
}else{ } else {
mTabLayout.currentTab = 3 if (VersionControl.showRedList()) {
mViewPager.currentItem = 3 mTabLayout.currentTab = 4
mViewPager.currentItem = 4
} else {
mTabLayout.currentTab = 3
mViewPager.currentItem = 3
}
} }
...@@ -159,61 +172,86 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay { ...@@ -159,61 +172,86 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
mViewPager.offscreenPageLimit = mFragment.size mViewPager.offscreenPageLimit = mFragment.size
mViewPager.adapter = adapter mViewPager.adapter = adapter
val mTitles = val mTitles =
if (VersionControl.showRedList()) { if (VersionControl.isXiaomi()) {
arrayOf( arrayOf(
getString(R.string.string_main_schedule), getString(R.string.string_main_schedule),
getString(R.string.string_main_news),
getString(R.string.string_main_home), getString(R.string.string_main_home),
getString(R.string.string_main_have_material),
getString(R.string.string_main_mine) getString(R.string.string_main_mine)
) )
} else { } else {
arrayOf( if (VersionControl.showRedList()) {
getString(R.string.string_main_schedule), arrayOf(
getString(R.string.string_main_news), getString(R.string.string_main_schedule),
getString(R.string.string_main_home), getString(R.string.string_main_news),
getString(R.string.string_main_mine) getString(R.string.string_main_home),
) getString(R.string.string_main_have_material),
getString(R.string.string_main_mine)
)
} else {
arrayOf(
getString(R.string.string_main_schedule),
getString(R.string.string_main_news),
getString(R.string.string_main_home),
getString(R.string.string_main_mine)
)
}
} }
val mIconUnSelectIds = val mIconUnSelectIds =
if (VersionControl.showRedList()) { if (VersionControl.isXiaomi()) {
intArrayOf( intArrayOf(
R.mipmap.icon_main_match_nomal, R.mipmap.icon_main_match_nomal,
R.mipmap.icon_main_news_normal,
R.mipmap.icon_main_live_normal, R.mipmap.icon_main_live_normal,
R.mipmap.icon_main_follow_normal,
R.mipmap.icon_main_mine_normal R.mipmap.icon_main_mine_normal
) )
} else { } else {
intArrayOf( if (VersionControl.showRedList()) {
R.mipmap.icon_main_match_nomal, intArrayOf(
R.mipmap.icon_main_news_normal, R.mipmap.icon_main_match_nomal,
R.mipmap.icon_main_live_normal, R.mipmap.icon_main_news_normal,
R.mipmap.icon_main_mine_normal R.mipmap.icon_main_live_normal,
) R.mipmap.icon_main_follow_normal,
R.mipmap.icon_main_mine_normal
)
} else {
intArrayOf(
R.mipmap.icon_main_match_nomal,
R.mipmap.icon_main_news_normal,
R.mipmap.icon_main_live_normal,
R.mipmap.icon_main_mine_normal
)
}
} }
val mIconSelectIds = val mIconSelectIds =
if (VersionControl.showRedList()) { if (VersionControl.isXiaomi()) {
intArrayOf( intArrayOf(
R.mipmap.icon_main_match_select, R.mipmap.icon_main_match_select,
R.mipmap.icon_main_news_selected,
R.mipmap.icon_main_live_selected, R.mipmap.icon_main_live_selected,
R.mipmap.icon_main_follow_selected,
R.mipmap.icon_main_mine_selected R.mipmap.icon_main_mine_selected
) )
} else { } else {
intArrayOf( if (VersionControl.showRedList()) {
R.mipmap.icon_main_match_select, intArrayOf(
R.mipmap.icon_main_news_selected, R.mipmap.icon_main_match_select,
R.mipmap.icon_main_live_selected, R.mipmap.icon_main_news_selected,
R.mipmap.icon_main_mine_selected R.mipmap.icon_main_live_selected,
) R.mipmap.icon_main_follow_selected,
R.mipmap.icon_main_mine_selected
)
} else {
intArrayOf(
R.mipmap.icon_main_match_select,
R.mipmap.icon_main_news_selected,
R.mipmap.icon_main_live_selected,
R.mipmap.icon_main_mine_selected
)
}
} }
val mTabEntities = ArrayList<CustomTabEntity>() val mTabEntities = ArrayList<CustomTabEntity>()
for (i in mTitles.indices) { for (i in mTitles.indices) {
mTabEntities.add(TabEntityBean(mTitles[i], mIconSelectIds[i], mIconUnSelectIds[i])) mTabEntities.add(TabEntityBean(mTitles[i], mIconSelectIds[i], mIconUnSelectIds[i]))
...@@ -222,7 +260,11 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay { ...@@ -222,7 +260,11 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
mTabLayout.setOnTabSelectListener(object : OnTabSelectListener { mTabLayout.setOnTabSelectListener(object : OnTabSelectListener {
override fun onTabSelect(position: Int) { 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 (position == userPosition) {
if (SPUtil[Constants.USER_LOGIN, false] == true) { if (SPUtil[Constants.USER_LOGIN, false] == true) {
oldSelected = position oldSelected = position
...@@ -239,8 +281,16 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay { ...@@ -239,8 +281,16 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
override fun onTabReselect(position: Int) {} override fun onTabReselect(position: Int) {}
}) })
mTabLayout.currentTab = 2
mViewPager.currentItem = 2 if (VersionControl.isXiaomi()){
mTabLayout.currentTab = 0
mViewPager.currentItem = 0
}else{
mTabLayout.currentTab = 2
mViewPager.currentItem = 2
}
} }
...@@ -282,8 +332,14 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay { ...@@ -282,8 +332,14 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 1) @Subscribe(threadMode = ThreadMode.MAIN, sticky = true, priority = 1)
fun onEventRefreshUser(event: UserExitEvent) { fun onEventRefreshUser(event: UserExitEvent) {
mViewPager.currentItem = 2 if (VersionControl.isXiaomi()){
mTabLayout.currentTab = 2 mViewPager.currentItem = 0
mTabLayout.currentTab = 0
}else{
mViewPager.currentItem = 2
mTabLayout.currentTab = 2
}
} }
......
...@@ -194,7 +194,8 @@ class MatchContentFragment : RefreshVP2Fragment<MatchContentPresenter>(), ...@@ -194,7 +194,8 @@ class MatchContentFragment : RefreshVP2Fragment<MatchContentPresenter>(),
contentAdapter.data.forEachIndexed { index, matchInfoEntity -> contentAdapter.data.forEachIndexed { index, matchInfoEntity ->
if (matchInfoEntity.id == id) { if (matchInfoEntity.id == id) {
matchInfoEntity.subscribe = status 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 { ...@@ -28,9 +28,13 @@ object VersionControl {
return SPUtil[Constants.SHOW_LIVE_CONFIG, false] as Boolean return SPUtil[Constants.SHOW_LIVE_CONFIG, false] as Boolean
} }
fun isXiaomi(): Boolean {
return BuildConfig.FLAVOR == XIAOMI
}
fun saveConfig(showConfig: Boolean) { fun saveConfig(showConfig: Boolean) {
when (BuildConfig.FLAVOR) { 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, Constants.SHOW_LIVE_CONFIG,
showConfig showConfig
) )
...@@ -39,11 +43,11 @@ object VersionControl { ...@@ -39,11 +43,11 @@ object VersionControl {
} }
fun showIndex(): Boolean { fun showIndex(): Boolean {
return isShowLive() return isShowLive() && !isXiaomi()
} }
fun showRedList(): Boolean { fun showRedList(): Boolean {
return isShowLive() return isShowLive() && !isXiaomi()
} }
fun getCurrentFlavor(): String { 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