chudinhbka@gmail.com / LifeLog_Android

Browse Code »

Commit 5520a4b27df178a212e405aeaad6b3bbda41cd3d

Authored by Dinh Chu 2017-11-17 05:04:29 +0900

1 parent 13594f58ae

Exists in master and in 1 other branch

update

Showing 17 changed files with 401 additions and 88 deletions Inline Diff

.idea/misc.xml
.idea/modules.xml
app/build.gradle
app/src/main/java/com/dinhcv/lifelogpedometer/activity/HistoryContentFragment.java
app/src/main/java/com/dinhcv/lifelogpedometer/activity/HistoryDetailFragment.java
app/src/main/java/com/dinhcv/lifelogpedometer/activity/InputConfirmCodeActivity.java
app/src/main/java/com/dinhcv/lifelogpedometer/activity/LoginActivity.java
app/src/main/java/com/dinhcv/lifelogpedometer/activity/RegisterActivity.java
app/src/main/java/com/dinhcv/lifelogpedometer/activity/TopDateFragment.java
app/src/main/java/com/dinhcv/lifelogpedometer/activity/TopTodayFragment.java
app/src/main/java/com/dinhcv/lifelogpedometer/activity/WelcomeActivity.java
app/src/main/java/com/dinhcv/lifelogpedometer/model/structure/home/NoticeInfo.java
app/src/main/java/com/dinhcv/lifelogpedometer/portal/ApiServices.java
app/src/main/java/com/dinhcv/lifelogpedometer/portal/LLAPIManager.java
app/src/main/res/layout/fragment_history_content.xml
build.gradle
gradle/wrapper/gradle-wrapper.properties

.idea/misc.xml

Diff comments View file @ 5520a4b

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
         <list size="4">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
         <list size="4">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
 </project>

.idea/modules.xml

Diff comments View file @ 5520a4b

1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<project version="4">	2	<project version="4">
3	<component name="ProjectModuleManager">	3	<component name="ProjectModuleManager">
4	<modules>	4	<modules>
5	<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />	5	<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
6	<module fileurl="file://$PROJECT_DIR$/lifelog_android.iml" filepath="$PROJECT_DIR$/lifelog_android.iml" />	6	<module fileurl="file://$PROJECT_DIR$/lifelog_android.iml" filepath="$PROJECT_DIR$/lifelog_android.iml" />
7	<module fileurl="file://$PROJECT_DIR$/lifelogpedometer.iml" filepath="$PROJECT_DIR$/lifelogpedometer.iml" />	7	<module fileurl="file://D:\Project\Git\lifelog_android\lifelogpedometer.iml" filepath="D:\Project\Git\lifelog_android\lifelogpedometer.iml" />
8	</modules>	8	</modules>
9	</component>	9	</component>
10	</project>	10	</project>

app/build.gradle

Diff comments View file @ 5520a4b

 apply plugin: 'com.android.application'
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "com.dinhcv.lifelogpedometer"
         minSdkVersion 19
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         // Enabling multidex support.
         multiDexEnabled true
     }
+    flavorDimensions "default"
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
     signingConfigs {
         dev {
             storeFile file("../keystores/...")
             storePassword 'android'
             keyAlias 'androiddebugkey'
             keyPassword 'android'
         }
         product {
             storeFile file("..keystores/...")
             storePassword 'android'
             keyAlias 'androiddebugkey'
             keyPassword 'android'
         }
     }
     productFlavors {
         dev {
             applicationId "com.dinhcv.lifelogpedometer"
             applicationIdSuffix "dev"
             minSdkVersion 19
             buildConfigField 'String', 'BASE_URL', '"http://clover.timesfun.jp:9001/"'
         }
         product {
             applicationId "com.dinhcv.lifelogpedometer"
             minSdkVersion 19
             buildConfigField 'String', 'BASE_URL', '"http://clover.timesfun.jp:9001/"'
         }
     }
 }
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     // Retrofit
     // JSON Parsing
     compile 'com.squareup.retrofit2:converter-gson:2.1.0'
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.github.j4velin.colorpicker:colorpicker:1.2.3'
     compile 'com.github.j4velin.EazeGraph:EazeGraph:1.0.2'
     compile 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
     compile 'com.android.support:design:25.3.1'
     compile 'com.github.PhilJay:MPAndroidChart:v3.0.2'
     compile 'com.google.android.gms:play-services:11.0.4'
     compile 'com.google.code.gson:gson:2.7'
     compile 'com.squareup.retrofit2:converter-gson:2.1.0'
     compile 'de.hdodenhof:circleimageview:2.1.0'
     compile 'com.jakewharton:butterknife:8.6.0'
     testCompile 'junit:junit:4.12'
     // Retrofit
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'de.hdodenhof:circleimageview:2.1.0'
     compile 'com.jakewharton:butterknife:8.6.0'
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.android.support:support-v4:25.3.1'
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:multidex:1.0.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
 }

app/src/main/java/com/dinhcv/lifelogpedometer/activity/HistoryContentFragment.java

Diff comments View file @ 5520a4b

 package com.dinhcv.lifelogpedometer.activity;
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.dinhcv.lifelogpedometer.R;
 import com.dinhcv.lifelogpedometer.interfaces.LLAPIManagerListener;
 import com.dinhcv.lifelogpedometer.model.structure.history.HistoryInfo;
