Skip to content

Commit eec1e21

Browse files
author
Blankj
committed
see 12/19 log
1 parent b921b2d commit eec1e21

File tree

4 files changed

+38
-45
lines changed

4 files changed

+38
-45
lines changed

‎app/src/main/java/com/blankj/androidutilcode/activities/ToastActivity.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@
2121
public class ToastActivity extends Activity
2222
implements View.OnClickListener {
2323

24-
private Context mContext;
25-
private boolean isJumpWhenMore;
24+
private boolean isJumpWhenMore;
2625
private TextView tvAboutToast;
2726

2827
@Override
2928
protected void onCreate(Bundle savedInstanceState) {
3029
super.onCreate(savedInstanceState);
3130
setContentView(R.layout.activity_toast);
32-
mContext = this;
3331
isJumpWhenMore = false;
3432

3533
tvAboutToast = (TextView) findViewById(R.id.tv_about_toast);
@@ -54,23 +52,23 @@ public void onClick(View view) {
5452
new Thread(new Runnable() {
5553
@Override
5654
public void run() {
57-
ToastUtils.showShortToastSafe(mContext, "show_short_toast_safe");
55+
ToastUtils.showShortToastSafe("show_short_toast_safe");
5856
}
5957
}).start();
6058
break;
6159
case R.id.btn_show_long_toast_safe:
6260
new Thread(new Runnable() {
6361
@Override
6462
public void run() {
65-
ToastUtils.showLongToastSafe(mContext, "show_long_toast_safe");
63+
ToastUtils.showLongToastSafe("show_long_toast_safe");
6664
}
6765
}).start();
6866
break;
6967
case R.id.btn_show_short_toast:
70-
ToastUtils.showShortToast(mContext, "show_short_toast");
68+
ToastUtils.showShortToast("show_short_toast");
7169
break;
7270
case R.id.btn_show_long_toast:
73-
ToastUtils.showShortToast(mContext, "show_long_toast");
71+
ToastUtils.showShortToast("show_long_toast");
7472
break;
7573
case R.id.btn_cancel_toast:
7674
ToastUtils.cancelToast();

‎utilcode/src/main/java/com/blankj/utilcode/utils/StringUtils.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ public static String upperFirstLetter(String s) {
106106
* @return 首字母小写字符串
107107
*/
108108
public static String lowerFirstLetter(String s) {
109-
if (isEmpty(s) || !Character.isUpperCase(s.charAt(0))) {
110-
return s;
111-
}
109+
if (isEmpty(s) || !Character.isUpperCase(s.charAt(0))) return s;
112110
return String.valueOf((char) (s.charAt(0) + 32)) + s.substring(1);
113111
}
114112

@@ -139,9 +137,7 @@ public static String reverse(String s) {
139137
* @return 半角字符串
140138
*/
141139
public static String toDBC(String s) {
142-
if (isEmpty(s)) {
143-
return s;
144-
}
140+
if (isEmpty(s)) return s;
145141
char[] chars = s.toCharArray();
146142
for (int i = 0, len = chars.length; i < len; i++) {
147143
if (chars[i] == 12288) {
@@ -162,9 +158,7 @@ public static String toDBC(String s) {
162158
* @return 全角字符串
163159
*/
164160
public static String toSBC(String s) {
165-
if (isEmpty(s)) {
166-
return s;
167-
}
161+
if (isEmpty(s)) return s;
168162
char[] chars = s.toCharArray();
169163
for (int i = 0, len = chars.length; i < len; i++) {
170164
if (chars[i] == ' ') {

‎utilcode/src/main/java/com/blankj/utilcode/utils/ToastUtils.java‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.os.Handler;
44
import android.os.Looper;
5+
import android.support.annotation.StringRes;
56
import android.widget.Toast;
67

78
/**
@@ -52,7 +53,7 @@ public void run() {
5253
*
5354
* @param resId 资源Id
5455
*/
55-
public static void showShortToastSafe(final int resId) {
56+
public static void showShortToastSafe(final @StringRes int resId) {
5657
sHandler.post(new Runnable() {
5758
@Override
5859
public void run() {
@@ -67,7 +68,7 @@ public void run() {
6768
* @param resId 资源Id
6869
* @param args 参数
6970
*/
70-
public static void showShortToastSafe(final int resId, final Object... args) {
71+
public static void showShortToastSafe(final @StringRes int resId, final Object... args) {
7172
sHandler.post(new Runnable() {
7273
@Override
7374
public void run() {
@@ -110,7 +111,7 @@ public void run() {
110111
*
111112
* @param resId 资源Id
112113
*/
113-
public static void showLongToastSafe(final int resId) {
114+
public static void showLongToastSafe(final @StringRes int resId) {
114115
sHandler.post(new Runnable() {
115116
@Override
116117
public void run() {
@@ -125,7 +126,7 @@ public void run() {
125126
* @param resId 资源Id
126127
* @param args 参数
127128
*/
128-
public static void showLongToastSafe(final int resId, final Object... args) {
129+
public static void showLongToastSafe(final @StringRes int resId, final Object... args) {
129130
sHandler.post(new Runnable() {
130131
@Override
131132
public void run() {
@@ -163,7 +164,7 @@ public static void showShortToast(CharSequence text) {
163164
*
164165
* @param resId 资源Id
165166
*/
166-
public static void showShortToast(int resId) {
167+
public static void showShortToast(@StringRes int resId) {
167168
showToast(resId, Toast.LENGTH_SHORT);
168169
}
169170

@@ -173,7 +174,7 @@ public static void showShortToast(int resId) {
173174
* @param resId 资源Id
174175
* @param args 参数
175176
*/
176-
public static void showShortToast(int resId, Object... args) {
177+
public static void showShortToast(@StringRes int resId, Object... args) {
177178
showToast(resId, Toast.LENGTH_SHORT, args);
178179
}
179180

@@ -201,7 +202,7 @@ public static void showLongToast(CharSequence text) {
201202
*
202203
* @param resId 资源Id
203204
*/
204-
public static void showLongToast(int resId) {
205+
public static void showLongToast(@StringRes int resId) {
205206
showToast(resId, Toast.LENGTH_LONG);
206207
}
207208

@@ -211,7 +212,7 @@ public static void showLongToast(int resId) {
211212
* @param resId 资源Id
212213
* @param args 参数
213214
*/
214-
public static void showLongToast(int resId, Object... args) {
215+
public static void showLongToast(@StringRes int resId, Object... args) {
215216
showToast(resId, Toast.LENGTH_LONG, args);
216217
}
217218

@@ -225,30 +226,13 @@ public static void showLongToast(String format, Object... args) {
225226
showToast(format, Toast.LENGTH_LONG, args);
226227
}
227228

228-
/**
229-
* 显示吐司
230-
*
231-
* @param text 文本
232-
* @param duration 显示时长
233-
*/
234-
private static void showToast(CharSequence text, int duration) {
235-
if (isJumpWhenMore) cancelToast();
236-
if (sToast == null) {
237-
sToast = Toast.makeText(Utils.context, text, duration);
238-
} else {
239-
sToast.setText(text);
240-
sToast.setDuration(duration);
241-
}
242-
sToast.show();
243-
}
244-
245229
/**
246230
* 显示吐司
247231
*
248232
* @param resId 资源Id
249233
* @param duration 显示时长
250234
*/
251-
private static void showToast(int resId, int duration) {
235+
private static void showToast(@StringRes int resId, int duration) {
252236
showToast(Utils.context.getResources().getText(resId).toString(), duration);
253237
}
254238

@@ -259,7 +243,7 @@ private static void showToast(int resId, int duration) {
259243
* @param duration 显示时长
260244
* @param args 参数
261245
*/
262-
private static void showToast(int resId, int duration, Object... args) {
246+
private static void showToast(@StringRes int resId, int duration, Object... args) {
263247
showToast(String.format(Utils.context.getResources().getString(resId), args), duration);
264248
}
265249

@@ -274,6 +258,23 @@ private static void showToast(String format, int duration, Object... args) {
274258
showToast(String.format(format, args), duration);
275259
}
276260

261+
/**
262+
* 显示吐司
263+
*
264+
* @param text 文本
265+
* @param duration 显示时长
266+
*/
267+
private static void showToast(CharSequence text, int duration) {
268+
if (isJumpWhenMore) cancelToast();
269+
if (sToast == null) {
270+
sToast = Toast.makeText(Utils.context, text, duration);
271+
} else {
272+
sToast.setText(text);
273+
sToast.setDuration(duration);
274+
}
275+
sToast.show();
276+
}
277+
277278
/**
278279
* 取消吐司显示
279280
*/

‎utilcode/src/test/java/com/blankj/utilcode/utils/TestUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
@Config(manifest = Config.NONE)
2222
public class TestUtils {
2323

24-
public static final char SEP = File.separatorChar;
24+
static final char SEP = File.separatorChar;
2525

26-
public static final String BASEPATH = System.getProperty("user.dir")
26+
static final String BASEPATH = System.getProperty("user.dir")
2727
+ SEP + "src" + SEP + "test" + SEP + "res" + SEP;
2828

2929
public static void init() {

0 commit comments

Comments
 (0)