From 3b4bc95d6f10116ee70f81cfe23a71ea19fd86d6 Mon Sep 17 00:00:00 2001 From: TrillGates Date: Fri, 27 Aug 2021 10:51:06 +0800 Subject: [PATCH] update step count setup. --- .../java/com/ic/sport/PedometerActivity.java | 7 ++-- .../com/ic/sport/adapter/PedSetupAdapter.java | 2 +- .../pedometer/PedSetupDialogFragment.java | 35 ++++++++++++------- .../fragment/pedometer/PedSetupFragment.java | 14 +++----- .../com/ic/sport/model/PedometerModel.java | 1 - .../sport/presenter/PedometerPresenter.java | 2 -- .../main/java/com/ic/sport/util/SPUtils.java | 4 +-- .../res/layout/dialog_ped_setup_layout.xml | 10 +++--- app/src/main/res/values-en/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 12 files changed, 45 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/ic/sport/PedometerActivity.java b/app/src/main/java/com/ic/sport/PedometerActivity.java index b1ab4d3..b830e2d 100644 --- a/app/src/main/java/com/ic/sport/PedometerActivity.java +++ b/app/src/main/java/com/ic/sport/PedometerActivity.java @@ -99,7 +99,7 @@ public class PedometerActivity extends AppCompatActivity @Override public void onDialogUpdate(int type, int value) { - ((PedSetupFragment) myAdapter.getFragment(0)).updateSetuUpValue(type, value); + ((PedSetupFragment) myAdapter.getFragment(0)).updateSetUpValue(type, value); switch (type) { case 0: pedometerModel.syncPedHeightSetting(value); @@ -107,8 +107,11 @@ public class PedometerActivity extends AppCompatActivity break; case 1: pedometerModel.syncPedWeightSetting(value); - SPUtils.setPedWighttSP(getApplicationContext(), value); + SPUtils.setPedWightSP(getApplicationContext(), value); break; + case 2: + //不需要通知远程服务 + SPUtils.setPedTargetSP(getApplicationContext(), value); } } diff --git a/app/src/main/java/com/ic/sport/adapter/PedSetupAdapter.java b/app/src/main/java/com/ic/sport/adapter/PedSetupAdapter.java index 5be3b0b..2793958 100644 --- a/app/src/main/java/com/ic/sport/adapter/PedSetupAdapter.java +++ b/app/src/main/java/com/ic/sport/adapter/PedSetupAdapter.java @@ -43,7 +43,7 @@ public class PedSetupAdapter extends RecyclerView.Adapter limil = new ArrayMap<>(); - private final String[] UNIT_RES = new String[2]; - private final int[] VALUE_CURR = new int[2]; + private final String[] UNIT_RES = new String[3]; + private final int[] VALUE_CURR = new int[3]; private NoticeDialogListener mListener; @@ -66,13 +66,20 @@ public class PedSetupDialogFragment extends DialogFragment { } VALUE_CURR[0] = SPUtils.getPedHeightSP(mContext); - VALUE_CURR[1] = SPUtils.getPedWighttSP(mContext); + VALUE_CURR[1] = SPUtils.getPedWeightSP(mContext); + VALUE_CURR[2] = SPUtils.getPedTargetSP(mContext); + + ICLogger.d("height value ==> " + VALUE_CURR[0]); + ICLogger.d("weight value ==> " + VALUE_CURR[0]); + ICLogger.d("petTarget value ==> " + VALUE_CURR[0]); UNIT_RES[0] = getString(R.string.tips_height_unit); UNIT_RES[1] = getString(R.string.tips_weight_unit); + UNIT_RES[2] = getString(R.string.step_unit); limil.put(0, new int[]{30, 250}); limil.put(1, new int[]{15, 150}); + limil.put(2, new int[]{3000, 50000}); } @Override @@ -85,20 +92,20 @@ public class PedSetupDialogFragment extends DialogFragment { } View popView = inflater.inflate(R.layout.dialog_ped_setup_layout, container); - numberPicker = (WheelView) popView.findViewById(R.id.dialog_value_picker); + numberPicker = popView.findViewById(R.id.dialog_value_picker); setNumberPicker(limil.get(mCurrType)[0], limil.get(mCurrType)[1], UNIT_RES[mCurrType], VALUE_CURR[mCurrType]); - ImageView bt = (ImageView) popView.findViewById(R.id.dialog_picker_ok); + ImageView bt = popView.findViewById(R.id.dialog_picker_ok); bt.setOnClickListener(v -> { - mListener.onDialogUpdate(mCurrType,limil.get(mCurrType)[0]+numberPicker.getCurrentItem()); + mListener.onDialogUpdate(mCurrType, + limil.get(mCurrType)[0] + numberPicker.getCurrentItem()); dismiss(); }); - ImageView cancel = (ImageView) popView.findViewById(R.id.dialog_picker_cancel); + ImageView cancel = popView.findViewById(R.id.dialog_picker_cancel); cancel.setOnClickListener(v -> dismiss()); - return popView; } @@ -106,9 +113,13 @@ public class PedSetupDialogFragment extends DialogFragment { numberPicker.setAdapter(new NumericWheelAdapter(numberMin, numberMax)); numberPicker.setLabel(label); numberPicker.setCyclic(true); - numberPicker.TEXT_SIZE = (int) spToPx(65); - numberPicker.ITEM_TEXT_SIZE = (int) spToPx(42); - + if (mCurrType == 2) { + numberPicker.TEXT_SIZE = (int) spToPx(42); + numberPicker.ITEM_TEXT_SIZE = (int) spToPx(32); + } else { + numberPicker.TEXT_SIZE = (int) spToPx(65); + numberPicker.ITEM_TEXT_SIZE = (int) spToPx(42); + } numberPicker.setCurrentItem(numberDefault - numberMin); } diff --git a/app/src/main/java/com/ic/sport/fragment/pedometer/PedSetupFragment.java b/app/src/main/java/com/ic/sport/fragment/pedometer/PedSetupFragment.java index 04450b7..0e65f17 100644 --- a/app/src/main/java/com/ic/sport/fragment/pedometer/PedSetupFragment.java +++ b/app/src/main/java/com/ic/sport/fragment/pedometer/PedSetupFragment.java @@ -3,6 +3,9 @@ package com.ic.sport.fragment.pedometer; import android.content.Context; import android.graphics.Rect; import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; @@ -10,10 +13,6 @@ import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - import com.ic.sport.R; import com.ic.sport.adapter.PedSetupAdapter; @@ -78,16 +77,13 @@ public class PedSetupFragment extends Fragment { mSetupRv.setAdapter(setupAdapter); } - private OnPedSetupItemClickListener listener = pos -> { - if (pos == 2) { - return; - } + private final OnPedSetupItemClickListener listener = pos -> { FragmentManager fm = getChildFragmentManager(); PedSetupDialogFragment alertDialog = PedSetupDialogFragment.newInstance(pos); alertDialog.show(fm, "PedSetupDialog"); }; - public void updateSetuUpValue(int type, int value) { + public void updateSetUpValue(int type, int value) { setupAdapter.notifyUpdateValue(type, value); } diff --git a/app/src/main/java/com/ic/sport/model/PedometerModel.java b/app/src/main/java/com/ic/sport/model/PedometerModel.java index 338561a..854f9af 100644 --- a/app/src/main/java/com/ic/sport/model/PedometerModel.java +++ b/app/src/main/java/com/ic/sport/model/PedometerModel.java @@ -111,7 +111,6 @@ public class PedometerModel extends AndroidViewModel { public void syncPedWeightSetting(int weight) { pedometerPresenter.syncPedWeightSetting(weight); } - public static class Factory extends ViewModelProvider.NewInstanceFactory { @NonNull diff --git a/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java b/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java index 11f03f6..086ffc2 100644 --- a/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java +++ b/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java @@ -4,7 +4,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.ServiceConnection; import android.os.IBinder; -import android.os.RemoteException; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; @@ -15,7 +14,6 @@ import com.ic.aidl.ped.RecordParcelable; import com.ic.sport.util.IcLog; import com.ic.sport.util.ServiceUtil; -import java.net.FileNameMap; import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/app/src/main/java/com/ic/sport/util/SPUtils.java b/app/src/main/java/com/ic/sport/util/SPUtils.java index 9f3a6ce..b5e0bd6 100644 --- a/app/src/main/java/com/ic/sport/util/SPUtils.java +++ b/app/src/main/java/com/ic/sport/util/SPUtils.java @@ -18,7 +18,7 @@ public class SPUtils { return getSp(context).getInt(Ped_Height, 170); } - public static int getPedWighttSP(Context context) { + public static int getPedWeightSP(Context context) { return getSp(context).getInt(Ped_Weight, 75); } @@ -34,7 +34,7 @@ public class SPUtils { } } - public static void setPedWighttSP(Context context,int weight) { + public static void setPedWightSP(Context context, int weight) { SharedPreferences.Editor editor = getSp(context).edit(); if (editor != null) { editor.putInt(Ped_Weight, weight); diff --git a/app/src/main/res/layout/dialog_ped_setup_layout.xml b/app/src/main/res/layout/dialog_ped_setup_layout.xml index c7f2ecd..b8a9697 100644 --- a/app/src/main/res/layout/dialog_ped_setup_layout.xml +++ b/app/src/main/res/layout/dialog_ped_setup_layout.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="260dp" android:layout_gravity="center" - android:layout_marginLeft="26dp" /> + android:layout_marginLeft="60dp" /> @@ -27,8 +27,8 @@ feet completed aim: + step diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 658a251..0e9c428 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -43,5 +43,6 @@ 英尺 已达到目标步数 目標: + step diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index a0b5710..57ed0ec 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -44,4 +44,5 @@ 英尺 已达到目标步数 目标: + step diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a0b5710..57ed0ec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -44,4 +44,5 @@ 英尺 已达到目标步数 目标: + step -- 2.17.1