diff --git a/app/build.gradle b/app/build.gradle index 4f4a977..f98f133 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,4 +55,8 @@ dependencies { implementation project(':todaystepcounterlib') //打分ui compile 'com.github.CB-ysx:CBRatingBar:3.0.1' + //蛛网 + implementation 'me.panpf:spider-web-score-view:1.0.1' + //折线 + implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3' } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java index 8044150..3d7791d 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java @@ -1,12 +1,12 @@ package com.example.ninefourone.nutritionmaster.modules; import android.annotation.SuppressLint; -import android.graphics.Color; import android.os.Bundle; +import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; -import android.widget.Toast; +import android.widget.TextView; import com.ToxicBakery.viewpager.transforms.CubeOutTransformer; import com.cb.ratingbar.CBRatingBar; @@ -15,12 +15,15 @@ import com.example.ninefourone.nutritionmaster.adapter.HomePagerAdapter; import com.example.ninefourone.nutritionmaster.base.BaseActivity; import com.example.ninefourone.nutritionmaster.ui.NoScrollViewPager; import com.flyco.tablayout.SlidingTabLayout; +import com.github.siyamed.shapeimageview.CircularImageView; import com.mxn.soul.flowingdrawer_core.ElasticDrawer; import com.mxn.soul.flowingdrawer_core.FlowingDrawer; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; +import me.panpf.swsv.CircularLayout; +import me.panpf.swsv.SpiderWebScoreView; public class MainActivity extends BaseActivity { @@ -36,6 +39,14 @@ public class MainActivity extends BaseActivity { FrameLayout barCover; @BindView(R.id.cb_rating_bar) CBRatingBar cbRatingBar; + @BindView(R.id.toolbar_user_avatar) + CircularImageView toolbarUserAvatar; + @BindView(R.id.drawer_user_avatar) + CircularImageView drawerUserAvatar; + @BindView(R.id.spiderWeb_mainActivity) + SpiderWebScoreView spiderWebMainActivity; + @BindView(R.id.layout_mainActivity_circular) + CircularLayout layoutMainActivityCircular; @Override @@ -62,7 +73,7 @@ public class MainActivity extends BaseActivity { // Logger.i("openRatio=" + openRatio + " ,offsetPixels=" + offsetPixels); } }); - + initSpiderView(); initViewPager(); } @@ -107,4 +118,21 @@ public class MainActivity extends BaseActivity { } + /** + * 初始化蛛网图 + */ + private void initSpiderView() { + float[] scores = {9.1f, 5.5f, 7.7f, 8.9f, 4.6f}; + String[] flags = {"糖分", "淡水", "蛋白质", "维生素", "矿物质"}; + spiderWebMainActivity.setScores(10f, scores); + layoutMainActivityCircular.removeAllViews(); + for (String flag : flags) { + TextView scoreTextView = (TextView) LayoutInflater.from(getBaseContext()).inflate(R.layout.score, + layoutMainActivityCircular, false); + scoreTextView.setText(flag); + layoutMainActivityCircular.addView(scoreTextView); + } + } + + } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java index 32b76ea..f7af5e5 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java @@ -36,17 +36,12 @@ import me.itangqi.waveloadingview.WaveLoadingView; public class BodyInformationFragment extends BaseFragment { - @BindView(R.id.progress_1) - RoundCornerProgressBar progress1; + Unbinder unbinder; @BindView(R.id.step_text_view) TextView stepTextView; @BindView(R.id.waveLoadingView) WaveLoadingView waveLoadingView; - @BindView(R.id.button_10) - Button button10; - @BindView(R.id.button_80) - Button button80; private int stepCount = 0; private static final int REFRESH_STEP_WHAT = 0; @@ -66,14 +61,7 @@ public class BodyInformationFragment extends BaseFragment { @Override public void initView(Bundle state) { - progress1.setProgressColor(Color.parseColor("#ed3b27")); - progress1.setProgressBackgroundColor(Color.parseColor("#808080")); - progress1.setMax(70); - progress1.setProgress(15); - - initStepCounter(); -// Logger.d(((MainActivity)getActivity()).getStepCount()); } @@ -130,18 +118,6 @@ public class BodyInformationFragment extends BaseFragment { stepTextView.setText(stepCount + "步"); } - @OnClick({R.id.button_10, R.id.button_80}) - public void onViewClicked(View view) { - switch (view.getId()) { - case R.id.button_10: - waveLoadingView.setProgressValue(10); - break; - case R.id.button_80: - waveLoadingView.setProgressValue(80); - break; - } - } - /** * 定时器，修改UI diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 13598b5..4769883 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -234,6 +234,31 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/body_information_fragment.xml b/app/src/main/res/layout/body_information_fragment.xml index 6b3b974..3a7e91f 100644 --- a/app/src/main/res/layout/body_information_fragment.xml +++ b/app/src/main/res/layout/body_information_fragment.xml @@ -6,33 +6,18 @@ android:gravity="center" android:orientation="vertical"> - - - - - - - - - -