Skip to content

Commit 50173f2

Browse files
BlankjBlankj
committed
see 04/10 log
1 parent b5d030c commit 50173f2

Some content is hidden

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

51 files changed

+140
-73
lines changed

‎app/build.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ android {
1010
targetSdkVersion target_sdk_version
1111
versionCode version_code
1212
versionName version_name
13+
dataBinding {
14+
enabled = true
15+
}
1316
}
1417

1518
if (signPropertiesFile.exists()) {
@@ -57,7 +60,7 @@ dependencies {
5760
// LeakCanary
5861
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
5962
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
60-
// implementation 'com.blankj:utilcode:1.13.9'
63+
// implementation 'com.blankj:utilcode:1.13.10'
6164
}
6265

6366

‎app/src/main/java/com/blankj/androidutilcode/MainActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.graphics.Color;
44
import android.os.Bundle;
5+
import android.support.annotation.NonNull;
56
import android.support.design.widget.CollapsingToolbarLayout;
67
import android.support.v7.app.ActionBarDrawerToggle;
78
import android.support.v7.widget.Toolbar;
@@ -23,7 +24,7 @@
2324
public class MainActivity extends BaseDrawerActivity {
2425

2526
@Override
26-
public void initData(Bundle bundle) {
27+
public void initData(@NonNull Bundle bundle) {
2728

2829
}
2930

‎app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,30 @@
1818
public abstract class BaseActivity extends AppCompatActivity
1919
implements IBaseView {
2020

21-
/**
22-
* 当前 Activity 渲染的视图 View
23-
*/
24-
protected View contentView;
21+
protected View mContentView;
22+
protected Activity mActivity;
23+
2524
/**
2625
* 上次点击时间
2726
*/
2827
private long lastClick = 0;
2928

30-
protected Activity mActivity;
31-
3229
@Override
3330
protected void onCreate(Bundle savedInstanceState) {
3431
super.onCreate(savedInstanceState);
3532
mActivity = this;
3633
Bundle bundle = getIntent().getExtras();
37-
initData(bundle);
34+
if (bundle != null) {
35+
initData(bundle);
36+
}
3837
setBaseView(bindLayout());
39-
initView(savedInstanceState, contentView);
38+
initView(savedInstanceState, mContentView);
4039
doBusiness();
4140
}
4241

4342
protected void setBaseView(@LayoutRes int layoutId) {
4443
if (layoutId <= 0) return;
45-
setContentView(contentView = LayoutInflater.from(this).inflate(layoutId, null));
44+
setContentView(mContentView = LayoutInflater.from(this).inflate(layoutId, null));
4645
}
4746

4847
/**

‎app/src/main/java/com/blankj/androidutilcode/base/BaseBackActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public abstract class BaseBackActivity extends BaseActivity {
3434
@Override
3535
protected void setBaseView(@LayoutRes int layoutId) {
3636
Slidr.attach(this);
37-
contentView = LayoutInflater.from(this).inflate(R.layout.activity_back, null);
38-
setContentView(contentView);
37+
mContentView = LayoutInflater.from(this).inflate(R.layout.activity_back, null);
38+
setContentView(mContentView);
3939
rootLayout = findViewById(R.id.root_layout);
4040
abl = findViewById(R.id.abl);
4141
mToolbar = findViewById(R.id.toolbar);

‎app/src/main/java/com/blankj/androidutilcode/base/BaseDrawerActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
4444

4545
@Override
4646
protected void setBaseView(@LayoutRes int layoutId) {
47-
contentView = LayoutInflater.from(this).inflate(R.layout.activity_drawer, null);
48-
setContentView(contentView);
47+
mContentView = LayoutInflater.from(this).inflate(R.layout.activity_drawer, null);
48+
setContentView(mContentView);
4949
rootLayout = findViewById(R.id.root_layout);
5050
flActivityContainer = findViewById(R.id.activity_container);
5151
flActivityContainer.addView(LayoutInflater.from(this).inflate(layoutId, flActivityContainer, false));

‎app/src/main/java/com/blankj/androidutilcode/base/BaseFragment.java‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import android.app.Activity;
44
import android.os.Bundle;
55
import android.support.annotation.IdRes;
6+
import android.support.annotation.LayoutRes;
7+
import android.support.annotation.NonNull;
68
import android.support.annotation.Nullable;
79
import android.support.v4.app.Fragment;
810
import android.support.v4.app.FragmentTransaction;
@@ -25,7 +27,7 @@ public abstract class BaseFragment extends Fragment
2527
private static final String TAG = "BaseFragment";
2628
private static final String STATE_SAVE_IS_HIDDEN = "STATE_SAVE_IS_HIDDEN";
2729

28-
protected View contentView;
30+
protected View mContentView;
2931
protected Activity mActivity;
3032

3133
private long lastClick = 0;
@@ -48,34 +50,41 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
4850

4951
@Nullable
5052
@Override
51-
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
53+
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
5254
Log.d(TAG, "onCreateView: ");
53-
contentView = inflater.inflate(bindLayout(), null);
54-
return contentView;
55+
setBaseView(inflater, bindLayout());
56+
return mContentView;
57+
}
58+
59+
protected void setBaseView(@NonNull LayoutInflater inflater, @LayoutRes int layoutId) {
60+
if (layoutId <= 0) return;
61+
mContentView = inflater.inflate(layoutId, null);
5562
}
5663

5764
@Override
58-
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
65+
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
5966
Log.d(TAG, "onViewCreated: ");
6067
super.onViewCreated(view, savedInstanceState);
6168
Bundle bundle = getArguments();
62-
initData(bundle);
69+
if (bundle != null) {
70+
initData(bundle);
71+
}
6372
}
6473

6574
@Override
66-
public void onActivityCreated(Bundle savedInstanceState) {
75+
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
6776
Log.d(TAG, "onActivityCreated: ");
6877
super.onActivityCreated(savedInstanceState);
69-
mActivity = (BaseActivity) getActivity();
70-
initView(savedInstanceState, contentView);
78+
mActivity = getActivity();
79+
initView(savedInstanceState, mContentView);
7180
doBusiness();
7281
}
7382

7483
@Override
7584
public void onDestroyView() {
7685
Log.d(TAG, "onDestroyView: ");
77-
if (contentView != null) {
78-
((ViewGroup) contentView.getParent()).removeView(contentView);
86+
if (mContentView != null) {
87+
((ViewGroup) mContentView.getParent()).removeView(mContentView);
7988
}
8089
super.onDestroyView();
8190
}
@@ -87,7 +96,7 @@ public void onDestroy() {
8796
}
8897

8998
@Override
90-
public void onSaveInstanceState(Bundle outState) {
99+
public void onSaveInstanceState(@NonNull Bundle outState) {
91100
Log.d(TAG, "onSaveInstanceState: ");
92101
super.onSaveInstanceState(outState);
93102
outState.putBoolean(STATE_SAVE_IS_HIDDEN, isHidden());
@@ -108,7 +117,7 @@ public void onClick(View view) {
108117
}
109118

110119
public <T extends View> T findViewById(@IdRes int id) {
111-
if (contentView == null) throw new NullPointerException("ContentView is null.");
112-
return contentView.findViewById(id);
120+
if (mContentView == null) throw new NullPointerException("ContentView is null.");
121+
return mContentView.findViewById(id);
113122
}
114123
}

‎app/src/main/java/com/blankj/androidutilcode/base/BaseLazyFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public abstract class BaseLazyFragment extends BaseFragment {
2222
public void setUserVisibleHint(boolean isVisibleToUser) {
2323
Log.d(TAG, "setUserVisibleHint: " + isVisibleToUser);
2424
super.setUserVisibleHint(isVisibleToUser);
25-
if (isVisibleToUser && contentView != null && !isDataLoaded) {
25+
if (isVisibleToUser && mContentView != null && !isDataLoaded) {
2626
doLazyBusiness();
2727
isDataLoaded = true;
2828
}

‎app/src/main/java/com/blankj/androidutilcode/base/DataBindingActivity.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.blankj.androidutilcode.base;
2+
3+
/**
4+
* <pre>
5+
* author: Blankj
6+
* blog : http://blankj.com
7+
* time : 2018/04/10
8+
* desc :
9+
* </pre>
10+
*/
11+
public abstract class DataBindingActivity extends BaseActivity {
12+
13+
14+
}

‎app/src/main/java/com/blankj/androidutilcode/base/IBaseView.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.blankj.androidutilcode.base;
22

33
import android.os.Bundle;
4+
import android.support.annotation.NonNull;
45
import android.view.View;
56

67
/**
@@ -18,7 +19,7 @@ interface IBaseView extends View.OnClickListener {
1819
*
1920
* @param bundle 传递过来的 bundle
2021
*/
21-
void initData(final Bundle bundle);
22+
void initData(@NonNull final Bundle bundle);
2223

2324
/**
2425
* 绑定布局

‎app/src/main/java/com/blankj/androidutilcode/feature/core/CoreUtilActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6+
import android.support.annotation.NonNull;
67
import android.view.View;
78

89
import com.blankj.androidutilcode.R;
@@ -44,7 +45,7 @@ public static void start(Context context) {
4445
}
4546

4647
@Override
47-
public void initData(Bundle bundle) {
48+
public void initData(@NonNull Bundle bundle) {
4849

4950
}
5051

0 commit comments

Comments
 (0)