tt/Xuewang365OSNeutral
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.9.7

Browse Source 
fix:
update:优化锁屏界面
This commit is contained in:
tongtongstudio
2024-10-08 09:49:01 +08:00
parent 5a64967c57
commit 750af19db6
62 changed files with 2137 additions and 2020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/uiui/zyos/activity/ExitActivity.java
View File

@@ -72,19 +72,20 @@ public class ExitActivity extends BaseDataBindingActivity {
}
});
mBinding.btDel.setOnClickListener(new View.OnClickListener() {
mBinding.tvDel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
mBinding.tvHint.setText("");
mBinding.icv.clearInputContent();
}
});
mBinding.btConfirm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
checkPasswd();
// mBinding.tvHint.setText("");
// mBinding.icv.clearInputContent();
finish();
}
});
// mBinding.btConfirm.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// checkPasswd();
// }
// });
mBinding.bt0.setOnClickListener(view1 -> add(mBinding.icv, "0"));
mBinding.bt1.setOnClickListener(view1 -> add(mBinding.icv, "1"));

19
app/src/main/java/com/uiui/zyos/activity/PasswordActivity.java
View File

@@ -59,19 +59,20 @@ public class PasswordActivity extends BaseDataBindingActivity {
}
});
mBinding.btDel.setOnClickListener(new View.OnClickListener() {
mBinding.tvDel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
mBinding.tvHint.setText("");
mBinding.icv.clearInputContent();
}
});
mBinding.btConfirm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
checkPasswd();
// mBinding.tvHint.setText("");
// mBinding.icv.clearInputContent();
finish();
}
});
// mBinding.btConfirm.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// checkPasswd();
// }
// });
mBinding.bt0.setOnClickListener(view1 -> add(mBinding.icv, "0"));
mBinding.bt1.setOnClickListener(view1 -> add(mBinding.icv, "1"));

2
app/src/main/java/com/uiui/zyos/activity/homework/HomeworkDetailsActivity.java
View File

@@ -74,7 +74,7 @@ public class HomeworkDetailsActivity extends BaseMvvmActivity<HomeworkDetailsVie
default:
case 0:
mViewDataBinding.tvStatu.setBackground(getDrawable(R.drawable.homework_unfinished_background));
mViewDataBinding.tvStatu.setTextColor(getColor(R.color.black));
mViewDataBinding.tvStatu.setTextColor(getColor(R.color.unfinish_text));
mViewDataBinding.tvStatu.setText("未完成");
break;
case 1:

20
app/src/main/java/com/uiui/zyos/activity/homework/HomeworkViewModel.java
View File

@@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData;
import com.trello.rxlifecycle4.RxLifecycle;
import com.trello.rxlifecycle4.android.ActivityEvent;
import com.trello.rxlifecycle4.android.FragmentEvent;
import com.uiui.zyos.BuildConfig;
import com.uiui.zyos.base.mvvm.BaseViewModel;
import com.uiui.zyos.bean.BaseResponse;
import com.uiui.zyos.bean.HomeworkBean;
@@ -16,7 +16,6 @@ import com.uiui.zyos.utils.ActivationUtil;
import com.uiui.zyos.utils.TimeUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@@ -56,13 +55,16 @@ public class HomeworkViewModel extends BaseViewModel<ActivityHomeworkBinding, Ac
Log.e("getHomework", "onNext: " + listBaseResponse);
ArrayList<HomeworkBean> homeworkBeans = listBaseResponse.data;
ArrayList<HomeworkBean> filter = (ArrayList<HomeworkBean>) homeworkBeans.stream().filter(new Predicate<HomeworkBean>() {
@Override
public boolean test(HomeworkBean homeworkBean) {
return TimeUtils.isHomeworkToday(homeworkBean.getCreated_at());
}
}).collect(Collectors.toList());
mHomeworkBeanListData.setValue(filter);
if (!BuildConfig.DEBUG) {
homeworkBeans = (ArrayList<HomeworkBean>) homeworkBeans.stream().filter(new Predicate<HomeworkBean>() {
@Override
public boolean test(HomeworkBean homeworkBean) {
return TimeUtils.isHomeworkToday(homeworkBean.getCreated_at());
}
}).collect(Collectors.toList());
}
mHomeworkBeanListData.setValue(homeworkBeans);
}
@Override

4
app/src/main/java/com/uiui/zyos/activity/main/MainViewModel.java
View File

@@ -85,8 +85,12 @@ public class MainViewModel extends BaseViewModel<ActivityMainBinding, ActivityEv
if (!activation) {
return;
}
AppUsedTimeUtils.getInstance().setEndTime(System.currentTimeMillis());
String packagename = AppUsedTimeUtils.getInstance().getAppPackageName();
if (BuildConfig.APPLICATION_ID.equals(packagename)) {
return;
}
Log.e(TAG, "onRestart packagename == " + packagename);
if (!TextUtils.isEmpty(packagename)) {
Log.e(TAG, "onRestart: " + ApkUtils.getAppNameByPackage(getCtx(), packagename));

3
app/src/main/java/com/uiui/zyos/adapter/HomeworkAdapter.java
View File

@@ -19,6 +19,7 @@ import com.uiui.zyos.activity.homework.HomeworkDetailsActivity;
import com.uiui.zyos.bean.HomeworkBean;
import com.uiui.zyos.utils.ScreenUtils;
import com.uiui.zyos.utils.TimeUtils;
import com.uiui.zyos.view.HorizontalDecorationWithoutFirst;
import com.uiui.zyos.view.HorizontalItemDecoration;
import java.util.List;
@@ -115,7 +116,7 @@ public class HomeworkAdapter extends RecyclerView.Adapter<HomeworkAdapter.Holder
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(root.getContext());
linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
rv_pic.setLayoutManager(linearLayoutManager);
rv_pic.addItemDecoration(new HorizontalItemDecoration(ScreenUtils.dp2px(root.getContext().getResources(), 8), root.getContext()));
rv_pic.addItemDecoration(new HorizontalDecorationWithoutFirst(8, root.getContext()));
}
}
}

