ABBIDOT_APP/Abbidot_Android
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改运动和睡眠星期几系统适配，日期改为双位数

Browse Source
This commit is contained in:
yezhiqiu
2026-02-05 14:11:44 +08:00
parent 0409b50712
commit 7aab33bc12
2 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/abbidot/tracker/widget/FencesPolygonView.kt
View File

@@ -238,7 +238,7 @@ class FencesPolygonView : View {
it.drawBitmap(this, mCPoint.x - width / 2, mCPoint.y - height / 2, null) it.drawBitmap(this, mCPoint.x - width / 2, mCPoint.y - height / 2, null)
it.drawBitmap(this, mBPoint.x - width / 2, mBPoint.y - height / 2, null) it.drawBitmap(this, mBPoint.x - width / 2, mBPoint.y - height / 2, null)
} }
it.drawRect(mPathRectF, mFillPaint) // it.drawRect(mPathRectF, mFillPaint)
} }
} }
@@ -657,6 +657,14 @@ class FencesPolygonView : View {
return super.onTouchEvent(event) return super.onTouchEvent(event)
} }
private fun getTempRect(touchPointTag: String, tempPoint: Point) {
when (touchPointTag) {
mTageA->{
}
}
}
private fun crossProduct(p1: PointBean, p2: PointBean, p3: PointBean): Float { private fun crossProduct(p1: PointBean, p2: PointBean, p3: PointBean): Float {
val x1 = p2.x - p1.x val x1 = p2.x - p1.x
val y1 = p2.y - p1.y val y1 = p2.y - p1.y

58
app/src/main/java/com/abbidot/tracker/widget/calender/DayV2Adapter.java
View File

@@ -5,9 +5,11 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.abbidot.baselibrary.util.Utils;
import com.abbidot.tracker.R; import com.abbidot.tracker.R;
import com.hjq.toast.Toaster; import com.hjq.toast.Toaster;
@@ -53,6 +55,7 @@ public class DayV2Adapter extends RecyclerView.Adapter<DayV2Adapter.ViewHolder>
return datas; return datas;
} }
@NonNull
@Override @Override
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = View.inflate(parent.getContext(), R.layout.item_horizontal_calender_day, null); View view = View.inflate(parent.getContext(), R.layout.item_horizontal_calender_day, null);
@@ -63,31 +66,36 @@ public class DayV2Adapter extends RecyclerView.Adapter<DayV2Adapter.ViewHolder>
@Override @Override
public void onBindViewHolder(ViewHolder holder, final int position) { public void onBindViewHolder(ViewHolder holder, final int position) {
DateItem item = datas.get(position); DateItem item = datas.get(position);
int week = item.getWeek();
String dayTime = item.getYear() + "-" + item.getMonth() + "-" + item.getDay();
String week = Utils.Companion.stringToDate(dayTime, Utils.DATE_FORMAT_PATTERN_CN,
Utils.WEEK_FORMAT_PATTERN);
holder.tvWeek.setTextSize(12); holder.tvWeek.setTextSize(12);
switch (week) { holder.tvWeek.setText(week);
case 0: // int week = item.getWeek();
holder.tvWeek.setText("Sun"); // switch (week) {
break; // case 0:
case 1: // holder.tvWeek.setText("Sun");
holder.tvWeek.setText("Mon"); // break;
break; // case 1:
case 2: // holder.tvWeek.setText("Mon");
holder.tvWeek.setText("Tue"); // break;
break; // case 2:
case 3: // holder.tvWeek.setText("Tue");
holder.tvWeek.setText("Wed"); // break;
break; // case 3:
case 4: // holder.tvWeek.setText("Wed");
holder.tvWeek.setText("Thu"); // break;
break; // case 4:
case 5: // holder.tvWeek.setText("Thu");
holder.tvWeek.setText("Fri"); // break;
break; // case 5:
case 6: // holder.tvWeek.setText("Fri");
holder.tvWeek.setText("Sat"); // break;
break; // case 6:
} // holder.tvWeek.setText("Sat");
// break;
// }
// GradientDrawable p = (GradientDrawable) holder.tvDay.getBackground(); // GradientDrawable p = (GradientDrawable) holder.tvDay.getBackground();
// if (p != null) { // if (p != null) {
// if (item.isSelected()) { // if (item.isSelected()) {
@@ -138,7 +146,7 @@ public class DayV2Adapter extends RecyclerView.Adapter<DayV2Adapter.ViewHolder>
holder.rootView.setBackgroundResource(pressShapeSelectorId); holder.rootView.setBackgroundResource(pressShapeSelectorId);
holder.tvWeek.setTextColor(weekTextColor); holder.tvWeek.setTextColor(weekTextColor);
holder.tvDay.setText(item.getDay() + ""); holder.tvDay.setText(Utils.Companion.fill2Digits(item.getDay()));
// holder.tvPoint.setVisibility(item.isCurrent() ? View.VISIBLE : View.INVISIBLE); // holder.tvPoint.setVisibility(item.isCurrent() ? View.VISIBLE : View.INVISIBLE);