From 9fdc4a8db325575a4293c4314f7459b2233d94da Mon Sep 17 00:00:00 2001 From: shixianjie Date: Thu, 19 Dec 2024 14:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B7=91=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hjx/parent/fragment/MeFragment.java | 17 --------------- build.gradle | 24 ++++++++++++++-------- .../java/com/prws/common/base/BaseActivity.java | 12 ----------- .../java/com/prws/common/config/SettingConfig.java | 7 +++---- .../com/prws/common/net/DownloadResponseBody.java | 7 +++---- .../java/com/prws/common/utils/LogcatHelper.java | 7 ------- 6 files changed, 22 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/com/hjx/parent/fragment/MeFragment.java b/app/src/main/java/com/hjx/parent/fragment/MeFragment.java index 2f03934..ee8c739 100644 --- a/app/src/main/java/com/hjx/parent/fragment/MeFragment.java +++ b/app/src/main/java/com/hjx/parent/fragment/MeFragment.java @@ -1,16 +1,12 @@ package com.hjx.parent.fragment; -import android.app.AlertDialog; -import android.content.DialogInterface; import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import android.widget.Toast; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.constraintlayout.widget.Group; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -20,18 +16,10 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.developer.wang.utils.PermissionUtils; import com.google.gson.Gson; -import com.google.gson.JsonArray; -import com.hjq.permissions.OnPermissionCallback; -import com.hjq.permissions.Permission; -import com.hjq.permissions.XXPermissions; import com.hjx.parent.AccountActivity; import com.hjx.parent.AddStudentActivity; import com.hjx.parent.EditStudentActivity; -import com.hjx.parent.LoginActivity; -import com.hjx.parent.MainActivity; -import com.hjx.parent.QRActivity; import com.hjx.parent.R; import com.hjx.parent.UserActivity; import com.hjx.parent.YinsiActivity; @@ -46,12 +34,7 @@ import org.json.JSONArray; import org.json.JSONObject; import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import butterknife.BindView; -import butterknife.OnClick; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import okhttp3.ResponseBody; diff --git a/build.gradle b/build.gradle index 99fbae6..39893a1 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ buildscript { //okhttp okhttp : 'com.squareup.okhttp3:okhttp:3.8.1', logging : 'com.squareup.okhttp3:logging-interceptor:3.4.1', - utils : 'com.github.wang-developer:AndroidUtilsDemo:1.0.6', +// utils : 'com.github.wang-developer:AndroidUtilsDemo:1.0.6', commons_lang : 'org.apache.commons:commons-lang3:3.7', commons_compress: 'org.apache.commons:commons-compress:1.19', commons_c_lang : 'commons-lang:commons-lang:2.3', @@ -50,7 +50,7 @@ buildscript { eventbus : 'org.greenrobot:eventbus:3.2.0', eventbus2 : 'org.simple:androideventbus:1.0.5.1', glide : 'com.github.bumptech.glide:glide:4.6.1', - permissions : 'com.github.getActivity:XXPermissions:11.6', + permissions : 'com.github.getActivity:XXPermissions:18.5', orcode : 'cn.yipianfengye.android:zxing-library:2.2' // push : 'com.umeng.sdk:push:4.1.0', // litepal : 'org.litepal.android:java:3.0.0', @@ -70,10 +70,15 @@ buildscript { repositories { maven { url 'https://maven.aliyun.com/repository/gradle-plugin' } + maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'https://maven.aliyun.com/repository/google' } - maven { url 'https://maven.aliyun.com/repository/central' } + maven { url 'https://repo.huaweicloud.com/repository/maven-public/' } + //maven { url 'https://mirrors.cloud.tencent.com/nexus/repository/maven-public/' } + google() - maven { url 'https://maven.aliyun.com/repository/jcenter' } + mavenCentral() + gradlePluginPortal() + maven { url "https://jitpack.io" } } dependencies { classpath 'com.android.tools.build:gradle:4.2.2' @@ -91,11 +96,14 @@ buildscript { allprojects { repositories { - maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' } - maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } - maven { url 'https://jitpack.io' } + maven { url 'https://maven.aliyun.com/repository/public' } + maven { url 'https://maven.aliyun.com/repository/google' } + maven { url 'https://repo.huaweicloud.com/repository/maven-public/' } + //maven { url 'https://mirrors.cloud.tencent.com/nexus/repository/maven-public/' } + google() - maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' } + mavenCentral() + maven { url "https://jitpack.io" } } } task clean(type: Delete) { diff --git a/libs/common/src/main/java/com/prws/common/base/BaseActivity.java b/libs/common/src/main/java/com/prws/common/base/BaseActivity.java index 47d0e96..93f788c 100644 --- a/libs/common/src/main/java/com/prws/common/base/BaseActivity.java +++ b/libs/common/src/main/java/com/prws/common/base/BaseActivity.java @@ -26,12 +26,10 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.Lifecycle; -import com.developer.wang.utils.PermissionUtils; import com.prws.common.R; import com.prws.common.net.INetEvent; import com.prws.common.utils.LogUtil; import com.prws.common.utils.ScreenUtils; -import com.prws.common.utils.SharedPreferencesUtil; import com.prws.common.view.LoadingView; import org.simple.eventbus.EventBus; @@ -161,16 +159,6 @@ public abstract class BaseActivity

extends Ap } - private void addNavigationBar() { - //判断是否有浮窗权限 - if (PermissionUtils.requestWindowManager(this)) { - //开启浮窗 -// openFloatWindow(); - } else { - showAlertDialogOfFloatWindow(); - } - } - // public void openFloatWindow() { // if (FloatWindow.get("navigation") == null) { // NavigationBarView navigationBarView = new NavigationBarView(this); diff --git a/libs/common/src/main/java/com/prws/common/config/SettingConfig.java b/libs/common/src/main/java/com/prws/common/config/SettingConfig.java index b4c0fe8..f1f1577 100644 --- a/libs/common/src/main/java/com/prws/common/config/SettingConfig.java +++ b/libs/common/src/main/java/com/prws/common/config/SettingConfig.java @@ -3,8 +3,7 @@ package com.prws.common.config; import android.content.Context; import android.content.SharedPreferences; -import com.developer.wang.utils.SharedPreferencesUtils; -import com.developer.wang.utils.gson.MyGson; +import com.google.gson.Gson; import com.prws.common.CommonApplication; @@ -28,7 +27,7 @@ public class SettingConfig { if (json == null || json.length() == 0) { mInstance = new SettingConfig(); } else { - mInstance = MyGson.buildGson().fromJson(json, SettingConfig.class); + mInstance = new Gson().fromJson(json, SettingConfig.class); } } } @@ -40,7 +39,7 @@ public class SettingConfig { public static void cacheToDisk() { SharedPreferences sp = getSharedPreferences(); SharedPreferences.Editor editor = sp.edit(); - editor.putString("SettingConfig", MyGson.buildGson().toJson(getInstance())); + editor.putString("SettingConfig", new Gson().toJson(getInstance())); editor.commit(); } public static SharedPreferences getSharedPreferences(){ diff --git a/libs/common/src/main/java/com/prws/common/net/DownloadResponseBody.java b/libs/common/src/main/java/com/prws/common/net/DownloadResponseBody.java index bd5c3c3..c26f0c9 100644 --- a/libs/common/src/main/java/com/prws/common/net/DownloadResponseBody.java +++ b/libs/common/src/main/java/com/prws/common/net/DownloadResponseBody.java @@ -1,8 +1,7 @@ package com.prws.common.net; - - -import com.developer.wang.utils.MainHandler; +import android.os.Handler; +import android.os.Looper; import okhttp3.MediaType; import okhttp3.ResponseBody; @@ -53,7 +52,7 @@ public class DownloadResponseBody extends ResponseBody { }catch (final Exception e){ e.printStackTrace(); if (null != mDownloadListener) { - MainHandler.getInstance().post(new Runnable() { + new Handler(Looper.getMainLooper()).post(new Runnable() { @Override public void run() { mDownloadListener.onError(e); diff --git a/libs/common/src/main/java/com/prws/common/utils/LogcatHelper.java b/libs/common/src/main/java/com/prws/common/utils/LogcatHelper.java index b0221cf..b66e83f 100644 --- a/libs/common/src/main/java/com/prws/common/utils/LogcatHelper.java +++ b/libs/common/src/main/java/com/prws/common/utils/LogcatHelper.java @@ -2,9 +2,6 @@ package com.prws.common.utils; import android.content.Context; import android.os.Environment; -import android.util.Log; - -import com.developer.wang.utils.DateUtil; import java.io.BufferedReader; import java.io.File; @@ -12,12 +9,8 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.attribute.BasicFileAttributes; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.Instant; import java.util.Date; public class LogcatHelper { -- 1.9.0