From b7ec7b5127fc6449cdb8e04618653bb1ce6e8ebe Mon Sep 17 00:00:00 2001
From: TrillGates <williamtrillgates@gmail.com>
Date: Fri, 10 Dec 2021 15:32:43 +0800
Subject: [PATCH] =?utf8?q?=E9=9A=90=E8=97=8F=E4=BA=86=E5=8E=86=E5=8F=B2?=
 =?utf8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ic/sport/PedometerActivity.java  |   4 +++-
 .../com/ic/sport/adapter/FragmentAdapter.java |   4 ++--
 .../ic/sport/adapter/IndicatorAdapter.java    |   3 +--
 .../ic/sport/widget/ring/RingProgress.java    |   4 ++--
 .../main/res/layout/activity_pedometer.xml    |   2 +-
 app/src/main/res/mipmap-mdpi/icon_arrow.png   | Bin 2187 -> 2287 bytes
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/ic/sport/PedometerActivity.java b/app/src/main/java/com/ic/sport/PedometerActivity.java
index b830e2d..087dc15 100644
--- a/app/src/main/java/com/ic/sport/PedometerActivity.java
+++ b/app/src/main/java/com/ic/sport/PedometerActivity.java
@@ -118,7 +118,9 @@ public class PedometerActivity extends AppCompatActivity
     private void initViewPage() {
         myAdapter = new FragmentAdapter(getSupportFragmentManager(), getLifecycle());
         myViewPager2.setAdapter(myAdapter);
-        myViewPager2.setCurrentItem(1);
+        myViewPager2.postDelayed(() -> {
+            myViewPager2.setCurrentItem(1);
+        }, 500);
         myViewPager2.registerOnPageChangeCallback(currentItemUpdater);
     }
 
diff --git a/app/src/main/java/com/ic/sport/adapter/FragmentAdapter.java b/app/src/main/java/com/ic/sport/adapter/FragmentAdapter.java
index b2f5d52..500e507 100644
--- a/app/src/main/java/com/ic/sport/adapter/FragmentAdapter.java
+++ b/app/src/main/java/com/ic/sport/adapter/FragmentAdapter.java
@@ -7,7 +7,6 @@ import androidx.lifecycle.Lifecycle;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
 import com.ic.sport.fragment.pedometer.PedMainFragment;
-import com.ic.sport.fragment.pedometer.PedRecordFragment;
 import com.ic.sport.fragment.pedometer.PedSetupFragment;
 
 import java.util.ArrayList;
@@ -21,7 +20,8 @@ public class FragmentAdapter extends FragmentStateAdapter {
         super(fragmentManager, lifecycle);
         arrayList.add(PedSetupFragment.newInstance());
         arrayList.add(PedMainFragment.newInstance());
-        arrayList.add(PedRecordFragment.newInstance());
+        //李峰军的不需要显示记录，这是个独立的分支，放心修改
+        //arrayList.add(PedRecordFragment.newInstance());
     }
 
 
diff --git a/app/src/main/java/com/ic/sport/adapter/IndicatorAdapter.java b/app/src/main/java/com/ic/sport/adapter/IndicatorAdapter.java
index bd93c33..6af9c4c 100644
--- a/app/src/main/java/com/ic/sport/adapter/IndicatorAdapter.java
+++ b/app/src/main/java/com/ic/sport/adapter/IndicatorAdapter.java
@@ -10,7 +10,7 @@ import com.ic.sport.databinding.ItemIndicatorLayoutBinding;
 
 public class IndicatorAdapter extends RecyclerView.Adapter<IndicatorAdapter.IndicatorHolder> {
 
-    private boolean[] stateList = new boolean[]{false, true, false};
+    private boolean[] stateList = new boolean[]{false, true};
 
     private int oldCheckIndex=1;
 
@@ -19,7 +19,6 @@ public class IndicatorAdapter extends RecyclerView.Adapter<IndicatorAdapter.Indi
             stateList[index] = true;
             stateList[oldCheckIndex] =false;
             oldCheckIndex = index;
-
             notifyDataSetChanged();
         }
     }
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 d8a6274..917a6f2 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
@@ -114,7 +114,7 @@ public class RingProgress extends View {
         TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.CircleProgress);
         neiYuanColor = typedArray.getColor(R.styleable.CircleProgress_neiYuanColor, getTransparentColor());
         ringRadius = (int) typedArray.getDimension(R.styleable.CircleProgress_ringRadius, -1);
