Skip to content

Commit 3c67959

Browse files
CcixyjCcixyj
committed
Merge branch 'dev'
2 parents b98440e + aff266b commit 3c67959

File tree

26 files changed

+275
-115
lines changed

26 files changed

+275
-115
lines changed

‎app/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def VersionName() {
110110
def cmd = ''' git log --tags --simplify-by-decoration --pretty="format:%d" '''
111111
def tags = cmd.execute().text.readLines()
112112
logger.quiet(cmd + " >>>> tags = " + tags)
113-
def verName = tags.first().trim().find(Pattern.compile("v[0-9.a-z]+")).substring(1).trim()
113+
def verName = tags.first().trim().find(Pattern.compile("v[0-9a-z.-]+")).substring(1).trim()
114114
logger.quiet(cmd + " >>>> verName = " + verName)
115115
cmd = 'git rev-list --all --count'
116116
def code = cmd.execute().text.trim().toInteger()
@@ -142,6 +142,8 @@ dependencies {
142142
//leak
143143
debugImplementation "com.squareup.leakcanary:leakcanary-android:${versions.leakcanary}"
144144
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${versions.leakcanary}"
145+
// Optional, if you use support library fragments:
146+
debugImplementation "com.squareup.leakcanary:leakcanary-support-fragment:${versions.leakcanary}"
145147

146148

147149
implementation "com.android.support:multidex:1.0.3" // 多dex配置

‎app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@
1919
android:icon="@mipmap/ic_launcher"
2020
android:roundIcon="@mipmap/ic_launcher"
2121
android:supportsRtl="true"
22+
android:resizeableActivity="true"
2223
android:theme="@style/AppTheme.NoActionBar">
2324

25+
<meta-data
26+
android:name="android.max_aspect"
27+
android:value="2.2" />
28+
2429
<!-- 友盟key -->
2530
<meta-data
2631
android:name="UMENG_APPKEY"

‎app/src/main/java/me/jbusdriver/ui/activity/MainActivity.kt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ import com.afollestad.materialdialogs.MaterialDialog
2020
import io.reactivex.rxkotlin.addTo
2121
import io.reactivex.rxkotlin.subscribeBy
2222
import io.reactivex.schedulers.Schedulers
23-
import me.jbusdriver.BuildConfig
24-
import me.jbusdriver.R
2523
import kotlinx.android.synthetic.main.nav_header_main.view.*
24+
import me.jbusdriver.R
2625
import me.jbusdriver.base.*
2726
import me.jbusdriver.base.common.AppBaseActivity
2827
import me.jbusdriver.common.JBus
2928
import me.jbusdriver.mvp.MainContract
3029
import me.jbusdriver.mvp.bean.*
3130
import me.jbusdriver.mvp.presenter.MainPresenterImpl
32-
import me.jbusdriver.ui.data.AppConfiguration
3331
import java.util.concurrent.TimeUnit
3432

3533
class MainActivity : AppBaseActivity<MainContract.MainPresenter, MainContract.MainView>(), NavigationView.OnNavigationItemSelectedListener, MainContract.MainView {
@@ -165,11 +163,7 @@ class MainActivity : AppBaseActivity<MainContract.MainPresenter, MainContract.Ma
165163
if (drawer.isDrawerOpen(GravityCompat.START)) {
166164
drawer.closeDrawer(GravityCompat.START)
167165
} else {
168-
if (!BuildConfig.DEBUG) {
169-
moveTaskToBack(false)
170-
} else {
171-
super.onBackPressed()
172-
}
166+
super.onBackPressed()
173167
}
174168
}
175169

‎app/src/main/java/me/jbusdriver/ui/activity/MovieDetailActivity.kt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.content.Context
44
import android.content.Intent
55
import android.graphics.Paint
66
import android.os.Bundle
7+
import android.support.design.widget.AppBarLayout
78
import android.support.design.widget.FloatingActionButton
89
import android.support.v4.content.res.ResourcesCompat
910
import android.support.v7.widget.Toolbar
@@ -18,12 +19,9 @@ import kotlinx.android.synthetic.main.activity_movie_detail.*
1819
import kotlinx.android.synthetic.main.content_movie_detail.*
1920
import kotlinx.android.synthetic.main.layout_load_magnet.view.*
2021
import me.jbusdriver.R
21-
import me.jbusdriver.base.GlideApp
22+
import me.jbusdriver.base.*
2223
import me.jbusdriver.base.common.AppBaseActivity
2324
import me.jbusdriver.base.common.C
24-
import me.jbusdriver.base.inflate
25-
import me.jbusdriver.base.toast
26-
import me.jbusdriver.base.urlPath
2725
import me.jbusdriver.common.toGlideNoHostUrl
2826
import me.jbusdriver.mvp.MovieDetailContract
2927
import me.jbusdriver.mvp.bean.Movie
@@ -121,7 +119,10 @@ class MovieDetailActivity : AppBaseActivity<MovieDetailContract.MovieDetailPrese
121119

122120
}
123121

124-
app_bar.addOnOffsetChangedListener { _, offset -> sr_refresh.isEnabled = Math.abs(offset) <= 1 }
122+
app_bar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { _, offset ->
123+
KLog.d("offset : $offset")
124+
sr_refresh.isEnabled = offset >= 0
125+
})
125126

