Skip to content

Commit 0ef1410

Browse files
author
Blankj
committed
see 08/18 log
1 parent 5c58efd commit 0ef1410

41 files changed

Lines changed: 60 additions & 62 deletions

Some content is hidden

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

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,16 @@
1919
*/
2020
public class UtilsApp extends BaseApplication {
2121

22+
private static UtilsApp sInstance;
23+
24+
public static UtilsApp getInstance() {
25+
return sInstance;
26+
}
27+
2228
@Override
2329
public void onCreate() {
2430
super.onCreate();
31+
sInstance = this;
2532
com.blankj.utilcode.util.Utils.init(this);
2633
com.blankj.subutil.util.Utils.init(this);
2734
initLeakCanary();
@@ -40,7 +47,7 @@ private void initLeakCanary() {
4047
LeakCanary.install(this);
4148
}
4249

43-
public static void initLog() {
50+
public void initLog() {
4451
LogUtils.Config config = LogUtils.getConfig()
4552
.setLogSwitch(BuildConfig.DEBUG)// 设置log总开关，包括输出到控制台和文件，默认开
4653
.setConsoleSwitch(BuildConfig.DEBUG)// 设置是否输出到控制台开关，默认开

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* </pre>
1616
*/
1717
public abstract class BaseActivity extends AppCompatActivity
18-
implements IBaseView, View.OnClickListener {
18+
implements IBaseView {
1919

2020
/**
2121
* 当前Activity渲染的视图View
@@ -36,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
3636
initData(bundle);
3737
setBaseView(bindLayout());
3838
initView(savedInstanceState, contentView);
39-
doBusiness(this);
39+
doBusiness();
4040
}
4141

4242
protected void setBaseView(@LayoutRes int layoutId) {

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

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

33
import android.app.Activity;
44
import android.app.Application;
5-
import android.content.Context;
65
import android.os.Bundle;
76
import android.util.Log;
87

@@ -20,7 +19,7 @@ public class BaseApplication extends Application {
2019

2120
private static BaseApplication sInstance;
2221

23-
public static Context getInstance() {
22+
public static BaseApplication getInstance() {
2423
return sInstance;
2524
}
2625

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* desc : Fragment－v4基类
1818
* </pre>
1919
*/
20-
public abstract class BaseFragment<T extends BaseActivity> extends Fragment
20+
public abstract class BaseFragment extends Fragment
2121
implements IBaseView, View.OnClickListener {
2222

2323
private static final String TAG = "BaseFragment";
@@ -32,7 +32,7 @@ public abstract class BaseFragment<T extends BaseActivity> extends Fragment
3232
*/
3333
private long lastClick = 0;
3434

35-
protected T mActivity;
35+
protected BaseActivity mActivity;
3636

3737
@Override
3838
public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -70,9 +70,9 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
7070
@Override
7171
public void onActivityCreated(Bundle savedInstanceState) {
7272
super.onActivityCreated(savedInstanceState);
73-
mActivity = (T) getActivity();
73+
mActivity = (BaseActivity) getActivity();
7474
initView(savedInstanceState, contentView);
75-
doBusiness(mActivity);
75+
doBusiness();
7676
Log.d(TAG, "onActivityCreated: ");
7777
}
7878

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

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

3-
import android.content.Context;
43
import android.os.Bundle;
54
import android.view.View;
65

@@ -12,7 +11,7 @@
1211
* desc :
1312
* </pre>
1413
*/
15-
interface IBaseView {
14+
interface IBaseView extends View.OnClickListener {
1615

1716
/**
1817
* 初始化数据
@@ -35,10 +34,8 @@ interface IBaseView {
3534

3635
/**
3736
* 业务操作
38-
*
39-
* @param context 上下文
4037
*/
41-
void doBusiness(final Context context);
38+
void doBusiness();
4239

4340
/**
4441
* 视图点击事件

‎app/src/main/java/com/blankj/androidutilcode/core/activity/ActivityActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void initView(Bundle savedInstanceState, View view) {
5151
}
5252

5353
@Override
54-
public void doBusiness(Context context) {
54+
public void doBusiness() {
5555

5656
}
5757

‎app/src/main/java/com/blankj/androidutilcode/core/app/AppActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void initView(Bundle savedInstanceState, View view) {
5252
TextView tvAboutApp = (TextView) findViewById(R.id.tv_about_app);
5353
tvAboutApp.setText(
5454
new SpanUtils()
55-
.appendLine("app icon: ").appendImage(AppUtils.getAppIcon(), SpanUtils.ALIGN_CENTER)
55+
.append("app icon: ").appendImage(AppUtils.getAppIcon(), SpanUtils.ALIGN_CENTER).appendLine()
5656
.appendLine(AppUtils.getAppInfo().toString())
5757
.appendLine("isAppRoot: " + AppUtils.isAppRoot())
5858
.appendLine("isAppDebug: " + AppUtils.isAppDebug())
@@ -62,7 +62,7 @@ public void initView(Bundle savedInstanceState, View view) {
6262
}
6363

6464
@Override
65-
public void doBusiness(Context context) {
65+
public void doBusiness() {
6666

6767
}
6868

‎app/src/main/java/com/blankj/androidutilcode/core/bar/BarActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void initView(Bundle savedInstanceState, View view) {
4747
}
4848

4949
@Override
50-
public void doBusiness(Context context) {
50+
public void doBusiness() {
5151

5252
}
5353

‎app/src/main/java/com/blankj/androidutilcode/core/bar/BarNavActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void initView(Bundle savedInstanceState, View view) {
4747
}
4848

4949
@Override
50-
public void doBusiness(Context context) {
50+
public void doBusiness() {
5151

5252
}
5353

‎app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusAlphaActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void initView(Bundle savedInstanceState, View view) {
5353
}
5454

5555
@Override
56-
public void doBusiness(Context context) {
56+
public void doBusiness() {
5757

5858
}
5959

0 commit comments

Comments
 (0)