diff --git a/app/src/main/java/com/abbidot/tracker/widget/FencesPolygonView.kt b/app/src/main/java/com/abbidot/tracker/widget/FencesPolygonView.kt index 813e759..13fb7b0 100644 --- a/app/src/main/java/com/abbidot/tracker/widget/FencesPolygonView.kt +++ b/app/src/main/java/com/abbidot/tracker/widget/FencesPolygonView.kt @@ -238,7 +238,7 @@ class FencesPolygonView : View { 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.drawRect(mPathRectF, mFillPaint) +// it.drawRect(mPathRectF, mFillPaint) } } @@ -657,6 +657,14 @@ class FencesPolygonView : View { return super.onTouchEvent(event) } + private fun getTempRect(touchPointTag: String, tempPoint: Point) { + when (touchPointTag) { + mTageA->{ + + } + } + } + private fun crossProduct(p1: PointBean, p2: PointBean, p3: PointBean): Float { val x1 = p2.x - p1.x val y1 = p2.y - p1.y diff --git a/app/src/main/java/com/abbidot/tracker/widget/calender/DayV2Adapter.java b/app/src/main/java/com/abbidot/tracker/widget/calender/DayV2Adapter.java index f668871..5047e34 100644 --- a/app/src/main/java/com/abbidot/tracker/widget/calender/DayV2Adapter.java +++ b/app/src/main/java/com/abbidot/tracker/widget/calender/DayV2Adapter.java @@ -5,9 +5,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; +import com.abbidot.baselibrary.util.Utils; import com.abbidot.tracker.R; import com.hjq.toast.Toaster; @@ -53,6 +55,7 @@ public class DayV2Adapter extends RecyclerView.Adapter return datas; } + @NonNull @Override public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { View view = View.inflate(parent.getContext(), R.layout.item_horizontal_calender_day, null); @@ -63,31 +66,36 @@ public class DayV2Adapter extends RecyclerView.Adapter @Override public void onBindViewHolder(ViewHolder holder, final int 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); - switch (week) { - case 0: - holder.tvWeek.setText("Sun"); - break; - case 1: - holder.tvWeek.setText("Mon"); - break; - case 2: - holder.tvWeek.setText("Tue"); - break; - case 3: - holder.tvWeek.setText("Wed"); - break; - case 4: - holder.tvWeek.setText("Thu"); - break; - case 5: - holder.tvWeek.setText("Fri"); - break; - case 6: - holder.tvWeek.setText("Sat"); - break; - } + holder.tvWeek.setText(week); + // int week = item.getWeek(); + // switch (week) { + // case 0: + // holder.tvWeek.setText("Sun"); + // break; + // case 1: + // holder.tvWeek.setText("Mon"); + // break; + // case 2: + // holder.tvWeek.setText("Tue"); + // break; + // case 3: + // holder.tvWeek.setText("Wed"); + // break; + // case 4: + // holder.tvWeek.setText("Thu"); + // break; + // case 5: + // holder.tvWeek.setText("Fri"); + // break; + // case 6: + // holder.tvWeek.setText("Sat"); + // break; + // } // GradientDrawable p = (GradientDrawable) holder.tvDay.getBackground(); // if (p != null) { // if (item.isSelected()) { @@ -138,7 +146,7 @@ public class DayV2Adapter extends RecyclerView.Adapter holder.rootView.setBackgroundResource(pressShapeSelectorId); 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);