Skip to content

Commit 041dfbe

Browse files
committed
修复收藏加载问题
1 parent eba3a25 commit 041dfbe

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@
7878
<activity
7979
android:name=".ui.activity.AccountActivity"
8080
android:label="@string/title_activity_account"
81-
android:theme="@style/AppTheme"></activity>
81+
android:theme="@style/AppTheme">
82+
</activity>
8283
</application>
8384

8485
</manifest>

app/src/main/kotlin/com/rayfantasy/icode/ui/activity/MainActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import android.support.v4.widget.DrawerLayout
1717
import android.support.v7.app.ActionBarDrawerToggle
1818
import android.view.MenuItem
1919
import android.view.View
20+
import android.widget.Toast
2021
import com.android.volley.NetworkResponse
2122
import com.android.volley.Request
2223
import com.android.volley.Response
@@ -183,7 +184,7 @@ class MainActivity : ActivityBase() {
183184
R.id.nav_home -> replaceFragment(mainFragment)
184185
R.id.nav_about -> replaceFragment(aboutFragment)
185186
//R.id.nav_edit -> startActivity(Intent(this@MainActivity, WriteCodeActivity::class.java))
186-
R.id.nav_favo -> replaceFragment(favoriteFragment)
187+
R.id.nav_favo -> if (PostUtil.user == null){Toast.makeText(this,"请登陆后再使用",Toast.LENGTH_SHORT).show()} else {replaceFragment(favoriteFragment)}
187188
R.id.nav_setting -> replaceFragment(settingFragment)
188189
R.id.nav_homepage -> OpenWeb()
189190
R.id.nav_update -> checkUpdate()

app/src/main/kotlin/com/rayfantasy/icode/ui/fragment/FavoriteFragment.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ class FavoriteFragment : FragmentBase() {
6565
view.favo_swipe.isRefreshing = false
6666
request = null
6767

68-
//if (it.isEmpty() ) {
68+
if (it.size == adapter.codeGoods.size ) {
6969
//如果结果为空,则表示没有更多内容了
7070
adapter.footerState = LoadMoreAdapter.FOOTER_STATE_NO_MORE
71-
//} else {
71+
} else {
7272
if (refresh) {
7373
adapter.codeGoods.clear()
7474
}
@@ -77,7 +77,8 @@ class FavoriteFragment : FragmentBase() {
7777
if (refresh) adapter.notifyDataSetChanged()
7878
else adapter.notifyDataSetChanged()
7979
cacheData(adapter.codeGoods)
80-
//}
80+
// adapter.footerState = LoadMoreAdapter.FOOTER_STATE_NO_MORE
81+
}
8182
onFailed { t, rc ->
8283
request = null
8384
if (isDetached || view == null) return@onFailed
@@ -110,3 +111,4 @@ class FavoriteFragment : FragmentBase() {
110111
.queryList()
111112

112113
}
114+

0 commit comments

Comments
 (0)