+import com.dinhcv.lifelogpedometer.portal.ApiServices;
 import com.dinhcv.lifelogpedometer.portal.LLAPIManager;
 import com.dinhcv.lifelogpedometer.utils.Const;
 import com.dinhcv.lifelogpedometer.utils.DayAxisValueFormatter;
 import com.dinhcv.lifelogpedometer.utils.Debug;
 import com.dinhcv.lifelogpedometer.utils.Utils;
 import com.github.mikephil.charting.charts.BarChart;
 import com.github.mikephil.charting.components.XAxis;
 import com.github.mikephil.charting.components.YAxis;
 import com.github.mikephil.charting.data.BarData;
 import com.github.mikephil.charting.data.BarDataSet;
 import com.github.mikephil.charting.data.BarEntry;
 import com.github.mikephil.charting.interfaces.datasets.IBarDataSet;
 import org.json.JSONException;
 import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import static com.github.mikephil.charting.utils.ColorTemplate.rgb;
 public class HistoryContentFragment extends FragmentBase {
     @BindView(R.id.btn_left_date)
     ImageButton btnLeftDate;
     @BindView(R.id.btn_right_date)
     ImageButton btnRightDate;
     @BindView(R.id.tv_date)
     TextView tvDate;
     @BindView(R.id.tv_week_day)
     TextView tvWeekDay;
     private Button btnFace;
     private Button btnTwitter;
     private Button btnLine;
     private Button btnEmail;
     private Button btnOther;
     @BindView(R.id.tv_steps)
     TextView tvStep;
     @BindView(R.id.tv_remainingStep)
     TextView tvRemain;
     @BindView(R.id.tv_stepRateDone)
     TextView tvRateDone;
     @BindView(R.id.tv_smallRemain)
     TextView tvSmallRemain;
     @BindView(R.id.tv_stepGoal)
     TextView tvGoal;
     @BindView(R.id.tv_caloConsumned)
     TextView tvCaloConsumned;
     @BindView(R.id.tv_distance)
     TextView tvDistance;
     @BindView(R.id.tv_time)
     TextView tvTime;
     @BindView(R.id.ll_bike)
     LinearLayout llBike;
     @BindView(R.id.ll_walking)
     LinearLayout llWalking;
     @BindView(R.id.ll_running)
     LinearLayout llRunning;
     @BindView(R.id.btn_oneDay)
     Button btnOneDay;
     @BindView(R.id.btn_oneWeek)
     Button btnOneWeek;
     @BindView(R.id.btn_oneMonth)
     Button btnOneMonth;
     @BindView(R.id.btn_threeMonth)
     Button btnThreeMonth;
     @BindView(R.id.btn_sixMonth)
     Button btnSixMonth;
     // bar chart
     private BarChart mBarChart;
     private List<String> dateList;
     private String[] mParties;
     private Integer[] mStep;
     private Date mAnaDate;
     private Calendar mCalendar;
     private int mAnaDay;
     private int mAnaMonth;
     private int mAnaYear;
     private HistoryInfo mDataModWalking = new HistoryInfo();
     private HistoryInfo mDataModRunning = new HistoryInfo();
     private HistoryInfo mDataModBike = new HistoryInfo();
     private HistoryInfo mDataCurrent = new HistoryInfo();
     private Const.DATA_TYPE dataType;
     private Const.STEP_TYPE stepType;
     private Context mContext;
     private View mRootView;
     private HistoryFragment mHistoryFragment;
     public void setRootFragment(HistoryFragment frag) {
         this.mHistoryFragment = frag;
     }
     @Override
     public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
                              final Bundle savedInstanceState) {
         mRootView = inflater.inflate(R.layout.fragment_history_content, null);
         ButterKnife.bind(this, mRootView);
         mContext = getActivity();
         initView(mRootView);
         initData();
         return mRootView;
     }
     private void initView(View view) {
         btnFace = (Button) view.findViewById(R.id.btn_face);
         btnTwitter = (Button) view.findViewById(R.id.btn_twitter);
         btnLine = (Button) view.findViewById(R.id.btn_line);
         btnEmail = (Button) view.findViewById(R.id.btn_email);
         btnOther = (Button) view.findViewById(R.id.btn_other);
         mBarChart = (BarChart) view.findViewById(R.id.chart);
     }
     /**
      * Show date picker dialog
      */
     private void handleAnaDatePicker() {
         new DatePickerDialog(mContext, new DatePickerDialog.OnDateSetListener() {
             @Override
             public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
                 mCalendar = Calendar.getInstance();
                 mCalendar.set(year, monthOfYear, dayOfMonth);
                 mAnaYear = year;
                 mAnaMonth = monthOfYear;
                 mAnaDay = dayOfMonth;
                 Date date = mCalendar.getTime();
                 tvDate.setText(Utils.dateToStringFormatDayMonthYearJp(date));
                 tvWeekDay.setText(Utils.getWeekdayFromDate(date));
                 mAnaDate = date;
                 getHistoryData(dataType, mAnaDate);
             }
         }, mAnaYear, mAnaMonth, mAnaDay).show();
     }
     /**
      * init data for
      */
     private void initData() {
         mCalendar = Calendar.getInstance();
         mCalendar.setTime(new Date());
         mAnaDate = mCalendar.getTime();
         mAnaYear = mCalendar.get(Calendar.YEAR);
         mAnaMonth = mCalendar.get(Calendar.MONTH);
         mAnaDay = mCalendar.get(Calendar.DAY_OF_MONTH);
         tvDate.setText(Utils.dateToStringFormatDayMonthYearJp(mAnaDate));
         tvWeekDay.setText(Utils.getWeekdayFromDate(mAnaDate));
         dataType = Const.DATA_TYPE.ONE_DAY;
         stepType = Const.STEP_TYPE.WALKING;
         updateUiType();
         updateUiStepType(false, true, false);
         getHistoryData(dataType, mAnaDate);
     }
     private void updateUiType() {
         if (dataType == Const.DATA_TYPE.ONE_DAY) {
             setButtonSelected(true, false, false, false, false);
         } else if (dataType == Const.DATA_TYPE.ONE_WEEK) {
             setButtonSelected(false, true, false, false, false);
         } else if (dataType == Const.DATA_TYPE.ONE_MONTH) {
             setButtonSelected(false, false, true, false, false);
         } else if (dataType == Const.DATA_TYPE.THREE_MONTH){
             setButtonSelected(false, false, false, true, false);
         } else if (dataType == Const.DATA_TYPE.SIX_MONTH){
             setButtonSelected(false, false, false, false, true);
         }
     }
     private void setButtonSelected(boolean b1, boolean b2, boolean b3, boolean b4, boolean b5 ) {
         btnOneDay.setSelected(b1);
         btnOneWeek.setSelected(b2);
         btnOneMonth.setSelected(b3);
         btnThreeMonth.setSelected(b4);
         btnSixMonth.setSelected(b5);
     }
     private void updateUiStepType(boolean b1, boolean b2, boolean b3) {
         llBike.setSelected(b1);
         llWalking.setSelected(b2);
         llRunning.setSelected(b3);
     }
     private void getHistoryData(Const.DATA_TYPE dataType, Date toDate){
         Date fromDate = Utils.getFromDate(mAnaDate, dataType);
         showDialog(mContext);
-        LLAPIManager.history(fromDate, toDate, new LLAPIManagerListener() {
+        ApiServices.history(fromDate, toDate, new LLAPIManagerListener() {
             @Override
             public void onError(Error error) {
                 Debug.error("Get data history error");
                 hiddenDialog();
                 showDialogNotData();
             }
             @Override
             public void onSuccess(String json) {
                 Debug.error("Get data history success");
                 hiddenDialog();
                 loadDataDone(json);
             }
             @Override
             public void onSuccess(JSONObject object) {
                 Debug.error("Get data history success");
                 hiddenDialog();
             }
         });
     }
     private void showDialogNotData(){
         showAlerDialog(mContext, getResources().getString(R.string.can_not_get_data));
     }
     private void loadDataDone(String jsonString) {
         JSONObject jsonObject = null;
         try {
             jsonObject = new JSONObject(jsonString);
             int status = jsonObject.optInt("status");
             if (status == 1) {
                 JSONObject jsonObject1 = jsonObject.optJSONObject("result");
                 JSONObject jsonMod1 = jsonObject1.getJSONObject("mode_1");
                 JSONObject jsonMod2 = jsonObject1.getJSONObject("mode_2");
                 JSONObject jsonMod3 = jsonObject1.getJSONObject("mode_3");
                 addDataModWalking(jsonMod1);
                 addDataModRunning(jsonMod2);
                 addDataModBike(jsonMod3);
             }
         } catch (JSONException e) {
             e.printStackTrace();
             mDataModWalking = new HistoryInfo();
             mDataModRunning = new HistoryInfo();;
             mDataModBike = new HistoryInfo();;
         }
         if (stepType == Const.STEP_TYPE.WALKING){
             mDataCurrent = mDataModWalking;
         }else if (stepType == Const.STEP_TYPE.RUNNING){
             mDataCurrent = mDataModRunning;
         }else {
             mDataCurrent = mDataModBike;
         }
         updateUI();
     }
     private void updateUI(){
         // get data server
         tvGoal.setText(getResources().getString(R.string.step_unit, mDataCurrent.getTaget()));
         tvStep.setText(getResources().getString(R.string.step_unit, mDataCurrent.getSteps()));
         tvSmallRemain.setText(getResources().getString(R.string.step_unit_1, mDataCurrent.getStepRemain()));
         tvRemain.setText(getResources().getString(R.string.step_unit, mDataCurrent.getStepRemain()));
         tvRateDone.setText(getResources().getString(R.string.percent_unit, Utils.convert2String2Decimal(mDataCurrent.getCompletePercent())));
         tvCaloConsumned.setText(getResources().getString(R.string.kcal_unit, Utils.convert2String2Decimal(mDataCurrent.getKcal())));
         tvDistance.setText(getResources().getString(R.string.distance_unit, Utils.convert2String2Decimal(mDataCurrent.getDistance())));
         tvTime.setText(getResources().getString(R.string.time_unit, Utils.convertTimeStringFromString(mDataCurrent.getTime())));
         // update bar
         if (mDataCurrent.getDataChart() != null && mDataCurrent.getDataChart().size() == 24) {
             updateBars();
         }
     }
     private void updateBars() {
         dateList = new ArrayList<>();
         List<Integer> stepList = new ArrayList<>();
         stepList = mDataCurrent.getDataChart();
         for (int i = 0; i < 24; i++){
             dateList.add(String.valueOf(i));
         }
         mStep = stepList.toArray(new Integer[0]);
         mParties = dateList.toArray(new String[0]);
         initGraph();
     }
     private void initGraph(){
         mBarChart.setDrawBarShadow(false);
         mBarChart.setDrawValueAboveBar(true);
         // if more than 60 entries are displayed in the chart, no values will be
         // drawn
         mBarChart.setMaxVisibleValueCount(60);
         mBarChart.getDescription().setEnabled(false);
         // scaling can now only be done on x- and y-axis separately
         mBarChart.setPinchZoom(false);
         mBarChart.setDrawGridBackground(false);
         // mChart.setDrawYLabels(false);
         DayAxisValueFormatter xValueFormatter = new DayAxisValueFormatter(dateList);
         XAxis xAxis = mBarChart.getXAxis();
         xAxis.setLabelRotationAngle(0);
         xAxis.setPosition(XAxis.XAxisPosition.TOP);
         xAxis.setDrawGridLines(true);
         xAxis.setLabelCount(10);
         xAxis.setTextColor(Color.WHITE);
         xAxis.setValueFormatter(xValueFormatter);
         YAxis leftAxis = mBarChart.getAxisLeft();
         leftAxis.setDrawLabels(false);
         leftAxis.setDrawGridLines(false);
         leftAxis.setAxisMinimum(0f);
         leftAxis.setAxisMaximum(10000f);
         leftAxis.setDrawZeroLine(false);
         leftAxis.setEnabled(false);
         mBarChart.setDrawValueAboveBar(false);
         mBarChart.getAxisRight().setEnabled(false);
         // set auto scale min max
         mBarChart.setAutoScaleMinMaxEnabled(true);
         mBarChart.notifyDataSetChanged();
         // Set enimate y
         mBarChart.animateY(2000);
         setData();
         mBarChart.getLegend().setEnabled(false);
     }
     private void setData() {
         ArrayList<String> xVals = new ArrayList<>();
         for (int i = 0; i < mStep.length; i++) {
             xVals.add(mParties[i % mStep.length]);
         }
         ArrayList<BarEntry> yVals1 = new ArrayList<>();
         for (int i = 0; i < mStep.length; i++) {
             float val = (float) (mStep[i]*1);
             yVals1.add(new BarEntry(i, val));
         }
         BarDataSet set1;
         if (mBarChart.getData() != null && mBarChart.getData().getDataSetCount() > 0) {
             set1 = (BarDataSet)mBarChart.getData().getDataSetByIndex(0);
             set1.setValues(yVals1);
             mBarChart.getData().notifyDataChanged();
             mBarChart.notifyDataSetChanged();
         } else {
             ArrayList<Integer> colors = new ArrayList<>();
             int[] MATERIAL_COLORS = {rgb("#40CDEF")};
             for (int c : MATERIAL_COLORS)
                 colors.add(c);
             set1 = new BarDataSet(yVals1, null);
             set1.setColors(colors);
             ArrayList<IBarDataSet> dataSets = new ArrayList<>();
             dataSets.add(set1);
             BarData data = new BarData(dataSets);
             data.setValueTextSize(10f);
             mBarChart.setData(data);
         }
     }
     private void addDataModWalking(JSONObject jsonObject){
         if (jsonObject == null) return;
         mDataModWalking.setTaget(jsonObject.optInt("target"));
         mDataModWalking.setSteps(jsonObject.optInt("steps"));
         mDataModWalking.setStepRemain(jsonObject.optInt("step_remain"));
         mDataModWalking.setCompletePercent(jsonObject.optDouble("complete_percent"));
         mDataModWalking.setTime(jsonObject.optInt("time"));
         mDataModWalking.setDistance(jsonObject.optInt("distance"));
         mDataModWalking.setKcal(jsonObject.optInt("kcal"));
         JSONObject dataChart = jsonObject.optJSONObject("data_chart");
         ArrayList<Integer> dataChartList = new ArrayList<>();
         dataChartList.add(dataChart.optInt("0"));
         dataChartList.add(dataChart.optInt("1"));
         dataChartList.add(dataChart.optInt("2"));
         dataChartList.add(dataChart.optInt("3"));
         dataChartList.add(dataChart.optInt("4"));
         dataChartList.add(dataChart.optInt("5"));
         dataChartList.add(dataChart.optInt("6"));
         dataChartList.add(dataChart.optInt("7"));
         dataChartList.add(dataChart.optInt("8"));
         dataChartList.add(dataChart.optInt("9"));
         dataChartList.add(dataChart.optInt("10"));
         dataChartList.add(dataChart.optInt("11"));
         dataChartList.add(dataChart.optInt("12"));
         dataChartList.add(dataChart.optInt("13"));
         dataChartList.add(dataChart.optInt("14"));
         dataChartList.add(dataChart.optInt("15"));
         dataChartList.add(dataChart.optInt("16"));
         dataChartList.add(dataChart.optInt("17"));
         dataChartList.add(dataChart.optInt("18"));
         dataChartList.add(dataChart.optInt("19"));
         dataChartList.add(dataChart.optInt("20"));
         dataChartList.add(dataChart.optInt("21"));
         dataChartList.add(dataChart.optInt("22"));
         dataChartList.add(dataChart.optInt("23"));
         mDataModWalking.setDataChart(dataChartList);
     }
     private void addDataModRunning(JSONObject jsonObject){
         if (jsonObject == null) return;
         mDataModRunning.setTaget(jsonObject.optInt("target"));
         mDataModRunning.setSteps(jsonObject.optInt("steps"));
         mDataModRunning.setStepRemain(jsonObject.optInt("step_remain"));
         mDataModRunning.setCompletePercent(jsonObject.optDouble("complete_percent"));
         mDataModRunning.setTime(jsonObject.optInt("time"));
         mDataModRunning.setDistance(jsonObject.optInt("distance"));
         mDataModRunning.setKcal(jsonObject.optInt("kcal"));
         JSONObject dataChart = jsonObject.optJSONObject("data_chart");
         ArrayList<Integer> dataChartList = new ArrayList<>();
         dataChartList.add(dataChart.optInt("0"));
         dataChartList.add(dataChart.optInt("1"));
         dataChartList.add(dataChart.optInt("2"));
         dataChartList.add(dataChart.optInt("3"));
         dataChartList.add(dataChart.optInt("4"));
         dataChartList.add(dataChart.optInt("5"));
         dataChartList.add(dataChart.optInt("6"));
         dataChartList.add(dataChart.optInt("7"));
         dataChartList.add(dataChart.optInt("8"));
         dataChartList.add(dataChart.optInt("9"));
         dataChartList.add(dataChart.optInt("10"));
         dataChartList.add(dataChart.optInt("11"));
         dataChartList.add(dataChart.optInt("12"));
         dataChartList.add(dataChart.optInt("13"));
         dataChartList.add(dataChart.optInt("14"));
         dataChartList.add(dataChart.optInt("15"));
         dataChartList.add(dataChart.optInt("16"));
         dataChartList.add(dataChart.optInt("17"));
         dataChartList.add(dataChart.optInt("18"));
         dataChartList.add(dataChart.optInt("19"));
         dataChartList.add(dataChart.optInt("20"));
         dataChartList.add(dataChart.optInt("21"));
         dataChartList.add(dataChart.optInt("22"));
         dataChartList.add(dataChart.optInt("23"));
         mDataModRunning.setDataChart(dataChartList);
     }
     private void addDataModBike(JSONObject jsonObject){
         if (jsonObject == null) return;
         mDataModBike.setTaget(jsonObject.optInt("target"));
         mDataModBike.setSteps(jsonObject.optInt("steps"));
         mDataModBike.setStepRemain(jsonObject.optInt("step_remain"));
         mDataModBike.setCompletePercent(jsonObject.optDouble("complete_percent"));
         mDataModBike.setTime(jsonObject.optInt("time"));
         mDataModBike.setDistance(jsonObject.optInt("distance"));
         mDataModBike.setKcal(jsonObject.optInt("kcal"));
         JSONObject dataChart = jsonObject.optJSONObject("data_chart");
         ArrayList<Integer> dataChartList = new ArrayList<>();
         dataChartList.add(dataChart.optInt("0"));
         dataChartList.add(dataChart.optInt("1"));
         dataChartList.add(dataChart.optInt("2"));
         dataChartList.add(dataChart.optInt("3"));
         dataChartList.add(dataChart.optInt("4"));
         dataChartList.add(dataChart.optInt("5"));
         dataChartList.add(dataChart.optInt("6"));
         dataChartList.add(dataChart.optInt("7"));
         dataChartList.add(dataChart.optInt("8"));
         dataChartList.add(dataChart.optInt("9"));
         dataChartList.add(dataChart.optInt("10"));
         dataChartList.add(dataChart.optInt("11"));
         dataChartList.add(dataChart.optInt("12"));
         dataChartList.add(dataChart.optInt("13"));
         dataChartList.add(dataChart.optInt("14"));
         dataChartList.add(dataChart.optInt("15"));
         dataChartList.add(dataChart.optInt("16"));
         dataChartList.add(dataChart.optInt("17"));
         dataChartList.add(dataChart.optInt("18"));
         dataChartList.add(dataChart.optInt("19"));
         dataChartList.add(dataChart.optInt("20"));
         dataChartList.add(dataChart.optInt("21"));
         dataChartList.add(dataChart.optInt("22"));
         dataChartList.add(dataChart.optInt("23"));
         mDataModBike.setDataChart(dataChartList);
     }
     @OnClick({R.id.btn_oneDay, R.id.btn_oneWeek, R.id.btn_oneMonth, R.id.btn_threeMonth,
             R.id.btn_sixMonth, R.id.btn_left_date, R.id.btn_right_date, R.id.ll_bike,
             R.id.ll_walking, R.id.ll_running, R.id.rl_stepView})
     public void onClick(View v){
         switch (v.getId()){
             case R.id.btn_left_date:
                 mCalendar = Calendar.getInstance();
                 mCalendar.setTime(mAnaDate);
                 mCalendar.add(Calendar.DAY_OF_MONTH, -1);
                 Date date = mCalendar.getTime();
                 tvDate.setText(Utils.dateToStringFormatDayMonthYearJp(date));
                 tvWeekDay.setText(Utils.getWeekdayFromDate(date));
                 mAnaDate = date;
                 getHistoryData(dataType, mAnaDate);
                 break;
             case R.id.btn_right_date:
                 mCalendar = Calendar.getInstance();
                 mCalendar.setTime(mAnaDate);
                 mCalendar.add(Calendar.DAY_OF_MONTH, +1);
                 Date date1 = mCalendar.getTime();
                 tvDate.setText(Utils.dateToStringFormatDayMonthYearJp(date1));
                 tvWeekDay.setText(Utils.getWeekdayFromDate(date1));
                 mAnaDate = date1;
                 getHistoryData(dataType, mAnaDate);
                 break;
             case R.id.btn_oneDay:
                 dataType = Const.DATA_TYPE.ONE_DAY;
                 updateUiType();
                 getHistoryData(dataType, mAnaDate);
                 break;
             case R.id.btn_oneWeek:
                 dataType = Const.DATA_TYPE.ONE_WEEK;
                 updateUiType();
                 getHistoryData(dataType, mAnaDate);
                 break;
             case R.id.btn_oneMonth:
                 dataType = Const.DATA_TYPE.ONE_MONTH;
                 updateUiType();
                 getHistoryData(dataType, mAnaDate);
                 break;
             case R.id.btn_threeMonth:
                 dataType = Const.DATA_TYPE.THREE_MONTH;
                 updateUiType();
                 getHistoryData(dataType, mAnaDate);
                 break;
             case R.id.btn_sixMonth:
                 dataType = Const.DATA_TYPE.SIX_MONTH;
                 updateUiType();
                 getHistoryData(dataType, mAnaDate);
                 break;
             case R.id.tv_date:
                 handleAnaDatePicker();
                 break;
             case R.id.ll_bike:
                 stepType = Const.STEP_TYPE.BIKE;
                 updateUiStepType(true, false, false);
                 // add data
                 mDataCurrent = mDataModBike;
                 updateUI();
                 break;
             case R.id.ll_walking:
                 stepType = Const.STEP_TYPE.WALKING;
                 updateUiStepType(false, true, false);
                 // add data
                 mDataCurrent = mDataModWalking;
                 updateUI();
                 break;
             case R.id.ll_running:
                 stepType = Const.STEP_TYPE.RUNNING;
                 updateUiStepType(false, false, true);
                 // add
                 mDataCurrent = mDataModRunning;
                 updateUI();
                 break;
             case R.id.rl_stepView:
                 mHistoryFragment.showDetailFragment();
                 break;
             default:
                 break;
         }
     }
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
     }
 }

