Skip to content

Commit 9cf7fe4

Browse files
BlankjBlankj
committed
see 02/01 log
1 parent b42df9f commit 9cf7fe4

File tree

64 files changed

+713
-734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+713
-734
lines changed

‎launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ import kotlinx.android.synthetic.main.activity_main.*
2222
*/
2323
class MainActivity : BaseDrawerActivity() {
2424

25-
override fun initData(bundle: Bundle?) {
26-
27-
}
25+
override fun initData(bundle: Bundle?) {}
2826

2927
override fun bindLayout(): Int {
3028
return R.layout.activity_main
@@ -53,17 +51,11 @@ class MainActivity : BaseDrawerActivity() {
5351
launcherMainSubUtilBtn.setOnClickListener {
5452
BusUtils.post<Any>("SubUtilActivity#start", this)
5553
}
56-
// getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
57-
5854
}
5955

60-
override fun doBusiness() {
56+
override fun doBusiness() {}
6157

62-
}
63-
64-
override fun onWidgetClick(view: View) {
65-
66-
}
58+
override fun onWidgetClick(view: View) {}
6759

6860
override fun onBackPressed() {
6961
ActivityUtils.startHomeActivity()

‎launcher/pkg/src/main/java/com/blankj/launcher/pkg/SplashActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ import android.view.View
55
import com.blankj.lib.base.BaseActivity
66

77
class SplashActivity : BaseActivity() {
8+
override fun isSwipeBack(): Boolean {
9+
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
10+
}
11+
812
override fun initData(bundle: Bundle?) {
913
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
1014
}

‎lib/base/src/main/java/com/blankj/lib/base/BaseActivity.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity
66
import android.view.LayoutInflater
77
import android.view.View
88
import com.blankj.utilcode.util.*
9+
import com.r0adkll.slidr.Slidr
910

1011
/**
1112
* ```
@@ -20,13 +21,19 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
2021
protected lateinit var mContentView: View
2122
protected lateinit var mActivity: Activity
2223

24+
abstract fun isSwipeBack(): Boolean
25+
2326
override fun onCreate(savedInstanceState: Bundle?) {
2427
mActivity = this
2528
super.onCreate(savedInstanceState)
2629
initData(intent.extras)
2730
setRootLayout(bindLayout())
2831
initView(savedInstanceState, mContentView)
2932
doBusiness()
33+
34+
if (isSwipeBack()) {
35+
Slidr.attach(this)
36+
}
3037
AppUtils.registerAppStatusChangedListener(this, object : Utils.OnAppStatusChangedListener {
3138
override fun onForeground() {
3239
ToastUtils.showShort("foreground")

‎lib/base/src/main/java/com/blankj/lib/base/BaseDrawerActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ abstract class BaseDrawerActivity : BaseActivity() {
2323
protected lateinit var mBaseDrawerRootLayout: DrawerLayout
2424
protected lateinit var mBaseDrawerContainerView: FrameLayout
2525

26+
override fun isSwipeBack(): Boolean {
27+
return false
28+
}
29+
2630
override fun setRootLayout(layoutId: Int) {
2731
super.setRootLayout(R.layout.activity_drawer)
2832
if (layoutId > 0) {

‎lib/base/src/main/java/com/blankj/lib/base/BaseLazyFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ abstract class BaseLazyFragment : BaseFragment() {
3030
}
3131

3232
override fun doBusiness() {
33-
if (userVisibleHint) {
33+
if (userVisibleHint && !isDataLoaded) {
3434
doLazyBusiness()
3535
isDataLoaded = true
3636
}

‎lib/base/src/main/java/com/blankj/lib/base/BaseBackActivity.kt renamed to ‎lib/base/src/main/java/com/blankj/lib/base/BaseTitleBarActivity.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
package com.blankj.lib.base
22

3-
import android.support.annotation.StringRes
4-
import android.support.v4.content.ContextCompat
53
import android.view.LayoutInflater
64
import android.view.MenuItem
75
import com.blankj.utilcode.util.BarUtils
8-
import com.blankj.utilcode.util.Utils
9-
import com.r0adkll.slidr.Slidr
6+
import com.blankj.utilcode.util.ColorUtils
107
import kotlinx.android.synthetic.main.activity_back.*
118

129
/**
1310
* ```
1411
* author: blankj
1512
* blog : http://blankj.com
1613
* time : 2018/11/16
17-
* desc : base about back activity
14+
* desc : base about title bar activity
1815
* ```
1916
*/
20-
abstract class BaseBackActivity : BaseActivity() {
17+
abstract class BaseTitleBarActivity : BaseActivity() {
18+
19+
abstract fun bindTitle(): CharSequence
2120

2221
override fun setRootLayout(layoutId: Int) {
2322
super.setRootLayout(R.layout.activity_back)
24-
Slidr.attach(this)
2523
if (layoutId > 0) {
2624
LayoutInflater.from(this).inflate(layoutId, baseBackContainerView)
2725
}
2826
setSupportActionBar(baseBackToolbar)
2927
supportActionBar?.setDisplayHomeAsUpEnabled(true)
3028

31-
BarUtils.setStatusBarColor(this, ContextCompat.getColor(Utils.getApp(), R.color.colorPrimary))
29+
BarUtils.setStatusBarColor(this, ColorUtils.getColor(R.color.colorPrimary))
3230
BarUtils.addMarginTopEqualStatusBarHeight(baseBackRootLayout)
31+
32+
supportActionBar?.title = bindTitle()
3333
}
3434

3535
override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -39,7 +39,7 @@ abstract class BaseBackActivity : BaseActivity() {
3939
return super.onOptionsItemSelected(item)
4040
}
4141

42-
override fun setTitle(@StringRes resId: Int) {
43-
supportActionBar?.title = getString(resId)
42+
override fun isSwipeBack(): Boolean {
43+
return true
4444
}
4545
}

‎subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/SubUtilActivity.kt

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import android.content.Context
44
import android.content.Intent
55
import android.os.Bundle
66
import android.view.View
7-
import com.blankj.lib.base.BaseBackActivity
7+
import com.blankj.lib.base.BaseTitleBarActivity
88
import com.blankj.subutil.pkg.R
99
import com.blankj.subutil.pkg.feature.location.LocationActivity
1010
import com.blankj.subutil.pkg.feature.pinyin.PinyinActivity
@@ -18,7 +18,7 @@ import com.blankj.utilcode.util.BusUtils
1818
* desc : MainActivity
1919
* ```
2020
*/
21-
class SubUtilActivity : BaseBackActivity() {
21+
class SubUtilActivity : BaseTitleBarActivity() {
2222

2323
companion object {
2424
@BusUtils.Subscribe(name = "SubUtilActivity#start")
@@ -28,25 +28,21 @@ class SubUtilActivity : BaseBackActivity() {
2828
}
2929
}
3030

31-
override fun initData(bundle: Bundle?) {
32-
31+
override fun bindTitle(): CharSequence {
32+
return getString(R.string.sub_util)
3333
}
3434

35+
override fun initData(bundle: Bundle?) {}
36+
3537
override fun bindLayout(): Int {
3638
return R.layout.activity_util_sub
3739
}
3840

39-
override fun initView(savedInstanceState: Bundle?, contentView: View) {
40-
setTitle(R.string.sub_util)
41-
}
41+
override fun initView(savedInstanceState: Bundle?, contentView: View) {}
4242

43-
override fun doBusiness() {
43+
override fun doBusiness() {}
4444

45-
}
46-
47-
override fun onWidgetClick(view: View) {
48-
49-
}
45+
override fun onWidgetClick(view: View) {}
5046

5147
fun locationClick(view: View) {
5248
LocationActivity.start(this)

‎subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.kt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import android.content.ServiceConnection
77
import android.os.Bundle
88
import android.os.IBinder
99
import android.view.View
10-
import com.blankj.lib.base.BaseBackActivity
10+
import com.blankj.lib.base.BaseTitleBarActivity
1111
import com.blankj.subutil.pkg.R
1212
import com.blankj.subutil.pkg.helper.PermissionHelper
1313
import com.blankj.utilcode.util.SpanUtils
@@ -21,7 +21,7 @@ import kotlinx.android.synthetic.main.activity_location.*
2121
* desc : demo about LocationUtils
2222
* ```
2323
*/
24-
class LocationActivity : BaseBackActivity() {
24+
class LocationActivity : BaseTitleBarActivity() {
2525

2626
companion object {
2727
fun start(context: Context) {
@@ -41,9 +41,7 @@ class LocationActivity : BaseBackActivity() {
4141
private lateinit var mLocationService: LocationService
4242

4343
private var conn: ServiceConnection = object : ServiceConnection {
44-
override fun onServiceDisconnected(name: ComponentName) {
45-
46-
}
44+
override fun onServiceDisconnected(name: ComponentName) {}
4745

4846
override fun onServiceConnected(name: ComponentName, service: IBinder) {
4947
mLocationService = (service as LocationService.LocationBinder).service
@@ -66,17 +64,17 @@ class LocationActivity : BaseBackActivity() {
6664
}
6765
}
6866

69-
override fun initData(bundle: Bundle?) {
70-
67+
override fun bindTitle(): CharSequence {
68+
return getString(R.string.demo_location)
7169
}
7270

71+
override fun initData(bundle: Bundle?) {}
72+
7373
override fun bindLayout(): Int {
7474
return R.layout.activity_location
7575
}
7676

7777
override fun initView(savedInstanceState: Bundle?, contentView: View) {
78-
setTitle(R.string.demo_location)
79-
8078
SpanUtils.with(locationAboutTv)
8179
.appendLine("lastLatitude: unknown")
8280
.appendLine("lastLongitude: unknown")
@@ -92,9 +90,7 @@ class LocationActivity : BaseBackActivity() {
9290
bindService(Intent(this, LocationService::class.java), conn, Context.BIND_AUTO_CREATE)
9391
}
9492

95-
override fun onWidgetClick(view: View) {
96-
97-
}
93+
override fun onWidgetClick(view: View) {}
9894

9995
override fun onDestroy() {
10096
unbindService(conn)

‎subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationService.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ class LocationService : Service() {
4949
mOnGetLocationListener?.getLocation(lastLatitude, lastLongitude, latitude, longitude, country, locality, street)
5050
}
5151

52-
override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {
53-
54-
}
52+
override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {}
5553
}
5654

5755
fun setOnGetLocationListener(onGetLocationListener: OnGetLocationListener) {

‎subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.kt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import android.content.Context
44
import android.content.Intent
55
import android.os.Bundle
66
import android.view.View
7-
import com.blankj.lib.base.BaseBackActivity
7+
import com.blankj.lib.base.BaseTitleBarActivity
88
import com.blankj.subutil.pkg.R
99
import com.blankj.subutil.util.PinyinUtils
1010
import kotlinx.android.synthetic.main.activity_pinyin.*
@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.activity_pinyin.*
1717
* desc : demo about PinyinUtils
1818
* ```
1919
*/
20-
class PinyinActivity : BaseBackActivity() {
20+
class PinyinActivity : BaseTitleBarActivity() {
2121

2222
companion object {
2323
fun start(context: Context) {
@@ -26,17 +26,17 @@ class PinyinActivity : BaseBackActivity() {
2626
}
2727
}
2828

29-
override fun initData(bundle: Bundle?) {
30-
29+
override fun bindTitle(): CharSequence {
30+
return getString(R.string.demo_pinyin)
3131
}
3232

33+
override fun initData(bundle: Bundle?) {}
34+
3335
override fun bindLayout(): Int {
3436
return R.layout.activity_pinyin
3537
}
3638

3739
override fun initView(savedInstanceState: Bundle?, contentView: View) {
38-
setTitle(R.string.demo_pinyin)
39-
4040
val surnames = "乐乘乜仇会便区单参句召员宓弗折曾朴查洗盖祭种秘繁缪能蕃覃解谌适都阿难黑"
4141
val size = surnames.length
4242
val sb = StringBuilder("汉字转拼音: " + PinyinUtils.ccs2Pinyin("汉字转拼音", " ")
@@ -58,11 +58,7 @@ class PinyinActivity : BaseBackActivity() {
5858
pinyinAboutTv.text = sb.toString()
5959
}
6060

61-
override fun doBusiness() {
61+
override fun doBusiness() {}
6262

63-
}
64-
65-
override fun onWidgetClick(view: View) {
66-
67-
}
63+
override fun onWidgetClick(view: View) {}
6864
}

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public static void add(@NonNull final FragmentManager fm,
234234
@NonNull final List<Fragment> adds,
235235
@IdRes final int containerId,
236236
final int showIndex) {
237-
add(fm, adds.toArray(new Fragment[adds.size()]), containerId, null, showIndex);
237+
add(fm, adds.toArray(new Fragment[0]), containerId, null, showIndex);
238238
}
239239

240240
/**
@@ -464,7 +464,7 @@ public static void add(@NonNull final FragmentManager fm,
464464
@IdRes final int containerId,
465465
final String tags[],
466466
final int showIndex) {
467-
add(fm, adds.toArray(new Fragment[adds.size()]), containerId, tags, showIndex);
467+
add(fm, adds.toArray(new Fragment[0]), containerId, tags, showIndex);
468468
}
469469

470470
/**
@@ -515,7 +515,7 @@ public static void show(@NonNull final FragmentManager fm) {
515515
operateNoAnim(fm,
516516
TYPE_SHOW_FRAGMENT,
517517
null,
518-
fragments.toArray(new Fragment[fragments.size()])
518+
fragments.toArray(new Fragment[0])
519519
);
520520
}
521521

@@ -542,7 +542,7 @@ public static void hide(@NonNull final FragmentManager fm) {
542542
operateNoAnim(fm,
543543
TYPE_HIDE_FRAGMENT,
544544
null,
545-
fragments.toArray(new Fragment[fragments.size()])
545+
fragments.toArray(new Fragment[0])
546546
);
547547
}
548548

@@ -567,7 +567,7 @@ public static void showHide(@NonNull final Fragment show, @NonNull final List<Fr
567567
putArgs(fragment, fragment != show);
568568
}
569569
operateNoAnim(show.getFragmentManager(), TYPE_SHOW_HIDE_FRAGMENT, show,
570-
hide.toArray(new Fragment[hide.size()]));
570+
hide.toArray(new Fragment[0]));
571571
}
572572

573573
/**
@@ -1381,7 +1381,7 @@ public static void removeAll(@NonNull final FragmentManager fm) {
13811381
operateNoAnim(fm,
13821382
TYPE_REMOVE_FRAGMENT,
13831383
null,
1384-
fragments.toArray(new Fragment[fragments.size()])
1384+
fragments.toArray(new Fragment[0])
13851385
);
13861386
}
13871387

0 commit comments

Comments
 (0)