Skip to content

Commit f1acf03

Browse files
getActivitygetActivity
committed
优化和 StatusLayout 类相关的代码实现
1 parent 569a179 commit f1acf03

11 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎app/src/main/java/com/hjq/demo/action/StatusAction.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public interface StatusAction {
2222
/**
2323
* 获取状态布局
2424
*/
25-
StatusLayout getStatusLayout();
25+
StatusLayout acquireStatusLayout();
2626

2727
/**
2828
* 显示加载中
@@ -32,7 +32,7 @@ default void showLoading() {
3232
}
3333

3434
default void showLoading(@RawRes int id) {
35-
StatusLayout layout = getStatusLayout();
35+
StatusLayout layout = acquireStatusLayout();
3636
if (layout == null) {
3737
return;
3838
}
@@ -46,7 +46,7 @@ default void showLoading(@RawRes int id) {
4646
* 显示加载完成
4747
*/
4848
default void showComplete() {
49-
StatusLayout layout = getStatusLayout();
49+
StatusLayout layout = acquireStatusLayout();
5050
if (layout == null || !layout.isShow()) {
5151
return;
5252
}
@@ -64,7 +64,7 @@ default void showEmpty() {
6464
* 显示错误提示
6565
*/
6666
default void showError(StatusLayout.OnRetryListener listener) {
67-
StatusLayout layout = getStatusLayout();
67+
StatusLayout layout = acquireStatusLayout();
6868
if (layout == null) {
6969
return;
7070
}
@@ -85,7 +85,7 @@ default void showError(StatusLayout.OnRetryListener listener) {
8585
* 显示自定义提示
8686
*/
8787
default void showLayout(@DrawableRes int drawableId, @StringRes int stringId, StatusLayout.OnRetryListener listener) {
88-
StatusLayout layout = getStatusLayout();
88+
StatusLayout layout = acquireStatusLayout();
8989
if (layout == null) {
9090
return;
9191
}
@@ -94,7 +94,7 @@ default void showLayout(@DrawableRes int drawableId, @StringRes int stringId, St
9494
}
9595

9696
default void showLayout(Drawable drawable, CharSequence hint, StatusLayout.OnRetryListener listener) {
97-
StatusLayout layout = getStatusLayout();
97+
StatusLayout layout = acquireStatusLayout();
9898
if (layout == null) {
9999
return;
100100
}

‎app/src/main/java/com/hjq/demo/ui/activity/StatusActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected int getLayoutId() {
2525

2626
@Override
2727
protected void initView() {
28-
mStatusLayout = findViewById(R.id.hl_status_hint);
28+
mStatusLayout = findViewById(R.id.sl_demo_status);
2929
}
3030

3131
@Override
@@ -59,7 +59,7 @@ protected void initData() {
5959
}
6060

6161
@Override
62-
public StatusLayout getStatusLayout() {
62+
public StatusLayout acquireStatusLayout() {
6363
return mStatusLayout;
6464
}
6565
}

‎app/src/main/java/com/hjq/demo/ui/activity/common/BrowserActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static void start(Context context, String url) {
5656

5757
private final FullScreenModeController mFullScreenModeController = new FullScreenModeController();
5858

59-
private StatusLayout mHintLayout;
59+
private StatusLayout mStatusLayout;
6060
private ProgressBar mProgressBar;
6161
private SmartRefreshLayout mRefreshLayout;
6262
private BrowserView mBrowserView;
@@ -68,7 +68,7 @@ protected int getLayoutId() {
6868

6969
@Override
7070
protected void initView() {
71-
mHintLayout = findViewById(R.id.hl_browser_hint);
71+
mStatusLayout = findViewById(R.id.sl_browser_status);
7272
mProgressBar = findViewById(R.id.pb_browser_progress);
7373
mRefreshLayout = findViewById(R.id.sl_browser_refresh);
7474
mBrowserView = findViewById(R.id.wv_browser_view);
@@ -94,12 +94,12 @@ protected void initData() {
9494
@Nullable
9595
@Override
9696
public View getImmersionBottomView() {
97-
return mHintLayout;
97+
return mStatusLayout;
9898
}
9999

100100
@Override
101-
public StatusLayout getStatusLayout() {
102-
return mHintLayout;
101+
public StatusLayout acquireStatusLayout() {
102+
return mStatusLayout;
103103
}
104104

105105
@Override

‎app/src/main/java/com/hjq/demo/ui/activity/common/ImageSelectActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public static void start(BaseActivity activity, int maxSelect, OnImageSelectList
148148
});
149149
}
150150

151-
private StatusLayout mHintLayout;
151+
private StatusLayout mStatusLayout;
152152
private RecyclerView mRecyclerView;
153153
private FloatActionButton mFloatingView;
154154

@@ -175,7 +175,7 @@ protected int getLayoutId() {
175175

176176
@Override
177177
protected void initView() {
178-
mHintLayout = findViewById(R.id.hl_image_select_hint);
178+
mStatusLayout = findViewById(R.id.sl_image_select_status);
179179
mRecyclerView = findViewById(R.id.rv_image_select_list);
180180
mFloatingView = findViewById(R.id.fab_image_select_floating);
181181
setOnClickListener(mFloatingView);
@@ -218,8 +218,8 @@ protected void initData() {
218218
}
219219

220220
@Override
221-
public StatusLayout getStatusLayout() {
222-
return mHintLayout;
221+
public StatusLayout acquireStatusLayout() {
222+
return mStatusLayout;
223223
}
224224

225225
@SingleClick

‎app/src/main/java/com/hjq/demo/ui/activity/common/VideoSelectActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public static void start(BaseActivity activity, int maxSelect, OnVideoSelectList
160160
});
161161
}
162162

163-
private StatusLayout mHintLayout;
163+
private StatusLayout mStatusLayout;
164164
private RecyclerView mRecyclerView;
165165
private FloatActionButton mFloatingView;
166166

@@ -187,7 +187,7 @@ protected int getLayoutId() {
187187

188188
@Override
189189
protected void initView() {
190-
mHintLayout = findViewById(R.id.hl_video_select_hint);
190+
mStatusLayout = findViewById(R.id.sl_video_select_status);
191191
mRecyclerView = findViewById(R.id.rv_video_select_list);
192192
mFloatingView = findViewById(R.id.fab_video_select_floating);
193193
setOnClickListener(mFloatingView);
@@ -230,8 +230,8 @@ protected void initData() {
230230
}
231231

232232
@Override
233-
public StatusLayout getStatusLayout() {
234-
return mHintLayout;
233+
public StatusLayout acquireStatusLayout() {
234+
return mStatusLayout;
235235
}
236236

237237
@SingleClick

‎app/src/main/java/com/hjq/demo/ui/fragment/common/BrowserFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static BrowserFragment newInstance(String url) {
4545

4646
private final FullScreenModeController mFullScreenModeController = new FullScreenModeController();
4747

48-
private StatusLayout mHintLayout;
48+
private StatusLayout mStatusLayout;
4949
private SmartRefreshLayout mRefreshLayout;
5050
private BrowserView mBrowserView;
5151

@@ -56,7 +56,7 @@ protected int getLayoutId() {
5656

5757
@Override
5858
protected void initView() {
59-
mHintLayout = findViewById(R.id.hl_browser_hint);
59+
mStatusLayout = findViewById(R.id.sl_browser_status);
6060
mRefreshLayout = findViewById(R.id.sl_browser_refresh);
6161
mBrowserView = findViewById(R.id.wv_browser_view);
6262

@@ -78,8 +78,8 @@ protected void initData() {
7878
}
7979

8080
@Override
81-
public StatusLayout getStatusLayout() {
82-
return mHintLayout;
81+
public StatusLayout acquireStatusLayout() {
82+
return mStatusLayout;
8383
}
8484

8585
@Override

‎app/src/main/res-common/layout/browser_activity.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:visibility="gone" />
2323

2424
<com.hjq.demo.widget.StatusLayout
25-
android:id="@+id/hl_browser_hint"
25+
android:id="@+id/sl_browser_status"
2626
android:layout_width="match_parent"
2727
android:layout_height="match_parent">
2828

‎app/src/main/res-common/layout/browser_fragment.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
6-
android:id="@+id/hl_browser_hint"
6+
android:id="@+id/sl_browser_status"
77
android:layout_width="match_parent"
88
android:layout_height="match_parent"
99
tools:context=".ui.fragment.common.BrowserFragment">

‎app/src/main/res-common/layout/image_select_activity.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
android:layout_height="match_parent">
1818

1919
<com.hjq.demo.widget.StatusLayout
20-
android:id="@+id/hl_image_select_hint"
20+
android:id="@+id/sl_image_select_status"
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent">
2323

‎app/src/main/res-common/layout/video_select_activity.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
android:layout_height="match_parent">
1818

1919
<com.hjq.demo.widget.StatusLayout
20-
android:id="@+id/hl_video_select_hint"
20+
android:id="@+id/sl_video_select_status"
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent">
2323

0 commit comments

Comments
 (0)