126127

127128
ll_movie_detail.addView(headHolder.view)

‎app/src/main/java/me/jbusdriver/ui/activity/SplashActivity.kt‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ class SplashActivity : BaseActivity() {
8686
arrayMapof<String, String>().apply {
8787
val xyzLoader = r.getAsJsonObject("xyzLoader") ?: JsonObject()
8888
JAVBusService.defaultXyzUrl = xyzLoader.get("url")?.asString?.removeSuffix("/").orEmpty()
89-
JAVBusService.xyzHostDomains.addAll(xyzLoader.getAsJsonArray("legacyHost")?.map { it.asString } ?: emptyList())
89+
JAVBusService.xyzHostDomains.addAll(xyzLoader.getAsJsonArray("legacyHost")?.map { it.asString }
90+
?: emptyList())
9091
val availableUrls = r.get("backUp")?.asJsonArray
9192
//赋值一个默认的(随机)
9293
availableUrls?.let {
@@ -102,12 +103,14 @@ class SplashActivity : BaseActivity() {
102103
.flatMap {
103104
urls = it
104105
val mapFlow = GSON.fromJson<List<String>>(it[DataSourceType.CENSORED.key]
105-
?: "").map {
106-
Flowable.combineLatest(Flowable.just<String>(it),
107-
JAVBusService.INSTANCE.get(it).addUserCase(15).onErrorReturnItem(""),
106+
?: "").map { url ->
107+
Flowable.combineLatest(Flowable.just<String>(url),
108+
JAVBusService.INSTANCE.get(url).addUserCase(15).onErrorReturnItem("").doOnNext {
109+
KLog.d("prefetch urls : $url -> ${it?.take(30)} success")
110+
},
108111
BiFunction<String, String?, Pair<String, String>> { t1, t2 -> t1 to t2 })
109112
}
110-
Flowable.mergeDelayError(mapFlow).filter { it.second.isNotBlank() }.take(1)
113+
Flowable.mergeDelayError(mapFlow).parallel().filter { it.second.isNotBlank() }.sequential()
111114
}
112115
.firstOrError()
113116
.doOnError { CacheLoader.acache.remove(C.Cache.ANNOUNCE_URL) }

‎app/src/main/java/me/jbusdriver/ui/fragment/AbsMovieListFragment.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ abstract class AbsMovieListFragment : LinkableListFragment<Movie>() {
163163
it.textSize = 11f
164164
}
165165
it.setPadding(dp8, 0, dp8, 0)
166-
(it.background as? GradientDrawable)?.apply {
166+
it.background = GradientDrawable().apply {
167167
setColor(backColors.getOrNull(index % 3)
168168
?: backColors.first())
169-
if (holder.itemViewType == OrientationHelper.HORIZONTAL) {
170-
cornerRadius = dp8 * 1.5f
169+
cornerRadius = if (holder.itemViewType == OrientationHelper.HORIZONTAL) {
170+
dp8 * 1.5f
171171
} else {
172-
cornerRadius = dp8 * 2f
172+
dp8 * 2f
173173
}
174174
}
175175
it.layoutParams = genLp().apply {

‎app/src/main/java/me/jbusdriver/ui/fragment/LinkableListFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ abstract class LinkableListFragment<T> : AppBaseRecycleFragment<LinkListContract
130130
saveSp("layout_type", currentLayoutType.toString())
131131
recycleView.layoutManager = layoutManager
132132
recycleView.adapter = adapter
133-
recycleView.layoutManager.scrollToPosition(pos)
133+
recycleView.layoutManager?.scrollToPosition(pos)
134134
}
135135
/* R.id.action_recommend -> {
136136
HotRecommendActivity.start(this.viewContext)

‎base_lib/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies {
4848
//view widget
4949
api "com.afollestad.material-dialogs:core:${versions.material_dialogs_core}"
5050
api "com.github.CymChad:BaseRecyclerViewAdapterHelper:${versions.BaseRecyclerViewAdapterHelper}"
51-
api "com.gyf.barlibrary:barlibrary:${versions.immersionBar}"
51+
api "com.gyf.immersionbar:immersionbar:${versions.immersionBar}"
5252
api "com.github.chrisbanes:PhotoView:${versions.photo_view}"
5353

5454
//okhttp

‎base_lib/src/main/java/me/jbusdriver/base/cc/BaseApp.kt‎ renamed to ‎base_lib/src/main/java/me/jbusdriver/base/cc/debug/BaseApp.kt‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
package me.jbusdriver.base.cc
1+
package me.jbusdriver.base.cc.debug
22

33
import android.app.Application
44
import com.billy.cc.core.component.CC
55
import com.orhanobut.logger.AndroidLogAdapter
66
import com.orhanobut.logger.Logger
77
import com.orhanobut.logger.PrettyFormatStrategy
8+
import io.reactivex.plugins.RxJavaPlugins
89
import me.jbusdriver.base.JBusManager
10+
import me.jbusdriver.base.KLog
911

1012
/**
1113
* use only for debug app
1214
*/
13-
open class BaseApp : Application() {
15+
abstract class BaseApp : Application() {
1416

1517
override fun onCreate() {
1618
super.onCreate()
@@ -20,13 +22,16 @@ open class BaseApp : Application() {
2022
.methodCount(2) // (Optional) How many method line to show. Default 2
2123
.methodOffset(0) // (Optional) Hides internal method calls up to offset. Default 5
2224
// .logStrategy(customLog) // (Optional) Changes the log strategy to print out. Default LogCat
23-
.tag("old_driver") // (Optional) Global tag for every log. Default PRETTY_LOGGER
25+
.tag(getTag()) // (Optional) Global tag for every log. Default PRETTY_LOGGER
2426
.build()
2527

2628
Logger.addLogAdapter(object : AndroidLogAdapter(formatStrategy) {
2729
override fun isLoggable(priority: Int, tag: String?) = true
2830
})
2931

32+
RxJavaPlugins.setErrorHandler {
33+
KLog.w("error : ${it.message}")
34+
}
3035

3136
CC.enableVerboseLog(true)
3237
CC.enableDebug(true)
@@ -35,4 +40,6 @@ open class BaseApp : Application() {
3540
JBusManager.setContext(this)
3641
this.registerActivityLifecycleCallbacks(JBusManager)
3742
}
43+
44+
abstract fun getTag(): String
3845
}

‎base_lib/src/main/res/values/dimens.xml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<!--sw384-->
5+
<!--sw392-->
6+
<!--sw400-->
7+
<!--sw410-->
8+
<!--sw480-->
9+
<!--sw533-->
10+
<!--sw592-->
11+
<!--sw600-->
12+
<!--sw640-->
13+
<!--sw720-->
14+
<!--sw800-->
15+
<!--sw960-->
16+
17+
<!--material dip-->
18+
<dimen name="material_0dp">0dip</dimen>
19+
<dimen name="material_1dp">1dip</dimen>
20+
<dimen name="material_2dp">2dip</dimen>
21+
<dimen name="material_3dp">3dip</dimen>
22+
<dimen name="material_4dp">4dip</dimen>
23+
<dimen name="material_6dp">6dip</dimen>
24+
<dimen name="material_8dp">8dip</dimen>
25+
<dimen name="material_10dp">10dip</dimen>
26+
<dimen name="material_12dp">12dip</dimen>
27+
<dimen name="material_14dp">14dip</dimen>
28+
<dimen name="material_16dp">16dip</dimen>
29+
<dimen name="material_18dp">18dip</dimen>
30+
<dimen name="material_20dp">20dip</dimen>
31+
<dimen name="material_24dp">24dip</dimen>
32+
<dimen name="material_28dp">28dip</dimen>
33+
<dimen name="material_32dp">32dip</dimen>
34+
<dimen name="material_36dp">36dip</dimen>
35+
<dimen name="material_40dp">40dip</dimen>
36+
<dimen name="material_48dp">48dip</dimen>
37+
<dimen name="material_52dp">52dip</dimen>
38+
<dimen name="material_56dp">56dip</dimen>
39+
<dimen name="material_60dp">60dip</dimen>
40+
<dimen name="material_64dp">64dip</dimen>
41+
<dimen name="material_72dp">72dip</dimen>
42+
<dimen name="material_78dp">78dp</dimen>
43+
<dimen name="material_80dp">80dip</dimen>
44+
<dimen name="material_88dp">88dp</dimen>
45+
<dimen name="material_96dp">96dp</dimen>
46+
<dimen name="material_100dp">100dip</dimen>
47+
<dimen name="material_104dp">104dp</dimen>
48+
<dimen name="material_108dp">108dp</dimen>
49+
<dimen name="material_114dp">114dip</dimen>
50+
<dimen name="material_120dp">120dip</dimen>
51+
<dimen name="material_128dp">128dip</dimen>
52+
<dimen name="material_136dp">136dip</dimen>
53+
<dimen name="material_144dp">144dip</dimen>
54+
<dimen name="material_150dp">150dip</dimen>
55+
<dimen name="material_160dp">160dip</dimen>
56+
<dimen name="material_172dp">172dip</dimen>
57+
<dimen name="material_180dp">180dip</dimen>
58+
<dimen name="material_200dp">200dip</dimen>
59+
<dimen name="material_228dp">228dip</dimen>
60+
<dimen name="material_248dp">248dip</dimen>
61+
<dimen name="material_256dp">256dip</dimen>
62+
<dimen name="material_280dp">280dip</dimen>
63+
<dimen name="material_320dp">320dip</dimen>
64+
<dimen name="material_350dp">350dip</dimen>
65+
<dimen name="material_400dp">400dip</dimen>
66+
<dimen name="material_8sp">8sp</dimen>
67+
<dimen name="material_10sp">10sp</dimen>
68+
<dimen name="material_11sp">11sp</dimen>
69+
<dimen name="material_12sp">12sp</dimen>
70+
<dimen name="material_13sp">13sp</dimen>
71+
<dimen name="material_14sp">14sp</dimen>
72+
<dimen name="material_16sp">16sp</dimen>
73+
<dimen name="material_17sp">17sp</dimen>
74+
<dimen name="material_18sp">18sp</dimen>
75+
<dimen name="material_20sp">20sp</dimen>
76+
<dimen name="material_24sp">24sp</dimen>
77+
<dimen name="material_32sp">32sp</dimen>
78+
<dimen name="material_40sp">40sp</dimen>
79+
80+
</resources>

0 commit comments

Comments
 (0)