Skip to content

Commit 9dc2fdd

Browse files
git-xuhaogit-xuhao
committed
update v1.2.1
1.优化了 部分加载页面； 2.解决内存不足时，重新打开 fragment 出现叠加； 3.注释Bugly；
1 parent f299613 commit 9dc2fdd

File tree

13 files changed

+25
-108
lines changed

13 files changed

+25
-108
lines changed

‎app/build.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android {
2020
applicationId "com.hazz.kotlinmvp"
2121
minSdkVersion rootProject.ext.android.minSdkVersion
2222
targetSdkVersion rootProject.ext.android.targetSdkVersion
23-
versionCode 3
24-
versionName "1.2"
23+
versionCode 4
24+
versionName "1.2.1"
2525
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2626
javaCompileOptions {
2727
annotationProcessorOptions {
@@ -76,10 +76,6 @@ android {
7676
}
7777
}
7878

79-
//获取时间的方法
80-
def createDate() {
81-
return new Date().format("MMdd_HHmm", TimeZone.getTimeZone("GMT+8"))
82-
}
8379

8480
dependencies {
8581
implementation fileTree(include: ['*.jar'], dir: 'libs')

‎app/src/main/java/com/hazz/kotlinmvp/MyApplication.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ class MyApplication : Application(){
7272
return BuildConfig.DEBUG
7373
}
7474
})
75-
//测试阶段建议设置成true，发布时设置为false。
76-
CrashReport.initCrashReport(applicationContext, Constants.BUGLY_APPID, false)
7775
}
7876

7977