5
app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java
View File

@@ -47,7 +47,9 @@ import com.uiui.zyos.utils.ScreenUtils;
import com.uiui.zyos.utils.TimeUtils;
import com.uiui.zyos.utils.Utils;
import com.uiui.zyos.view.EquallyDividedItemDecoration;
import com.uiui.zyos.view.HorizontalDecorationWithoutFirst;
import com.uiui.zyos.view.RecyclerViewSpacesItemDecoration;
import com.uiui.zyos.view.VerticalDecorationWithoutFirst;
import java.util.ArrayList;
import java.util.HashMap;
@@ -181,7 +183,8 @@ public class UserFragment extends BaseMvvmFragment<UserViewModel, FragmentUserBi
mHomeworkAdapter = new HomeworkAdapter();
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(mContext);
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mViewDataBinding.rvHomework.addItemDecoration(new EquallyDividedItemDecoration(1, ScreenUtils.dp2px(getResources(), 4)));
// mViewDataBinding.rvHomework.addItemDecoration(new EquallyDividedItemDecoration(1, ScreenUtils.dp2px(getResources(), 4)));
mViewDataBinding.rvHomework.addItemDecoration(new VerticalDecorationWithoutFirst(0, 16, mContext));
mViewDataBinding.rvHomework.setLayoutManager(linearLayoutManager);
mViewDataBinding.rvHomework.setAdapter(mHomeworkAdapter);
}

6
app/src/main/java/com/uiui/zyos/utils/AppUsedTimeUtils.java
View File

@@ -13,6 +13,7 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import com.tencent.mmkv.MMKV;
import com.uiui.zyos.BuildConfig;
import com.uiui.zyos.bean.BaseResponse;
import com.uiui.zyos.config.CommonConfig;
import com.uiui.zyos.network.NetInterfaceManager;
@@ -184,6 +185,9 @@ public class AppUsedTimeUtils {
return;
}
String packageName = getAppPackageName();
if (BuildConfig.APPLICATION_ID.equals(packageName)) {
return;
}
long time = getStartTime();
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("app_package", packageName);
@@ -201,7 +205,7 @@ public class AppUsedTimeUtils {
@Override
public void onNext(BaseResponse baseResponse) {
Log.e("SendRunningApp", "onSubscribe: " + baseResponse);
Log.e("SendRunningApp", "onNext: " + baseResponse);
}
@Override

2
app/src/main/java/com/uiui/zyos/utils/TimeUtils.java
View File

@@ -63,7 +63,7 @@ public class TimeUtils {
} catch (ParseException e) {
e.printStackTrace();
}
SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日 HH:mm");
SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
return sdf.format(date);
}

41
app/src/main/java/com/uiui/zyos/view/HorizontalDecorationWithoutFirst.java Normal file
View File

@@ -0,0 +1,41 @@
package com.uiui.zyos.view;
import android.content.Context;
import android.graphics.Rect;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
/**
* 定义水平方向的距离
*/
public class HorizontalDecorationWithoutFirst extends RecyclerView.ItemDecoration {
private int space;//定义2个Item之间的距离
public HorizontalDecorationWithoutFirst(int space, Context mContext) {
this.space = dip2px(space, mContext);
}
@Override
public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
int position = parent.getChildAdapterPosition(view);
int totalCount = parent.getAdapter().getItemCount();
if (position == 0) {//第一个
outRect.left = 0;
outRect.right = space / 2;
} else if (position == totalCount - 1) {//最后一个
outRect.left = space / 2;
outRect.right = 0;
} else {//中间其它的
outRect.left = space / 2;
outRect.right = space / 2;
}
}
public int dip2px(float dpValue, Context context) {
final float scale = context.getResources().getDisplayMetrics().density;
return (int) (dpValue * scale + 0.5f);
}
}

45
app/src/main/java/com/uiui/zyos/view/VerticalDecorationWithoutFirst.java Normal file
View File

@@ -0,0 +1,45 @@
package com.uiui.zyos.view;
import android.content.Context;
import android.graphics.Rect;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
/**
* 定义水平方向的距离
*/
public class VerticalDecorationWithoutFirst extends RecyclerView.ItemDecoration {
private int space;//定义2个Item之间的距离
private int marginSpace = 0;//定义2个Item之间的距离
public VerticalDecorationWithoutFirst(int marginSpace, int space, Context mContext) {
this.space = dip2px(space, mContext);
this.marginSpace = dip2px(marginSpace, mContext);
}
@Override
public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
int position = parent.getChildAdapterPosition(view);
int totalCount = parent.getAdapter().getItemCount();
if (position == 0) {//第一个
outRect.top = 0;
outRect.bottom = space / 2;
} else if (position == totalCount - 1) {//最后一个
outRect.top = space / 2;
outRect.bottom = 0;
} else {//中间其它的
outRect.top = space / 2;
outRect.bottom = space / 2;
}
outRect.left = marginSpace;
outRect.right = marginSpace;
}
public int dip2px(float dpValue, Context context) {
final float scale = context.getResources().getDisplayMetrics().density;
return (int) (dpValue * scale + 0.5f);
}
}