-        ringWidth = (int) typedArray.getDimension(R.styleable.CircleProgress_ringWidth, 22);
+        ringWidth = (int) typedArray.getDimension(R.styleable.CircleProgress_ringWidth, 20);
         ringColor = typedArray.getColor(R.styleable.CircleProgress_ringColor,
                 ContextCompat.getColor(getContext(), R.color.top_color2));
         ringProgressColor = typedArray.getColor(R.styleable.CircleProgress_ringProgressColor,
@@ -229,7 +229,7 @@ public class RingProgress extends View {
 
     private void drawTopIcon(Canvas canvas) {
         int left = centerX - topIcon.getWidth() / 2;
-        int top = centerY - topIcon.getHeight() / 2 - ringRadius;
+        int top = centerY - topIcon.getHeight() / 2 - ringRadius + 2;
         canvas.drawBitmap(topIcon, left, top, mPaint);
     }
 
diff --git a/app/src/main/res/layout/activity_pedometer.xml b/app/src/main/res/layout/activity_pedometer.xml
index 2f3e1d9..83810e4 100644
--- a/app/src/main/res/layout/activity_pedometer.xml
+++ b/app/src/main/res/layout/activity_pedometer.xml
@@ -31,7 +31,7 @@
         android:id="@+id/ped_main_view_page"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="40dp"
+        android:layout_marginTop="36dp"
         android:layout_marginBottom="20dp" />
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/mipmap-mdpi/icon_arrow.png b/app/src/main/res/mipmap-mdpi/icon_arrow.png
index 24a6712cda7ee567cfb400bcfc581f67c9d99eb5..6142167ed8844ea08f1d608593617a492cf972f5 100644
GIT binary patch
delta 1482
zcmV;*1vUDM5$_QpiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPb0c){J
z6apYMG&nRdIXFc%IXE&gF-1c`IYT%(I50UxHZValH#bI;egYgIH8eOhF*!IyH90sk
zF)>9$K{-P>IXEymL^d!%GB-Cylez+7lbQk|lR*O-lU@QLlYj$3e`0TT@Bjb>8c9S!
zRCwC7S6gfpRT%!x%<Rn0Zrg23Q^Cp#;)54xL3F8zF^Gu<FM+6um>3egMDW2EO^iJF
z;^je1G)5Cmj3G7R8&QHth|mXuSQFZ=#2aEv%cZ4-(r(+?+syGhv(vPc?skXZzxj6O
zoS8lUcmCV?M|8;Le<<K0k{IHr2?mPDNehlJQNwEiiLBIg05=jTVgs?9SWMKRBx6KB
zaT1U}dLq(QMD4kV9CHQN09Pp|1}X>@D*~%{xs`a1Xe{%nnqNZPPi5ORS-fOoq=Vz#
z9CugJq0Jnq-D>cruABJtHgSx2wSw|;gw%h2BHkgI<|Uw%f4k6;g+&Ttg(1DYoZHD;
zQCz!N#GAxkVnsy)YUdum9T`pWcR#1r;rfYMYkv?!R}+|0UXVts4)?ntz^=EbHPza!
zQxiIMYD&3-7zSnYLe720c)g*T)r6Qv2vKW)PAn93`gw5ynnB-NQYzo?Aer`RR?(>R
z(is;6e-)9<e|Y{lgsdTU_*uq}CTRg3UK^FaUhN77+5dYYkKO|gP94i(;<AJ;1VZq5
zjaUhlby?}~2iw9#dxWZbzjtt8*BB0dIF1wFPGWN0MMROPj)hG;Zz3U#AUK{4V?(J(
zm;(6;iQkXVkYg?+-I#hRj+z<<GoO(2t|7NHBl*4}e{gT5LNS*p1#KH`=n;YLeGdLU
zo<|`!j$#gI-x5cnPD5U)sLW!4E-$s~o8C&i!ofXZEzq!7$D-RJFe1R^b1wSR1q}UD
zU{nh<F4a*J*C7Swv4j{_1m56Pa?UbFhnhkogzw*(s4+AwXw=b?GGWo|nPCqDe-<%v
zwg{ahe-bz8h|v<FGKs8FuIQ-L>ilXP1E+X8($~^cIWLLnC?hw2$C)8l<ulBf@GY_L
zy)pcDIE!^#<5;%FLj5AWoI8?=K<%8yA^OsJoTh)rFS1g)0fAXbulN`y;CaH23AX@@
zo_F!bksOk3CYqN;d;(>p)~MuXyH-QILGyQCe<D!Y^=zgp4pab6j!cs?nAE0C7h3bx
z6d+UXs7<c45UbZpE^wuPa?EsrrpCJP{odDGK;DsvSOWDeI&NQY;g&Tf>K0aPIWp?*
z8RF*IcRcD#J#JHH?5YZ<vRoA-H9t7&;^^)PzaHc!JuFRGSpQNSD<88_ThAKHXT9=K
zf7q`Gq>20Hx|{bSN6r}^87dp@E8^#GCUJbv1O`tRv1FBr2e!qrdQ)t=AXU!8UloB)
zVtbf6pwh7Cu!Hmu4oh+tBRrT?v_JTA9PQ7<V4HNCl=Gjc@H&m4Z5j?!4VC%R2OS*i
zm|z72Ze45A?6tW2X&X^0&sU+Ga?uryf5)|;oBcX$cj2+wwG$fd*bt@i8mxZOM$A-A
z&HU#;Y4>8!1@!eB1yPTPy!<8SUJOpD>dt~kZM57OVL3Kv{wShRQSHu4tpM;v9;1?F
z#Y9xtJ>>mCwf`=Xz>>R6v_4|f{7lt479bhQfV+quWd~zMlz&P*T+P9x(yF0Ff4^cJ
zLb`}g;5Q)AE8Yvv6ECRLuIfaT(+DAhfvX2pq%4xnm|a*^O?ZMh`#*HWXM?rVQxmS=
zi_dMMjl|LGsQhTKW>>{mvssqdOuS3vu2m~jEf=h@dFIZmA;2yd!#wJD1})o1#7GF;
z>e-JSIBR9;^=>%y+p!4PS;FhiKuIkfq>g%Tcqn*1Zy^%F<D-F(PqJe;6cx@d4w}y8
kWxi<nSysMP{!f4b06AL3YWlAS5dZ)H07*qoM6N<$g2~&fdH?_b

delta 1315
zcmV+;1>E}Y5sMKaiBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bn2{kU0duiR
z6atf110j=t0vnSX10s{W0$-CJ0w$9^0~(Va0wt4p13`bW_@`O`00gc{L_t(|+RRv8
zY!p=#{_f1|ba!c~QnpZ}+crgk0<EQzhVT;-r2-l;F+xI2l$huPqKR)l>AO#&yg&k)
zXo%%W@sFQ`T2N@T{3w({Qs_?<Ezn}O-Q8|y=6cTb*0i|p?##B0CpnoryLZlfbN<g2
z$U;&|97TV*coBV)?>~_hRdjipcs=oQ;tJv-wLM1MLwt?+Eb(z$gt{#h;&st3kpqcb
z01*hCmOF^wAYPlxa}$pfpCkT=xcL>W*Uk&jL0KgN(teVb9}+J^e$+|)CV@KX8Bnu~
zXmJ@bY54*1YnWa-K>QW~OQ!o%OJ^biQ$owu832C+CA0NoCmPABA*C4xbB1^+W|poK
zZy-(GNvomL5(a?@((>3WfPs3)G164{Ux4<>C1Mk#rF^Clvq$`{eN#-<ENdvoT$L2s
zPtpBJuM&Un7;~@1Wjf|Otoa4DnM`-e1*Gx}OS+;GohLefBo4=xc!&T+>r52R*Zii0
zm7IU4CZ68u2Mp7XpN*j9;4oSbkKoc*2@Lhye#CH&+xeb^W~d+b_|^5ufP;ZP3x8a<
zkc>HyjzrxvA<SK%dlj{(3=K#0s&@}p)6M%H%E1)6*JHyB2@L*b<6f_Yk^2rMGl99K
zI>N=C%(vJ;{8QFYlV31Q_0NT{cx3>(DR6(|OcLEcr{GY$vR~D13n5Zv<SL3WH1Y0r
z`NVBygNX%?8qfnkpn%H!=}~mIr(lmsSSg@(OAuwt1G$P@$ADJk14z(!v1wQvdO)~*
z<LoH<yDa>AJmKz1B_tND2*4mMip;jCVL;`Xb{u`@z8g8QI}Vv)yw+)YdZ~7b>fnE0
zjthXV*IGt#i%fX=YZDuG&q3816AK^9sI3ZPQgfA-5<?C~1|7ui5+F+wAWH8U0*FCt
z8f#7vKzepSy3WoYl#FHV(F(JAT(C$(I4&_pUu|0=D<GTvhW82;V0<+Sgv;z>*~n0B
zXUTtU;P7Pt97U|5@t34GSt{;e=udwK7Dbt)=;w66nR^jA^}KQ&MWtE4f0%dlWdgM2
z?V_BVdvsXhm+um|_+<ijdn|;hu2rr!QMWCKWt)PSUuk62tfF34Y)3v(#+n!=|GNB5
z0vEnWp!55r>vxaT1W>y*=tf^@bxvTIt{Q4O*yR^c*Le!@o0h8?UfX1@>c)QpG&~=o
zq#5>FY=2-tC)9M{D_dV6Ah$cm2u#YAP~B)^_4Y8;v!GWnjNyd#vgqmJqV0Q>Xi4JM
zPbqi3WUYxcFN9IQJ>&+1M>;nuA~z@8e!t%mQWVkMkS>WDSk)9n-LoOTjoSX(XcuDA
zAb7>k?A7*p9FhuY@j@Ntk5hkxHZRWx?Esz-WH#=q_WF?&tqq`}-b6)%Z!k~;r2Wqr
zG^wvXM7O&!yL5=aygFs-*daP5iVV;0ZL<ib?Lo_kGzSZj|HYs<-rER}Kk<f*#O*T(
zhGlPj5KP+HUV-Xo^y*+>x`}13Couh<k7JYxH>=~ArPE-dz1faqw9HfODfKV{r&OD}
zOC3H*k3jgDmtq)Rl?_bJCunJo^tP%aJx-)iZkyEhA#Nd5qT{0dZCE6F1`(CH9_jrp
ZzyOgc#8e|^GVcHY002ovPDHLkV1m$!XrKT9

-- 
2.17.1