‎app/src/main/java/com/hazz/kotlinmvp/mvp/presenter/CategoryDetailPresenter.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,16 @@ class CategoryDetailPresenter:BasePresenter<CategoryDetailContract.View>(),Categ
2121
*/
2222
override fun getCategoryDetailList(id: Long) {
2323
checkViewAttached()
24-
mRootView?.showLoading()
2524
val disposable= categoryDetailModel.getCategoryDetailList(id)
2625
.subscribe({
2726
issue ->
2827
mRootView?.apply {
29-
dismissLoading()
3028
nextPageUrl = issue.nextPageUrl
3129
setCateDetailList(issue.itemList)
3230
}
3331
},{
3432
throwable ->
3533
mRootView?.apply {
36-
dismissLoading()
3734
showError(throwable.toString())
3835
}
3936
})

‎app/src/main/java/com/hazz/kotlinmvp/mvp/presenter/CategoryPresenter.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class CategoryPresenter : BasePresenter<CategoryContract.View>(), CategoryContra
2929
}
3030
}, { t ->
3131
mRootView?.apply {
32-
dismissLoading()
3332
//处理异常
3433
showError(ExceptionHandle.handleException(t),ExceptionHandle.errorCode)
3534
}

‎app/src/main/java/com/hazz/kotlinmvp/mvp/presenter/FollowPresenter.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class FollowPresenter : BasePresenter<FollowContract.View>(), FollowContract.Pre
3232
}
3333
}, { throwable ->
3434
mRootView?.apply {
35-
dismissLoading()
3635
//处理异常
3736
showError(ExceptionHandle.handleException(throwable),ExceptionHandle.errorCode)
3837
}

‎app/src/main/java/com/hazz/kotlinmvp/mvp/presenter/HotTabPresenter.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class HotTabPresenter:BasePresenter<HotTabContract.View>(),HotTabContract.Presen
1616

1717
override fun getTabInfo() {
1818
checkViewAttached()
19+
mRootView?.showLoading()
1920
val disposable = hotTabModel.getTabInfo()
2021
.subscribe({
2122
tabInfo->

‎app/src/main/java/com/hazz/kotlinmvp/mvp/presenter/RankPresenter.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class RankPresenter : BasePresenter<RankContract.View>(), RankContract.Presenter
2828
}
2929
}, { throwable ->
3030
mRootView?.apply {
31-
dismissLoading()
3231
//处理异常
3332
showError(ExceptionHandle.handleException(throwable),ExceptionHandle.errorCode)
3433
}

‎app/src/main/java/com/hazz/kotlinmvp/ui/activity/CategoryDetailActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,11 @@ class CategoryDetailActivity : BaseActivity(), CategoryDetailContract.View {
9191
}
9292

9393
override fun showLoading() {
94-
// multipleStatusView.showLoading()
9594

9695
}
9796

9897
override fun dismissLoading() {
99-
multipleStatusView.showContent()
98+
10099
}
101100

102101
override fun setCateDetailList(itemList: ArrayList<HomeBean.Issue.Item>) {

‎app/src/main/java/com/hazz/kotlinmvp/ui/activity/MainActivity.kt

Lines changed: 12 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -84,73 +84,26 @@ class MainActivity : BaseActivity() {
8484
private fun switchFragment(position: Int) {
8585
val transaction = supportFragmentManager.beginTransaction()
8686
hideFragments(transaction)
87-
// showToast(supportFragmentManager.fragments.size.toString())
87+
showToast(supportFragmentManager.fragments.size.toString())
8888
/*重复进入退出视频详情页会导致fragment不断增加*/
89-
// when (position) {
90-
// 0 //首页
91-
// -> if (mHomeFragment == null) {
92-
//
93-
// mHomeFragment = HomeFragment.getInstance(mTitles[position])
94-
// transaction.add(R.id.fl_container, mHomeFragment, "home")
95-
// } else {
96-
// transaction.show(mHomeFragment)
97-
// }
98-
// 1 //发现
99-
// -> if (mDiscoveryFragment == null) {
100-
// mDiscoveryFragment = DiscoveryFragment.getInstance(mTitles[position])
101-
// transaction.add(R.id.fl_container, mDiscoveryFragment, "discovery")
102-
// } else {
103-
// transaction.show(mDiscoveryFragment)
104-
// }
105-
// 2 //热门
106-
// -> if ( mHotFragment == null) {
107-
// mHotFragment = HotFragment.getInstance(mTitles[position])
108-
// transaction.add(R.id.fl_container, mHotFragment, "hot")
109-
// }
110-
// else {
111-
// transaction.show(mHotFragment)
112-
// }
113-
//
114-
// 3 //我的
115-
// -> if (mMineFragment == null) {
116-
// mMineFragment = MineFragment.getInstance(mTitles[position])
117-
// transaction.add(R.id.fl_container, mMineFragment, "mine")
118-
// } else {
119-
// transaction.show(mMineFragment)
120-
// }
121-
// else -> {
122-
//
123-
// }
124-
// }
12589
when (position) {
12690
0 //首页
12791
-> if (mHomeFragment == null) {
128-
var cacheMHomeFragment = supportFragmentManager.findFragmentByTag("home")
129-
if(cacheMHomeFragment != null){
130-
transaction.remove(cacheMHomeFragment)
131-
}
92+
13293
mHomeFragment = HomeFragment.getInstance(mTitles[position])
13394
transaction.add(R.id.fl_container, mHomeFragment, "home")
13495
} else {
13596
transaction.show(mHomeFragment)
13697
}
13798
1 //发现
13899
-> if (mDiscoveryFragment == null) {
139-
var cacheMDiscoveryFragment = supportFragmentManager.findFragmentByTag("discovery")
140-
if(cacheMDiscoveryFragment != null){
141-
transaction.remove(cacheMDiscoveryFragment)
142-
}
143100
mDiscoveryFragment = DiscoveryFragment.getInstance(mTitles[position])
144101
transaction.add(R.id.fl_container, mDiscoveryFragment, "discovery")
145102
} else {
146103
transaction.show(mDiscoveryFragment)
147104
}
148105
2 //热门
149106
-> if ( mHotFragment == null) {
150-
var cacheMHotFragment = supportFragmentManager.findFragmentByTag("hot")
151-
if(cacheMHotFragment != null){
152-
transaction.remove(cacheMHotFragment)
153-
}
154107
mHotFragment = HotFragment.getInstance(mTitles[position])
155108
transaction.add(R.id.fl_container, mHotFragment, "hot")
156109
}
@@ -160,10 +113,6 @@ class MainActivity : BaseActivity() {
160113

161114
3 //我的
162115
-> if (mMineFragment == null) {
163-
var cacheMMineFragment = supportFragmentManager.findFragmentByTag("mine")
164-
if(cacheMMineFragment != null){
165-
transaction.remove(cacheMMineFragment)
166-
}
167116
mMineFragment = MineFragment.getInstance(mTitles[position])
168117
transaction.add(R.id.fl_container, mMineFragment, "mine")
169118
} else {
@@ -173,6 +122,7 @@ class MainActivity : BaseActivity() {
173122

174123
}
175124
}
125+
176126
mIndex = position
177127
tab_layout.currentTab = mIndex
178128
transaction.commitAllowingStateLoss()
@@ -184,54 +134,30 @@ class MainActivity : BaseActivity() {
184134
* @param transaction transaction
185135
*/
186136
private fun hideFragments(transaction: FragmentTransaction) {
187-
/*mHomeFragment 丢失问题应该用全局查找替代*/
188-
// if (null != mHomeFragment) {
189-
// transaction.hide(mHomeFragment)
190-
// }
191-
// if (null != mDiscoveryFragment) {
192-
// transaction.hide(mDiscoveryFragment)
193-
// }
194-
// if (null != mHotFragment) {
195-
// transaction.hide(mHotFragment)
196-
// }
197-
// if (null != mMineFragment) {
198-
// transaction.hide(mMineFragment)
199-
// }
200-
var cacheMHomeFragment = supportFragmentManager.findFragmentByTag("home")
201-
202-
var cacheMDiscoveryFragment = supportFragmentManager.findFragmentByTag("discovery")
203-
var cacheMMineFragment = supportFragmentManager.findFragmentByTag("hot")
204-
var cacheMHotFragment = supportFragmentManager.findFragmentByTag("mine")
205-
if (null != cacheMHomeFragment) {
206-
transaction.hide(cacheMHomeFragment)
137+
if (null != mHomeFragment) {
138+
transaction.hide(mHomeFragment)
207139
}
208-
if (null != cacheMDiscoveryFragment) {
209-
transaction.hide(cacheMDiscoveryFragment)
140+
if (null != mDiscoveryFragment) {
141+
transaction.hide(mDiscoveryFragment)
210142
}
211-
if (null != cacheMMineFragment) {
212-
transaction.hide(cacheMMineFragment)
143+
if (null != mHotFragment) {
144+
transaction.hide(mHotFragment)
213145
}
214-
if (null != cacheMHotFragment) {
215-
transaction.hide(cacheMHotFragment)
146+
if (null != mMineFragment) {
147+
transaction.hide(mMineFragment)
216148
}
217149

218-
219150
}
220151

221152

222153
override fun onSaveInstanceState(outState: Bundle) {
223154
// showToast("onSaveInstanceState->"+mIndex)
224-
super.onSaveInstanceState(outState)
155+
// super.onSaveInstanceState(outState)
225156
//记录fragment的位置,防止崩溃 activity被系统回收时，fragment错乱
226157
if (tab_layout != null) {
227158
outState.putInt("currTabIndex", mIndex)
228159
}
229160
}
230-
override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
231-
// showToast("onRestoreInstanceState->"+mIndex)
232-
// switchFragment(savedInstanceState!!.getInt( mIndex.toString() ));
233-
// super.onRestoreInstanceState(savedInstanceState)
234-
}
235161

236162
override fun initView() {
237163

‎app/src/main/java/com/hazz/kotlinmvp/ui/fragment/DiscoveryFragment.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import kotlinx.android.synthetic.main.fragment_hot.*
1313
* Created by xuhao on 2017/12/7.
1414
* desc: 发现(和热门首页同样的布局）
1515
*/
16-
class DiscoveryFragment:BaseFragment(){
16+
class DiscoveryFragment : BaseFragment() {
1717

1818
private val tabList = ArrayList<String>()
1919

@@ -49,13 +49,11 @@ class DiscoveryFragment:BaseFragment(){
4949
/**
5050
* getSupportFragmentManager() 替换为getChildFragmentManager()
5151
*/
52-
mViewPager.adapter = BaseFragmentAdapter(childFragmentManager,fragments,tabList)
52+
mViewPager.adapter = BaseFragmentAdapter(childFragmentManager, fragments, tabList)
5353
mTabLayout.setupWithViewPager(mViewPager)
5454
TabLayoutHelper.setUpIndicatorWidth(mTabLayout)
5555

5656

57-
58-
5957
}
6058

6159
override fun lazyLoad() {

0 commit comments

Comments
 (0)