From: TrillGates <williamtrillgates@gmail.com>
Date: Thu, 16 Sep 2021 02:19:58 +0000 (+0800)
Subject: fixed progress issues.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=eee16bb281f8b825c271e589340f1fc7f1383fe8;p=ichardware.git

fixed progress issues.
---

diff --git a/app/src/main/java/com/ic/sport/fragment/pedometer/PedMainFragment.java b/app/src/main/java/com/ic/sport/fragment/pedometer/PedMainFragment.java
index 1693423..50386f3 100644
--- a/app/src/main/java/com/ic/sport/fragment/pedometer/PedMainFragment.java
+++ b/app/src/main/java/com/ic/sport/fragment/pedometer/PedMainFragment.java
@@ -3,16 +3,8 @@ package com.ic.sport.fragment.pedometer;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
-import android.graphics.Color;
-import android.graphics.LinearGradient;
-import android.graphics.Shader;
 import android.graphics.Typeface;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-
 import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -20,16 +12,16 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import com.ic.iclooger.ICLogger;
 import com.ic.sport.App;
 import com.ic.sport.R;
 import com.ic.sport.databinding.FragmentPedMainBinding;
 import com.ic.sport.util.SPUtils;
-import com.ic.sport.widget.ring.Ring;
 import com.ic.sport.widget.ring.RingProgress;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * A simple {@link Fragment} subclass.
  */
@@ -91,6 +83,7 @@ public class PedMainFragment extends Fragment {
         targetValue = SPUtils.getPedTargetSP(mApp.getApplicationContext());
         pedMainBinding.setPedTarget(getResources().getString(R.string.target_text) +
                 targetValue);
+        ICLogger.d("targetValue ==> " + targetValue);
         pedMainBinding.ringProgress.setMaxProgress(targetValue);
         return pedMainBinding.getRoot();
     }
@@ -120,11 +113,7 @@ public class PedMainFragment extends Fragment {
 
     public void updatePedNumber(int number) {
         Log.d(TAG, "number == > " + number);
-        int value = (int) (number * 0.01);
-        if (value < 1) {
-            value = 1;
-        }
-        setupRingProgress(value);
+        setupRingProgress(number);
         setupRingProgressNumberTv(mLastNum, number);
         this.mLastNum = number;
     }
diff --git a/app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java b/app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java
index fbb9709..b4b7986 100644
--- a/app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java
+++ b/app/src/main/java/com/ic/sport/widget/WidgetImageTextLayout.java
@@ -22,6 +22,7 @@ public class WidgetImageTextLayout extends LinearLayout {
         this(context, null);
     }
 
+
     public WidgetImageTextLayout(Context context, @Nullable AttributeSet attrs) {
         this(context, attrs, 0);
     }
@@ -34,6 +35,7 @@ public class WidgetImageTextLayout extends LinearLayout {
         mValueTv = (TextView) view.findViewById(R.id.widget_image_value);
         mUnitTv = (TextView) view.findViewById(R.id.widget_image_unit);
         mIconIv = (ImageView) view.findViewById(R.id.widget_image_icon);
+
     }
 
     private void updateWidgetImageText(String value, String unit, int iconResId,int color) {
diff --git a/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java b/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java
index d3d464c..d821f2e 100644
--- a/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java
+++ b/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java
@@ -1,28 +1,20 @@
 package com.ic.sport.widget.ring;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.LinearGradient;
 import android.graphics.Paint;
-import android.graphics.PaintFlagsDrawFilter;
-import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Shader;
 import android.util.AttributeSet;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
-import android.view.animation.LinearInterpolator;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;