app/src/main/java/com/dinhcv/lifelogpedometer/activity/HistoryDetailFragment.java

Diff comments View file @ 5520a4b

 package com.dinhcv.lifelogpedometer.activity;
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.dinhcv.lifelogpedometer.R;
 import com.dinhcv.lifelogpedometer.adapter.HistoryAdapter;
 import com.dinhcv.lifelogpedometer.customview.ExpandableListCustomView;
 import com.dinhcv.lifelogpedometer.interfaces.LLAPIManagerListener;
 import com.dinhcv.lifelogpedometer.model.structure.history.HistoryInfo;
 import com.dinhcv.lifelogpedometer.model.structure.history.HistoryItemInfo;
+import com.dinhcv.lifelogpedometer.portal.ApiServices;
 import com.dinhcv.lifelogpedometer.portal.LLAPIManager;
 import com.dinhcv.lifelogpedometer.utils.Const;
 import com.dinhcv.lifelogpedometer.utils.Debug;
 import com.dinhcv.lifelogpedometer.utils.Utils;
 import org.json.JSONException;
 import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import retrofit2.Callback;
 public class HistoryDetailFragment extends FragmentBase {
     private View mRootView;
     @BindView(R.id.btn_left_date)
     ImageButton btnLeftDate;
     @BindView(R.id.btn_right_date)
     ImageButton btnRightDate;
     @BindView(R.id.tv_date)
     TextView tvDate;
     @BindView(R.id.tv_week_day)
     TextView tvWeekDay;
     @BindView(R.id.ll_bike)
     LinearLayout llBike;
     @BindView(R.id.ll_walking)
     LinearLayout llWalking;
     @BindView(R.id.ll_running)
     LinearLayout llRunning;
     @BindView(R.id.lv_history)
     ExpandableListCustomView lvHistory;
     private HistoryAdapter mHistoreAdapter;
     @BindView(R.id.btn_sixMonth)
     Button btnSixMonth;
     @BindView(R.id.btn_oneDay)
     Button btnOneDay;
     @BindView(R.id.btn_oneWeek)
     Button btnOneWeek;
     @BindView(R.id.btn_oneMonth)
     Button btnOneMonth;
     @BindView(R.id.btn_threeMonth)
     Button btnThreeMonth;
     private Date mAnaDate;
     private Calendar mCalendar;
     private int mAnaDay;
     private int mAnaMonth;
     private int mAnaYear;
     private Context mContext;
     private Const.DATA_TYPE dataType;
     private Const.STEP_TYPE stepType;
     private List<HistoryItemInfo> mDataModWalking = new ArrayList<>();
     private List<HistoryItemInfo> mDataModRunning = new ArrayList<>();
     private List<HistoryItemInfo> mDataModBike = new ArrayList<>();
     private List<HistoryItemInfo> mDataCurrent = new ArrayList<>();
     private HistoryFragment mHistoryFragment;
     public void setRootFragment(HistoryFragment frag) {
         this.mHistoryFragment = frag;
     }
     @Override
     public View onCreateView(final LayoutInflater inflater,final ViewGroup container,
                              final Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         mRootView = inflater.inflate(R.layout.fragment_history_detail, null);
         ButterKnife.bind(this, mRootView);
         mContext = getActivity();
         initView();
         initData();
         return mRootView;
     }
     private void initView() {
     }
     /**
      * init data for
      */
     private void initData() {
         mCalendar = Calendar.getInstance();
         mCalendar.setTime(new Date());
         mAnaDate = mCalendar.getTime();
         mAnaYear = mCalendar.get(Calendar.YEAR);
         mAnaMonth = mCalendar.get(Calendar.MONTH);
         mAnaDay = mCalendar.get(Calendar.DAY_OF_MONTH);
         tvDate.setText(Utils.dateToStringFormatDayMonthYearJp(mAnaDate));
         tvWeekDay.setText(Utils.getWeekdayFromDate(mAnaDate));
         dataType = Const.DATA_TYPE.ONE_DAY;
         stepType = Const.STEP_TYPE.WALKING;
         updateUiType();
         updateUiStepType(false, true, false);
         getHistoryDetail(dataType, mAnaDate);
     }
     /**
      * Show date picker dialog
      */
     private void handleAnaDatePicker() {
         new DatePickerDialog(mContext, new DatePickerDialog.OnDateSetListener() {
             @Override
             public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
                 mCalendar = Calendar.getInstance();
                 mCalendar.set(year, monthOfYear, dayOfMonth);
                 mAnaYear = year;
                 mAnaMonth = monthOfYear;
                 mAnaDay = dayOfMonth;
                 Date date = mCalendar.getTime();
                 tvDate.setText(Utils.dateToStringFormatDayMonthYearJp(date));
                 tvWeekDay.setText(Utils.getWeekdayFromDate(date));
                 mAnaDate = date;
                 getHistoryDetail(dataType, mAnaDate);
             }
         }, mAnaYear, mAnaMonth, mAnaDay).show();
     }
     private void updateUiType() {
         if (dataType == Const.DATA_TYPE.ONE_DAY) {
             setButtonSelected(true, false, false, false, false);
         } else if (dataType == Const.DATA_TYPE.ONE_WEEK) {
             setButtonSelected(false, true, false, false, false);
         } else if (dataType == Const.DATA_TYPE.ONE_MONTH) {
             setButtonSelected(false, false, true, false, false);
         } else if (dataType == Const.DATA_TYPE.THREE_MONTH){
             setButtonSelected(false, false, false, true, false);
         } else if (dataType == Const.DATA_TYPE.SIX_MONTH){
             setButtonSelected(false, false, false, false, true);
         }
     }
     private void setButtonSelected(boolean b1, boolean b2, boolean b3, boolean b4, boolean b5 ) {
         btnOneDay.setSelected(b1);
         btnOneWeek.setSelected(b2);
         btnOneMonth.setSelected(b3);
         btnThreeMonth.setSelected(b4);
         btnSixMonth.setSelected(b5);
     }
     private void updateUiStepType(boolean b1, boolean b2, boolean b3) {
         llBike.setSelected(b1);
         llWalking.setSelected(b2);
         llRunning.setSelected(b3);
     }
     private void updateUI(){
         // get data server
         if (mDataCurrent != null && mDataCurrent.size() >0){
             mHistoreAdapter = new HistoryAdapter(mContext, mDataCurrent);
             lvHistory.setAdapter(mHistoreAdapter);
             lvHistory.setExpanded(true);
         }
     }
     private void getHistoryDetail(Const.DATA_TYPE dataType, Date toDate){
         Date fromDate = Utils.getFromDate(mAnaDate, dataType);
         showDialog(mContext);
-        LLAPIManager.historyDetail(fromDate, toDate, new LLAPIManagerListener() {
+        ApiServices.historyDetail(fromDate, toDate, new LLAPIManagerListener() {
             @Override
             public void onError(Error error) {
                 Debug.error("Get data history error");
                 hiddenDialog();
                 showDialogNotData();
             }
             @Override
             public void onSuccess(String json) {
                 Debug.error("Get data history success");
                 hiddenDialog();
                 loadDataDone(json);
             }
             @Override
             public void onSuccess(JSONObject object) {
                 Debug.error("Get data history success");
                 hiddenDialog();
             }
         });
     }
     private void showDialogNotData(){
         showAlerDialog(mContext, getResources().getString(R.string.can_not_get_data));
     }
     private void loadDataDone(String jsonString) {
         JSONObject jsonObject = null;
         try {
             jsonObject = new JSONObject(jsonString);
             int status = jsonObject.optInt("status");
             if (status == 1) {
                 JSONObject jsonObject1 = jsonObject.optJSONObject("result");
                 JSONObject jsonMod1 = jsonObject1.getJSONObject("mode_1");
                 JSONObject jsonMod2 = jsonObject1.getJSONObject("mode_2");
                 JSONObject jsonMod3 = jsonObject1.getJSONObject("mode_3");
                 //addDataModWalking(jsonMod1);
                 //addDataModRunning(jsonMod2);
                 //addDataModBike(jsonMod3);
             }
         } catch (JSONException e) {
             e.printStackTrace();
             mDataModWalking.clear();
             mDataModRunning.clear();;
             mDataModBike.clear();;
         }
         if (stepType == Const.STEP_TYPE.WALKING){
             mDataCurrent = mDataModWalking;
         }else if (stepType == Const.STEP_TYPE.RUNNING){
             mDataCurrent = mDataModRunning;
         }else {
             mDataCurrent = mDataModBike;
         }
         updateUI();
     }
     @OnClick({R.id.tv_date, R.id.btn_left_date, R.id.btn_right_date, R.id.btn_oneDay, R.id.btn_oneWeek,
             R.id.btn_oneMonth, R.id.btn_threeMonth, R.id.btn_sixMonth, R.id.ll_walking, R.id.ll_bike,
             R.id.ll_running})
     public void onClick(View view){
         Date date;
         switch (view.getId()){
             case R.id.tv_date:
                 handleAnaDatePicker();
                 break;
             case R.id.btn_left_date:
                 mCalendar = Calendar.getInstance();
                 mCalendar.setTime(mAnaDate);
                 mCalendar.add(Calendar.DAY_OF_MONTH, -1);
                 date = mCalendar.getTime();
                 tvDate.setText(Utils.dateToStringFormatDayMonthYearJp(date));
                 tvWeekDay.setText(Utils.getWeekdayFromDate(date));
                 mAnaDate = date;
                 getHistoryDetail(dataType, mAnaDate);
                 break;
             case R.id.btn_right_date:
                 mCalendar = Calendar.getInstance();
                 mCalendar.setTime(mAnaDate);
                 mCalendar.add(Calendar.DAY_OF_MONTH, +1);
                 date = mCalendar.getTime();
                 tvDate.setText(Utils.dateToStringFormatDayMonthYearJp(date));
                 tvWeekDay.setText(Utils.getWeekdayFromDate(date));
                 mAnaDate = date;
                 getHistoryDetail(dataType, mAnaDate);
                 break;
             case R.id.btn_oneDay:
                 dataType = Const.DATA_TYPE.ONE_DAY;
                 updateUiType();
                 getHistoryDetail(dataType, mAnaDate);
                 break;
             case R.id.btn_oneWeek:
                 dataType = Const.DATA_TYPE.ONE_WEEK;
                 updateUiType();
                 getHistoryDetail(dataType, mAnaDate);
                 break;
             case R.id.btn_oneMonth:
                 dataType = Const.DATA_TYPE.ONE_MONTH;
                 updateUiType();
                 getHistoryDetail(dataType, mAnaDate);
                 break;
             case R.id.btn_threeMonth:
                 dataType = Const.DATA_TYPE.THREE_MONTH;
                 updateUiType();
                 getHistoryDetail(dataType, mAnaDate);
                 break;
             case R.id.btn_sixMonth:
                 dataType = Const.DATA_TYPE.SIX_MONTH;
                 updateUiType();
                 getHistoryDetail(dataType, mAnaDate);
                 break;
             case R.id.ll_walking:
                 stepType = Const.STEP_TYPE.WALKING;
                 updateUiStepType(false, true, false);
                 // add data
                 mDataCurrent = mDataModWalking;
                 updateUI();
                 break;
             case R.id.ll_running:
                 stepType = Const.STEP_TYPE.RUNNING;
                 updateUiStepType(false, false, true);
                 // add
                 mDataCurrent = mDataModRunning;
                 updateUI();
                 break;
             case R.id.ll_bike:
                 stepType = Const.STEP_TYPE.BIKE;
                 updateUiStepType(true, false, false);
                 // add data
                 mDataCurrent = mDataModBike;
                 updateUI();
                 break;
             default:
                 break;
         }
     }
 }

app/src/main/java/com/dinhcv/lifelogpedometer/activity/InputConfirmCodeActivity.java

Diff comments View file @ 5520a4b

 package com.dinhcv.lifelogpedometer.activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.TextView;
 import com.dinhcv.lifelogpedometer.R;
 import com.dinhcv.lifelogpedometer.interfaces.LLAPIManagerListener;
 import com.dinhcv.lifelogpedometer.model.Shareprefer.Setting;
+import com.dinhcv.lifelogpedometer.portal.ApiServices;
 import com.dinhcv.lifelogpedometer.portal.LLAPIManager;
 import com.dinhcv.lifelogpedometer.utils.Const;
 import com.dinhcv.lifelogpedometer.utils.Debug;
 import org.json.JSONObject;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 public class InputConfirmCodeActivity extends ActivityBase {
     @BindView(R.id.edt_confirmCode)
     TextView edtConfirmCode;
     @BindView(R.id.btn_confirm)
     Button btnConfirm;
     private ProgressDialog progressDialog;
     private String mEmail;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_input_confirm_code);
         ButterKnife.bind(this);
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         Intent intent = getIntent();
         if (intent != null) {
             mEmail = intent.getStringExtra(Const.EMAIL);
             Debug.normal("Email request: "+mEmail);
             if(mEmail == null){
                 Debug.error("Email is null");
                 return;
             }
         }else {
             Debug.error("Email is null");
             return;
         }
     }
     private void handleGetNewPass(String code){
         progressDialog = new ProgressDialog(InputConfirmCodeActivity.this);
         progressDialog.setMessage(getResources().getString(R.string.waite_some_minute));
         progressDialog.setCancelable(false);
         progressDialog.show();
-        LLAPIManager.forgetPassConfirm(mEmail, code, new LLAPIManagerListener() {
+        ApiServices.forgetPassConfirm(mEmail, code, new LLAPIManagerListener() {
             @Override
             public void onError(Error error) {
                 progressDialog.dismiss();
                 Debug.error("Send confirm JSON result: ERROR " + error);
                 String err = getResources().getString(R.string.request_pass_error);
                 notifyErr(err);
             }
             @Override