Skip to content

Commit 48c6560

Browse files
committed
移除界面侧滑功能及补充相关文档
修复 DialogManager 内存泄漏的问题 修复 Android 11 无法使用意图的问题 修复 Bugly 上报 Lottie 资源异常的问题 优化 SettingBar 自定义控件的代码逻辑
1 parent c1dcac5 commit 48c6560

25 files changed

+128
-136
lines changed

AndroidProject.apk

-4.28 KB
Binary file not shown.

HelpDoc.md

Lines changed: 33 additions & 21 deletions
Large diffs are not rendered by default.

app/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,6 @@ dependencies {
182182
implementation 'com.scwang.smart:refresh-layout-kernel:2.0.3'
183183
implementation 'com.scwang.smart:refresh-header-material:2.0.3'
184184

185-
// 侧滑框架:https://github.com/luckybilly/SmartSwipe
186-
implementation 'com.billy.android:smart-swipe:1.1.2'
187-
implementation 'com.billy.android:smart-swipe-x:1.1.0'
188-
189185
// 日志打印框架:https://github.com/JakeWharton/timber
190186
implementation 'com.jakewharton.timber:timber:4.7.1'
191187

app/src/main/AndroidManifest.xml

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
package="com.hjq.demo">
66

7-
<!-- 联网权限 -->
8-
<uses-permission android:name="android.permission.INTERNET" />
9-
10-
<!-- 网络状态 -->
7+
<!-- 网络相关 -->
118
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
129
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
10+
<uses-permission android:name="android.permission.INTERNET" />
1311

1412
<!-- 外部存储 -->
1513
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -206,4 +204,37 @@
206204

207205
</application>
208206

207+
<!-- Android 11 软件包可见性适配:https://www.jianshu.com/p/d1ccd425c4ce -->
208+
<queries>
209+
<!-- 拍照意图:MediaStore.ACTION_IMAGE_CAPTURE -->
210+
<intent>
211+
<action android:name="android.media.action.IMAGE_CAPTURE" />
212+
</intent>
213+
214+
<!-- 拍摄意图:MediaStore.ACTION_VIDEO_CAPTURE -->
215+
<intent>
216+
<action android:name="android.media.action.VIDEO_CAPTURE" />
217+
</intent>
218+
219+
<!-- 图片裁剪意图 -->
220+
<intent>
221+
<action android:name="com.android.camera.action.CROP" />
222+
</intent>
223+
224+
<!-- 打电话意图:Intent.ACTION_DIAL -->
225+
<intent>
226+
<action android:name="android.intent.action.DIAL" />
227+
</intent>
228+
229+
<!-- 分享意图:Intent.ACTION_SEND -->
230+
<intent>
231+
<action android:name="android.intent.action.SEND" />
232+
</intent>
233+
234+
<!-- 调起其他页面意图:Intent.ACTION_VIEW -->
235+
<intent>
236+
<action android:name="android.intent.action.VIEW" />
237+
</intent>
238+
</queries>
239+
209240
</manifest>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ default void showLoading(@RawRes int id) {
4747
*/
4848
default void showComplete() {
4949
StatusLayout layout = getStatusLayout();
50-
if (layout != null && layout.isShow()) {
51-
layout.hide();
50+
if (layout == null || !layout.isShow()) {
51+
return;
5252
}
53+
layout.hide();
5354
}
5455

5556
/**

app/src/main/java/com/hjq/demo/action/SwipeAction.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

app/src/main/java/com/hjq/demo/app/AppActivity.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.hjq.base.BaseActivity;
1414
import com.hjq.base.BaseDialog;
1515
import com.hjq.demo.R;
16-
import com.hjq.demo.action.SwipeAction;
1716
import com.hjq.demo.action.TitleBarAction;
1817
import com.hjq.demo.action.ToastAction;
1918
import com.hjq.demo.http.model.HttpData;
@@ -29,8 +28,7 @@
2928
* desc : 业务 Activity 基类
3029
*/
3130
public abstract class AppActivity extends BaseActivity
32-
implements ToastAction, TitleBarAction,
33-
SwipeAction, OnHttpListener<Object> {
31+
implements ToastAction, TitleBarAction, OnHttpListener<Object> {
3432

3533
/** 标题栏对象 */
3634
private TitleBar mTitleBar;

app/src/main/java/com/hjq/demo/app/AppApplication.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
import androidx.lifecycle.Lifecycle;
1717
import androidx.lifecycle.LifecycleOwner;
1818

19-
import com.billy.android.swipe.SmartSwipeBack;
2019
import com.hjq.bar.TitleBar;
2120
import com.hjq.bar.initializer.LightBarInitializer;
2221
import com.hjq.demo.R;
23-
import com.hjq.demo.action.SwipeAction;
2422
import com.hjq.demo.aop.DebugLog;
2523
import com.hjq.demo.http.glide.GlideApp;
2624
import com.hjq.demo.http.model.RequestHandler;
@@ -76,7 +74,7 @@ public void onTrimMemory(int level) {
7674
* 初始化一些第三方框架
7775
*/
7876
public static void initSdk(Application application) {
79-
// 设置权限请求调试模式
77+
// 设置调试模式
8078
XXPermissions.setDebugMode(AppConfig.isDebug());
8179

8280
// 初始化吐司
@@ -161,14 +159,6 @@ protected TextView createTextView(Context context) {
161159
// 启用配置
162160
.into();
163161

164-
// Activity 侧滑返回
165-
SmartSwipeBack.activitySlidingBack(application, activity -> {
166-
if (activity instanceof SwipeAction) {
167-
return ((SwipeAction) activity).isSwipeEnable();
168-
}
169-
return true;
170-
});
171-
172162
// 初始化日志打印
173163
if (AppConfig.isLogEnable()) {
174164
Timber.plant(new DebugLoggerTree());

app/src/main/java/com/hjq/demo/manager/DialogManager.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,12 @@ public void onDismiss(BaseDialog dialog) {
8484
*/
8585

8686
@Override
87-
public void onStateChanged(@NonNull LifecycleOwner source, @NonNull Lifecycle.Event event) {
87+
public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner, @NonNull Lifecycle.Event event) {
8888
if (event != Lifecycle.Event.ON_DESTROY) {
8989
return;
9090
}
91-
source.getLifecycle().removeObserver(this);
91+
DIALOG_MANAGER.remove(lifecycleOwner);
92+
lifecycleOwner.getLifecycle().removeObserver(this);
9293
clearShow();
9394
}
9495
}

app/src/main/java/com/hjq/demo/manager/InputTextManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,9 @@ public interface OnInputTextListener {
306306

307307
/**
308308
* 输入发生了变化
309+
*
309310
* @return 返回按钮的 Enabled 状态
310311
*/
311-
boolean onInputChange(InputTextManager helper);
312+
boolean onInputChange(InputTextManager manager);
312313
}
313314
}

0 commit comments

Comments
 (0)