diff --git a/app/src/main/java/com/example/administrator/seven/test/InviteMessageAdapter.java b/app/src/main/java/com/example/administrator/seven/test/InviteMessageAdapter.java
index f451032..3fe8b3e 100644
--- a/app/src/main/java/com/example/administrator/seven/test/InviteMessageAdapter.java
+++ b/app/src/main/java/com/example/administrator/seven/test/InviteMessageAdapter.java
@@ -1,18 +1,18 @@
package com.example.administrator.seven.test;
import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
-
import com.example.administrator.seven.R;
import java.util.List;
+import androidx.recyclerview.widget.RecyclerView;
+
/**
* Created by: xudiwei
diff --git a/app/src/main/java/com/example/administrator/seven/test/RLListPager.java b/app/src/main/java/com/example/administrator/seven/test/RLListPager.java
index 20c6c2e..22145d6 100644
--- a/app/src/main/java/com/example/administrator/seven/test/RLListPager.java
+++ b/app/src/main/java/com/example/administrator/seven/test/RLListPager.java
@@ -1,9 +1,6 @@
package com.example.administrator.seven.test;
import android.content.Context;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.ViewGroup;
@@ -11,6 +8,10 @@ import android.widget.FrameLayout;
import com.example.administrator.seven.R;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
/**
* 日期:2017.01.21
diff --git a/app/src/main/java/com/example/administrator/seven/utils/SpaceItemDecoration.java b/app/src/main/java/com/example/administrator/seven/utils/SpaceItemDecoration.java
index 03aa9a8..c44d91e 100644
--- a/app/src/main/java/com/example/administrator/seven/utils/SpaceItemDecoration.java
+++ b/app/src/main/java/com/example/administrator/seven/utils/SpaceItemDecoration.java
@@ -2,9 +2,10 @@ package com.example.administrator.seven.utils;
import android.graphics.Canvas;
import android.graphics.Rect;
+import android.view.View;
+
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
public class SpaceItemDecoration extends RecyclerView.ItemDecoration {
diff --git a/app/src/main/java/com/example/administrator/seven/utils/ToastUtils.java b/app/src/main/java/com/example/administrator/seven/utils/ToastUtils.java
index 8113d8d..b7aaf8b 100644
--- a/app/src/main/java/com/example/administrator/seven/utils/ToastUtils.java
+++ b/app/src/main/java/com/example/administrator/seven/utils/ToastUtils.java
@@ -10,6 +10,7 @@ import android.widget.Toast;
import com.example.administrator.seven.R;
+
/**
* Created by gh0st on 2017/1/17.
* 吐司工具类
diff --git a/app/src/main/java/com/example/administrator/seven/utils/checkVersionsUtils/ProfileSpUtils.java b/app/src/main/java/com/example/administrator/seven/utils/checkVersionsUtils/ProfileSpUtils.java
index 851fac0..89221f4 100644
--- a/app/src/main/java/com/example/administrator/seven/utils/checkVersionsUtils/ProfileSpUtils.java
+++ b/app/src/main/java/com/example/administrator/seven/utils/checkVersionsUtils/ProfileSpUtils.java
@@ -5,8 +5,6 @@ import android.content.SharedPreferences;
import android.text.TextUtils;
import com.example.administrator.seven.main.entity.LoginBean;
-import com.example.administrator.seven.main.entity.mine.TreeUserEntity;
-import com.example.administrator.seven.main.entity.mine.UserHeadEntity;
import com.google.gson.Gson;
/**
@@ -162,7 +160,7 @@ public class ProfileSpUtils {
*
* @return SP存储的用户资料
*/
- public LoginBean getUserProfie() {
+ public LoginBean getUserProfie() {
String userStr = sharedPreferences.getString(KEY_USER, "");
if (TextUtils.isEmpty(userStr)) {
return new LoginBean();
@@ -182,3 +180,4 @@ public class ProfileSpUtils {
}
}
+
diff --git a/app/src/main/java/com/example/administrator/seven/view/StatusBarView.java b/app/src/main/java/com/example/administrator/seven/view/StatusBarView.java
index d9086f5..4432718 100644
--- a/app/src/main/java/com/example/administrator/seven/view/StatusBarView.java
+++ b/app/src/main/java/com/example/administrator/seven/view/StatusBarView.java
@@ -3,10 +3,11 @@ package com.example.administrator.seven.view;
import android.content.Context;
import android.content.res.Resources;
import android.os.Build;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
+import androidx.annotation.Nullable;
+
/**
* Time: 2020/8/12
* Author: jianbo
diff --git a/app/src/main/java/com/example/administrator/seven/widget/CircleImageView.java b/app/src/main/java/com/example/administrator/seven/widget/CircleImageView.java
index efedd84..f34c12e 100644
--- a/app/src/main/java/com/example/administrator/seven/widget/CircleImageView.java
+++ b/app/src/main/java/com/example/administrator/seven/widget/CircleImageView.java
@@ -16,12 +16,13 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
-import androidx.annotation.ColorRes;
-import androidx.annotation.DrawableRes;
import android.util.AttributeSet;
import com.example.administrator.seven.R;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+
/**
*
* 自定义圆形用户头像
diff --git a/app/src/main/java/com/example/administrator/seven/widget/ItemView.java b/app/src/main/java/com/example/administrator/seven/widget/ItemView.java
index 9709c2d..0f79ab8 100644
--- a/app/src/main/java/com/example/administrator/seven/widget/ItemView.java
+++ b/app/src/main/java/com/example/administrator/seven/widget/ItemView.java
@@ -2,9 +2,6 @@ package com.example.administrator.seven.widget;
import android.content.Context;
import android.content.res.TypedArray;
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
@@ -14,6 +11,10 @@ import android.widget.TextView;
import com.example.administrator.seven.R;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
* ItemView
* (๑• . •๑)
diff --git a/app/src/main/java/com/example/administrator/seven/widget/TitleBar.java b/app/src/main/java/com/example/administrator/seven/widget/TitleBar.java
index 2deb389..f02ca2a 100644
--- a/app/src/main/java/com/example/administrator/seven/widget/TitleBar.java
+++ b/app/src/main/java/com/example/administrator/seven/widget/TitleBar.java
@@ -1,10 +1,6 @@
package com.example.administrator.seven.widget;
import android.content.Context;
-import androidx.annotation.ColorRes;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
import android.util.AttributeSet;
import android.view.View;
import android.widget.Button;
@@ -14,6 +10,11 @@ import android.widget.TextView;
import com.example.administrator.seven.R;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+
/**
* Created by Administrator on 2016/12/23.
@@ -94,8 +95,8 @@ public class TitleBar extends RelativeLayout implements View.OnClickListener {
* 设置暗黑模式
*/
public void setDarkTheme() {
- mRootView.findViewById(R.id.rl_main).setBackgroundColor(ContextCompat.getColor(getContext(),R.color.colorLightBlack));
- mTvtitle.setTextColor(ContextCompat.getColor(getContext(),R.color.colorWhile));
+ mRootView.findViewById(R.id.rl_main).setBackgroundColor(ContextCompat.getColor(getContext(), R.color.colorLightBlack));
+ mTvtitle.setTextColor(ContextCompat.getColor(getContext(), R.color.colorWhile));
mIvLeftBtn.setImageResource(R.mipmap.nav_white_back);
}
diff --git a/app/src/main/java/com/example/administrator/seven/wxapi/WXPayEntryActivity.java b/app/src/main/java/com/example/administrator/seven/wxapi/WXPayEntryActivity.java
index 98a3166..d526d53 100644
--- a/app/src/main/java/com/example/administrator/seven/wxapi/WXPayEntryActivity.java
+++ b/app/src/main/java/com/example/administrator/seven/wxapi/WXPayEntryActivity.java
@@ -3,7 +3,6 @@ package com.example.administrator.seven.wxapi;
import android.content.Intent;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.widget.TextView;
import com.example.administrator.seven.base.BaseActivity;
@@ -12,6 +11,8 @@ import com.tencent.mm.opensdk.modelbase.BaseResp;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
+import androidx.annotation.Nullable;
+
/**
* 微信支付回调页
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xhdpi/to_down.png b/app/src/main/res/drawable-xhdpi/to_down.png
new file mode 100644
index 0000000..90c2a64
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/to_down.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..4df1894
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/layout/activity_json_data.xml b/app/src/main/res/layout/activity_json_data.xml
new file mode 100644
index 0000000..6a66059
--- /dev/null
+++ b/app/src/main/res/layout/activity_json_data.xml
@@ -0,0 +1,23 @@
+
+