From 51f8633b379efab41a8b19a375d5e41785a15ee6 Mon Sep 17 00:00:00 2001
From: 张海江 <181069201@qq.com>
Date: Fri, 11 Aug 2017 09:14:40 +0800
Subject: [PATCH] 提交代码
---
app/src/main/res/mipmap-xxhdpi/icon_find.png | 0
.gradle/3.3/taskArtifacts/fileSnapshots.bin | 0
build/android-profile/profile-2017-08-08-10-00-18-383.rawproto | 0
build/android-profile/profile-2017-08-11-08-58-50-769.rawproto | 0
app/src/main/java/com/moral/yunfushao/common/AppConfig.java | 1
build/android-profile/profile-2017-08-08-10-45-07-572.rawproto | 0
app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java | 8 +
build/android-profile/profile-2017-08-10-14-04-14-234.rawproto | 0
build/android-profile/profile-2017-08-08-08-32-37-679.rawproto | 0
build/android-profile/profile-2017-08-08-10-03-41-677.rawproto | 0
build/android-profile/profile-2017-08-08-11-12-54-353.rawproto | 0
build/android-profile/profile-2017-08-09-13-45-43-901.rawproto | 0
app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java | 142 +++++++++++++++++++++++++++++++----
build/android-profile/profile-2017-08-08-10-09-11-877.rawproto | 0
build/android-profile/profile-2017-08-08-09-43-42-143.rawproto | 0
build/android-profile/profile-2017-08-08-11-25-47-669.rawproto | 0
app/src/main/java/com/moral/yunfushao/model/UserData.java | 56 ++++++++++++++
build/android-profile/profile-2017-08-08-11-12-28-001.rawproto | 0
app/src/main/res/layout/fragment_monitor_layout.xml | 4
build/android-profile/profile-2017-08-08-11-10-28-423.rawproto | 0
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock | 0
build/android-profile/profile-2017-08-09-13-44-18-198.rawproto | 0
build/android-profile/profile-2017-08-11-08-59-07-538.rawproto | 0
app/src/main/res/layout/ac_charts_layout.xml | 1
build/android-profile/profile-2017-08-08-08-31-35-688.rawproto | 0
.gradle/3.3/taskArtifacts/taskArtifacts.bin | 0
build/android-profile/profile-2017-08-08-10-41-47-446.rawproto | 0
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock | 0
build/android-profile/profile-2017-08-08-09-45-14-995.rawproto | 0
build/android-profile/profile-2017-08-08-10-12-14-432.rawproto | 0
.gradle/3.3/taskArtifacts/taskArtifacts.lock | 0
build/android-profile/profile-2017-08-08-09-48-19-335.rawproto | 0
build/android-profile/profile-2017-08-08-09-49-26-011.rawproto | 0
build/android-profile/profile-2017-08-08-10-32-39-938.rawproto | 0
.gradle/3.3/taskArtifacts/fileHashes.bin | 0
build/android-profile/profile-2017-08-10-14-03-54-685.rawproto | 0
build/android-profile/profile-2017-08-11-09-09-21-642.rawproto | 0
build/android-profile/profile-2017-08-09-13-50-29-287.rawproto | 0
build/android-profile/profile-2017-08-08-09-52-23-953.rawproto | 0
build/android-profile/profile-2017-08-09-13-46-19-228.rawproto | 0
.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin | 0
app/src/main/java/com/moral/yunfushao/ble/BLECommon.java | 1
build/android-profile/profile-2017-08-08-10-13-40-162.rawproto | 0
build/android-profile/profile-2017-08-08-10-43-52-075.rawproto | 0
build/android-profile/profile-2017-08-08-10-54-04-880.rawproto | 0
build/android-profile/profile-2017-08-08-09-54-08-973.rawproto | 0
build/android-profile/profile-2017-08-08-09-38-19-496.rawproto | 0
build/android-profile/profile-2017-08-11-09-11-59-541.rawproto | 0
build/android-profile/profile-2017-08-08-11-27-54-968.rawproto | 0
app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java | 22 +++-
build/android-profile/profile-2017-08-08-10-33-59-541.rawproto | 0
app/src/main/java/com/moral/yunfushao/common/API.java | 2
build/android-profile/profile-2017-08-08-09-09-29-719.rawproto | 0
53 files changed, 209 insertions(+), 28 deletions(-)
diff --git a/.gradle/3.3/taskArtifacts/fileHashes.bin b/.gradle/3.3/taskArtifacts/fileHashes.bin
index 553a04a..ec9ff83 100644
--- a/.gradle/3.3/taskArtifacts/fileHashes.bin
+++ b/.gradle/3.3/taskArtifacts/fileHashes.bin
Binary files differ
diff --git a/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/.gradle/3.3/taskArtifacts/fileSnapshots.bin
index 16aa7ad..7602d86 100644
--- a/.gradle/3.3/taskArtifacts/fileSnapshots.bin
+++ b/.gradle/3.3/taskArtifacts/fileSnapshots.bin
Binary files differ
diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/.gradle/3.3/taskArtifacts/taskArtifacts.bin
index c1ea7a4..8676335 100644
--- a/.gradle/3.3/taskArtifacts/taskArtifacts.bin
+++ b/.gradle/3.3/taskArtifacts/taskArtifacts.bin
Binary files differ
diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/.gradle/3.3/taskArtifacts/taskArtifacts.lock
index d8e2fe5..9266ea8 100644
--- a/.gradle/3.3/taskArtifacts/taskArtifacts.lock
+++ b/.gradle/3.3/taskArtifacts/taskArtifacts.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index 1d7a443..873533c 100644
--- a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
+++ b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
Binary files differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index baf4c4a..90115c1 100644
--- a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
+++ b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 1719634..af1fa1e 100644
--- a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
+++ b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary files differ
diff --git a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
index 284c5f7..26fa55f 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
@@ -8,14 +8,23 @@
import android.widget.RadioGroup;
import android.widget.TextView;
+import com.lzy.okgo.cache.CacheMode;
+import com.moral.andbrickslib.utils.FastJsonTools;
import com.moral.andbrickslib.utils.TimeUtil;
+import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
import com.moral.yunfushao.base.BaseActivity;
+import com.moral.yunfushao.common.API;
+import com.moral.yunfushao.httputils.HttpCallBack;
+import com.moral.yunfushao.httputils.HttpUtils;
+import com.moral.yunfushao.model.UserData;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
-import java.util.Random;
+import lecho.lib.hellocharts.formatter.LineChartValueFormatter;
+import lecho.lib.hellocharts.formatter.SimpleLineChartValueFormatter;
import lecho.lib.hellocharts.gesture.ContainerScrollType;
import lecho.lib.hellocharts.gesture.ZoomType;
import lecho.lib.hellocharts.model.Axis;
@@ -41,7 +50,7 @@
private List<AxisValue> mAxisXValues = new ArrayList<>();
private RadioGroup rg_time;
- private TextView tv_starttime,tv_endtime;
+ private TextView tv_starttime,tv_endtime,tv_value;
private ImageView iv_pre,iv_next;
private int type=0;
@Override
@@ -64,6 +73,7 @@
rg_time = findView(R.id.rg_time);
tv_starttime = findView(R.id.tv_starttime);
tv_endtime = findView(R.id.tv_endtime);
+ tv_value = findView(R.id.tv_value);
iv_pre = findView(R.id.iv_pre);
iv_next = findView(R.id.iv_next);
rg_time.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@@ -77,6 +87,7 @@
chartView.setLineChartData(data);
tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",TimeUtil.getCurrentDate("yyyy-MM-dd"),-1));
tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-7));
+ getData(tv_starttime.getText().toString(),tv_endtime.getText().toString());
break;
case R.id.rb_month:
type = 1;
@@ -85,12 +96,14 @@
chartView.setLineChartData(data);
tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",TimeUtil.getCurrentDate("yyyy-MM-dd"),-1));
tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-28));
+ getData(tv_starttime.getText().toString(),tv_endtime.getText().toString());
break;
}
}
});
tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",TimeUtil.getCurrentDate("yyyy-MM-dd"),-1));
tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-7));
+ getData(tv_starttime.getText().toString(),tv_endtime.getText().toString());
}
@Override
@@ -101,7 +114,7 @@
@Override
protected void initData() {
- reshowChart();
+ reshowChart(dataList);
}
@Override
@@ -118,6 +131,7 @@
tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),-1));
tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),-28));
}
+ getData(tv_starttime.getText().toString(),tv_endtime.getText().toString());
break;
case R.id.iv_next:
if(TimeUtil.getCurrentDate("yyyy-MM-dd").equals(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),1))){
@@ -130,6 +144,7 @@
tv_starttime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_endtime.getText().toString(),1));
tv_endtime.setText(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),28));
}
+ getData(tv_starttime.getText().toString(),tv_endtime.getText().toString());
break;
}
@@ -145,12 +160,14 @@
List<Line> lines = new ArrayList<>();
line.setShape(ValueShape.CIRCLE);//������������������������������������ ��������������� ������������ ���ValueShape.SQUARE ValueShape.CIRCLE ValueShape.DIAMOND���
line.setPointColor(Color.parseColor("#20DAE5"));
- line.setCubic(true);//���������������������������������������������
+ line.setCubic(false);//���������������������������������������������
line.setFilled(false);//���������������������������
line.setHasLabels(true);//���������������������������������������
// line.setHasLabelsOnlyForSelected(true);//������������������������������������������������line.setHasLabels(true);������������
line.setHasLines(true);//������������������������������false ������������������������������
line.setHasPoints(true);//������������������ ���������false ������������������������������������������������������������������������
+ LineChartValueFormatter chartValueFormatter = new SimpleLineChartValueFormatter(3);
+ line.setFormatter(chartValueFormatter);//���������������
lines.add(line);
data = new LineChartData();
data.setLines(lines);
@@ -160,9 +177,9 @@
//���������
axisX = new Axis(); //X���
- axisX.setHasTiltedLabels(false); //X���������������������������������������������true���������������
+ axisX.setHasTiltedLabels(true); //X���������������������������������������������true���������������
axisX.setName("���������������������"); //������������
- axisX.setTextSize(10);//������������������
+ axisX.setTextSize(8);//������������������
axisX.setTextColor(getResources().getColor(R.color.red_txt));
// axisX.setMaxLabelChars(7); //������������X���������������������������������������X���������������������7<=x<=mAxisXValues.length
axisX.setValues(mAxisXValues); //������X������������������
@@ -173,7 +190,7 @@
//data.setAxisXTop(axisX); //x ������������
// Y���������������������������������������Y���������(���������������������������Y������������������������������)
- axisY = Axis.generateAxisFromRange(0,100,1); //Y���
+ axisY = Axis.generateAxisFromRange(0,100, (float) 0.01); //Y���
axisY.setAutoGenerated(false);
axisY.setHasLines(true);
axisY.setHasSeparationLine(true);
@@ -194,7 +211,15 @@
* ���������������������X������������������������������http://forum.xda-developers.com/tools/programming/library-hellocharts-charting-library-t2904456/page2���;
*/
// chartView.setCurrentViewport(initViewPort(0,7));
- chartView.startDataAnimation();
+ final Viewport v = new Viewport(chartView.getMaximumViewport());
+ v.bottom = 0;
+ v.top = 100;
+// // You have to set max and current viewports separately.
+ chartView.setMaximumViewport(v);
+// // I changing current viewport with animation in this case.
+//// lineChartCO2.setCurrentViewportWithAnimation(v);
+ chartView.setCurrentViewport(v);
+// chartView.startDataAnimation();
}
private Viewport initViewPort(float left, float right) {
@@ -204,15 +229,17 @@
return port;
}
- Random random = new Random();
- private void reshowChart() {
+ private void reshowChart(final ArrayList<UserData> dataList) {
chartView.post(new Runnable() {
@Override
public void run() {
- for (int i=0;i<10;i++){
- mPointValues.add(new PointValue(i,random.nextInt(100)%(100-0+1) + 0));
- mAxisXValues.add(new AxisValue(i).setLabel(i + ""));
+ mPointValues.clear();
+ mAxisXValues.clear();
+ for (int i=0;i<dataList.size();i++){
+ mPointValues.add(new PointValue(i,dataList.get(i).getDay_avg()));
+ mAxisXValues.add(new AxisValue(i).setLabel(dataList.get(i).getDate().substring(5,10)));
+// mAxisXValues.add(new AxisValue(i).setLabel(i+""));
}
axisX.setValues(mAxisXValues);
@@ -223,14 +250,93 @@
data.setLines(lines);
chartView.setLineChartData(data);
final Viewport v = new Viewport(chartView.getMaximumViewport());
- v.bottom = -5;
- v.top = 100 + 5;
- // You have to set max and current viewports separately.
+ v.bottom = 0;
+ v.top = 100;
+//// // You have to set max and current viewports separately.
chartView.setMaximumViewport(v);
- // I changing current viewport with animation in this case.
-// lineChartCO2.setCurrentViewportWithAnimation(v);
+// // I changing current viewport with animation in this case.
+//// lineChartCO2.setCurrentViewportWithAnimation(v);
chartView.setCurrentViewport(v);
}
});
}
+
+ private ArrayList<UserData> dataList = new ArrayList<>();
+ private void getData(String startTime,String endTime){
+ HashMap<String,String> params = new HashMap<>();
+ params.put("user_id", MainApp.userId);
+ params.put("start_time", startTime);
+ params.put("end_time", endTime);
+ HttpUtils.doPost(API.GETUSERDATALIST, params, CacheMode.DEFAULT, true, new HttpCallBack() {
+ @Override
+ public void onSuccess(String res, String msg) {
+ if(progressDialog.isShowing()){
+ progressDialog.dismiss();
+ }
+ ArrayList<UserData> temp = (ArrayList<UserData>) FastJsonTools.getArrayJson(res,UserData.class);
+ dataList.clear();
+
+ dataList.addAll(resetData(temp));
+
+ //������
+ reshowChart(dataList);
+ }
+
+ @Override
+ public void showLoadingDialog() {
+ progressDialog.show();
+ }
+
+ @Override
+ public void onFail(int errno, String s) {
+ if(progressDialog.isShowing()){
+ progressDialog.dismiss();
+ }
+ dataList.clear();
+
+ dataList.addAll(resetData(new ArrayList<UserData>()));
+
+ //������
+ reshowChart(dataList);
+ tv_value.setText(0+"uSv");
+ }
+ });
+
+ }
+
+
+ private ArrayList<UserData> resetData(ArrayList<UserData> tempList){
+ ArrayList<UserData> newList = new ArrayList<>();
+ if(type == 0){//���
+ for (int i=0;i<7;i++){
+ UserData data = new UserData();
+ data.setDate(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),i));
+ data.setDay_avg(0);
+ newList.add(data);
+ }
+ }else if(type == 1){//���
+ for (int i=0;i<7;i++){
+ UserData data = new UserData();
+ data.setDate(TimeUtil.getAfterDate("yyyy-MM-dd",tv_starttime.getText().toString(),i*4));
+ data.setDay_avg(0);
+ newList.add(data);
+ }
+ }
+ //������������
+ float totalValues = 0;
+ if(tempList!=null&&tempList.size()>0){
+ for (UserData data : tempList){
+ totalValues+= data.getDay_avg();
+ for(UserData data1 : newList){
+ if(data.getDate().equals(data1.getDate())){
+ data1.setDay_avg(data.getDay_avg());
+ }
+ }
+ }
+ tv_value.setText(totalValues/tempList.size()+"uSv");
+ }else{
+ tv_value.setText(0+"uSv");
+ }
+ return newList;
+ }
}
diff --git a/app/src/main/java/com/moral/yunfushao/ble/BLECommon.java b/app/src/main/java/com/moral/yunfushao/ble/BLECommon.java
index a09bc81..915d0d2 100644
--- a/app/src/main/java/com/moral/yunfushao/ble/BLECommon.java
+++ b/app/src/main/java/com/moral/yunfushao/ble/BLECommon.java
@@ -8,5 +8,6 @@
public class BLECommon {
//������UUID
public final static String USR_SERVICE = "0003cdd0-0000-1000-8000-00805f9b0131";
+ public final static String BLE_SEARCH = "6A09010002006B";
}
diff --git a/app/src/main/java/com/moral/yunfushao/common/API.java b/app/src/main/java/com/moral/yunfushao/common/API.java
index 23e062b..b46bfbe 100644
--- a/app/src/main/java/com/moral/yunfushao/common/API.java
+++ b/app/src/main/java/com/moral/yunfushao/common/API.java
@@ -20,4 +20,6 @@
public final static String UPLOAD = URL_HTTP + "Data.upload";//������������
public final static String UPDATEUSERINFO = URL_HTTP + "User.UpdateUserInfo";//������������������
+
+ public final static String GETUSERDATALIST = URL_HTTP + "Data.GetUserDataList";//������������
}
diff --git a/app/src/main/java/com/moral/yunfushao/common/AppConfig.java b/app/src/main/java/com/moral/yunfushao/common/AppConfig.java
index fae9887..19869fb 100644
--- a/app/src/main/java/com/moral/yunfushao/common/AppConfig.java
+++ b/app/src/main/java/com/moral/yunfushao/common/AppConfig.java
@@ -8,4 +8,5 @@
public static final int DEFAULT_SIZE = 10;
public static final int GET_BLE_SERVICE = 1;
public static final int GET_BLE_DISCONNECT = 2;
+ public static final int CHANGE_SETTING = 3;
}
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
index c87006a..978a126 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -197,6 +197,14 @@
pv.setPercent(0);
tv_ljjl.setText("0");
tv_shishi.setText("0");
+ }else if(msg.getType() == AppConfig.CHANGE_SETTING){
+ if(timer!=null){
+ timer.cancel();
+ timer = null;
+ }
+ submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
+ isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
+ doTask();
}
}
@@ -242,11 +250,13 @@
iv_his.setOnClickListener(this);
iv_search.setOnClickListener(this);
}
-
+ int submitTime;
+ int isupLoad;
@Override
protected void initData() {
+ submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
+ isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
doTask();
-
}
@Override
@@ -268,7 +278,7 @@
if(mBluetoothService==null){
return;
}
- mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),mBluetoothService.getWirteCharacteristic().getUuid().toString(),"5A0014010001000000000000004600000000005B",null);
+ mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),mBluetoothService.getWirteCharacteristic().getUuid().toString(),BLECommon.BLE_SEARCH,null);
break;
}
@@ -278,8 +288,6 @@
protected void onErrorPagerClick() {
}
-
- private boolean isFinish = false;
Timer timer;
private void doTask() {
@@ -287,12 +295,12 @@
timer.schedule(new TimerTask() {
@Override
public void run() {
- if (!isFinish) {
+ if (isupLoad == 1) {
//������������
submitData();
}
}
- }, 0, 10000);
+ }, 0, submitTime);
}
private void submitData() {
diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
index 9b14db3..b3964bc 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentSettings.java
@@ -16,8 +16,12 @@
import com.moral.yunfushao.activity.VoiceSetActivity;
import com.moral.yunfushao.base.BaseFragment;
import com.moral.yunfushao.common.API;
+import com.moral.yunfushao.common.AppConfig;
import com.moral.yunfushao.httputils.HttpCallBack;
import com.moral.yunfushao.httputils.HttpUtils;
+import com.moral.yunfushao.model.EventMessage;
+
+import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.HashMap;
@@ -145,7 +149,9 @@
}else if("is_open_upload".equals(field)){
MainApp.theApp.sharedPreferencesUtil.setUpload(Integer.parseInt(value));
}
-
+ EventMessage event = new EventMessage();
+ event.setType(AppConfig.CHANGE_SETTING);
+ EventBus.getDefault().post(event);
if (progressDialog.isShowing()) {
progressDialog.dismiss();
}
diff --git a/app/src/main/java/com/moral/yunfushao/model/UserData.java b/app/src/main/java/com/moral/yunfushao/model/UserData.java
new file mode 100644
index 0000000..d23e4e9
--- /dev/null
+++ b/app/src/main/java/com/moral/yunfushao/model/UserData.java
@@ -0,0 +1,56 @@
+package com.moral.yunfushao.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+/**
+ * Created by haijiang on 2017/8/8.
+ */
+
+public class UserData {
+ @JSONField(name="_id")
+ private String _id;//": "598818ee9e74bba828fb1960",
+ private String user_id;//": "597bf6a1a0e6d23f5c3c9869",
+ private float day_avg;//": "0.068",
+ private String date;//": "2017-08-02",
+ private String create_time;//": "2017-08-07 15:38:22"
+
+ public String get_id() {
+ return _id;
+ }
+
+ public void set_id(String _id) {
+ this._id = _id;
+ }
+
+ public String getUser_id() {
+ return user_id;
+ }
+
+ public void setUser_id(String user_id) {
+ this.user_id = user_id;
+ }
+
+ public float getDay_avg() {
+ return day_avg;
+ }
+
+ public void setDay_avg(float day_avg) {
+ this.day_avg = day_avg;
+ }
+
+ public String getDate() {
+ return date;
+ }
+
+ public void setDate(String date) {
+ this.date = date;
+ }
+
+ public String getCreate_time() {
+ return create_time;
+ }
+
+ public void setCreate_time(String create_time) {
+ this.create_time = create_time;
+ }
+}
diff --git a/app/src/main/res/layout/ac_charts_layout.xml b/app/src/main/res/layout/ac_charts_layout.xml
index 5f3e03f..80409b9 100644
--- a/app/src/main/res/layout/ac_charts_layout.xml
+++ b/app/src/main/res/layout/ac_charts_layout.xml
@@ -118,6 +118,7 @@
android:text="���������" />
<TextView
+ android:id="@+id/tv_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/x6"
diff --git a/app/src/main/res/layout/fragment_monitor_layout.xml b/app/src/main/res/layout/fragment_monitor_layout.xml
index 364c336..53c577c 100644
--- a/app/src/main/res/layout/fragment_monitor_layout.xml
+++ b/app/src/main/res/layout/fragment_monitor_layout.xml
@@ -14,9 +14,9 @@
android:layout_width="@dimen/x20"
android:layout_height="@dimen/x20"
android:padding="@dimen/x4"
- android:src="@mipmap/icon_history"
+ android:src="@mipmap/icon_find"
android:layout_centerVertical="true"
- android:layout_marginRight="@dimen/x16"
+ android:layout_marginLeft="@dimen/x16"
/>
<TextView
android:id="@+id/tv_title"
diff --git a/app/src/main/res/mipmap-xxhdpi/icon_find.png b/app/src/main/res/mipmap-xxhdpi/icon_find.png
new file mode 100644
index 0000000..1be5eb0
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/icon_find.png
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-08-31-35-688.rawproto b/build/android-profile/profile-2017-08-08-08-31-35-688.rawproto
new file mode 100644
index 0000000..1e36915
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-08-31-35-688.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-08-32-37-679.rawproto b/build/android-profile/profile-2017-08-08-08-32-37-679.rawproto
new file mode 100644
index 0000000..81b77ca
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-08-32-37-679.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-09-09-29-719.rawproto b/build/android-profile/profile-2017-08-08-09-09-29-719.rawproto
new file mode 100644
index 0000000..07e624d
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-09-09-29-719.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-09-38-19-496.rawproto b/build/android-profile/profile-2017-08-08-09-38-19-496.rawproto
new file mode 100644
index 0000000..fee53db
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-09-38-19-496.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-09-43-42-143.rawproto b/build/android-profile/profile-2017-08-08-09-43-42-143.rawproto
new file mode 100644
index 0000000..27b8d5f
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-09-43-42-143.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-09-45-14-995.rawproto b/build/android-profile/profile-2017-08-08-09-45-14-995.rawproto
new file mode 100644
index 0000000..a4caae0
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-09-45-14-995.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-09-48-19-335.rawproto b/build/android-profile/profile-2017-08-08-09-48-19-335.rawproto
new file mode 100644
index 0000000..8e85924
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-09-48-19-335.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-09-49-26-011.rawproto b/build/android-profile/profile-2017-08-08-09-49-26-011.rawproto
new file mode 100644
index 0000000..1cb0347
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-09-49-26-011.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-09-52-23-953.rawproto b/build/android-profile/profile-2017-08-08-09-52-23-953.rawproto
new file mode 100644
index 0000000..626af32
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-09-52-23-953.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-09-54-08-973.rawproto b/build/android-profile/profile-2017-08-08-09-54-08-973.rawproto
new file mode 100644
index 0000000..caa6494
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-09-54-08-973.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-00-18-383.rawproto b/build/android-profile/profile-2017-08-08-10-00-18-383.rawproto
new file mode 100644
index 0000000..a596ff7
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-00-18-383.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-03-41-677.rawproto b/build/android-profile/profile-2017-08-08-10-03-41-677.rawproto
new file mode 100644
index 0000000..5ca1ba0
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-03-41-677.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-09-11-877.rawproto b/build/android-profile/profile-2017-08-08-10-09-11-877.rawproto
new file mode 100644
index 0000000..c89ab24
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-09-11-877.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-12-14-432.rawproto b/build/android-profile/profile-2017-08-08-10-12-14-432.rawproto
new file mode 100644
index 0000000..bbc26e4
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-12-14-432.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-13-40-162.rawproto b/build/android-profile/profile-2017-08-08-10-13-40-162.rawproto
new file mode 100644
index 0000000..300f09e
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-13-40-162.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-32-39-938.rawproto b/build/android-profile/profile-2017-08-08-10-32-39-938.rawproto
new file mode 100644
index 0000000..ee67d38
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-32-39-938.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-33-59-541.rawproto b/build/android-profile/profile-2017-08-08-10-33-59-541.rawproto
new file mode 100644
index 0000000..18d9f98
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-33-59-541.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-41-47-446.rawproto b/build/android-profile/profile-2017-08-08-10-41-47-446.rawproto
new file mode 100644
index 0000000..4c7e895
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-41-47-446.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-43-52-075.rawproto b/build/android-profile/profile-2017-08-08-10-43-52-075.rawproto
new file mode 100644
index 0000000..b8ab1a7
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-43-52-075.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-45-07-572.rawproto b/build/android-profile/profile-2017-08-08-10-45-07-572.rawproto
new file mode 100644
index 0000000..57d3295
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-45-07-572.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-10-54-04-880.rawproto b/build/android-profile/profile-2017-08-08-10-54-04-880.rawproto
new file mode 100644
index 0000000..4f50b39
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-10-54-04-880.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-11-10-28-423.rawproto b/build/android-profile/profile-2017-08-08-11-10-28-423.rawproto
new file mode 100644
index 0000000..0aa6866
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-11-10-28-423.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-11-12-28-001.rawproto b/build/android-profile/profile-2017-08-08-11-12-28-001.rawproto
new file mode 100644
index 0000000..9aa4ac6
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-11-12-28-001.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-11-12-54-353.rawproto b/build/android-profile/profile-2017-08-08-11-12-54-353.rawproto
new file mode 100644
index 0000000..5cf58dc
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-11-12-54-353.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-11-25-47-669.rawproto b/build/android-profile/profile-2017-08-08-11-25-47-669.rawproto
new file mode 100644
index 0000000..b70816f
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-11-25-47-669.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-08-11-27-54-968.rawproto b/build/android-profile/profile-2017-08-08-11-27-54-968.rawproto
new file mode 100644
index 0000000..fdc67ad
--- /dev/null
+++ b/build/android-profile/profile-2017-08-08-11-27-54-968.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-09-13-44-18-198.rawproto b/build/android-profile/profile-2017-08-09-13-44-18-198.rawproto
new file mode 100644
index 0000000..942cfe0
--- /dev/null
+++ b/build/android-profile/profile-2017-08-09-13-44-18-198.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-09-13-45-43-901.rawproto b/build/android-profile/profile-2017-08-09-13-45-43-901.rawproto
new file mode 100644
index 0000000..f5725e0
--- /dev/null
+++ b/build/android-profile/profile-2017-08-09-13-45-43-901.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-09-13-46-19-228.rawproto b/build/android-profile/profile-2017-08-09-13-46-19-228.rawproto
new file mode 100644
index 0000000..8509985
--- /dev/null
+++ b/build/android-profile/profile-2017-08-09-13-46-19-228.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-09-13-50-29-287.rawproto b/build/android-profile/profile-2017-08-09-13-50-29-287.rawproto
new file mode 100644
index 0000000..cdff20d
--- /dev/null
+++ b/build/android-profile/profile-2017-08-09-13-50-29-287.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-10-14-03-54-685.rawproto b/build/android-profile/profile-2017-08-10-14-03-54-685.rawproto
new file mode 100644
index 0000000..d40e730
--- /dev/null
+++ b/build/android-profile/profile-2017-08-10-14-03-54-685.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-10-14-04-14-234.rawproto b/build/android-profile/profile-2017-08-10-14-04-14-234.rawproto
new file mode 100644
index 0000000..9fa1cde
--- /dev/null
+++ b/build/android-profile/profile-2017-08-10-14-04-14-234.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-11-08-58-50-769.rawproto b/build/android-profile/profile-2017-08-11-08-58-50-769.rawproto
new file mode 100644
index 0000000..2f97f43
--- /dev/null
+++ b/build/android-profile/profile-2017-08-11-08-58-50-769.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-11-08-59-07-538.rawproto b/build/android-profile/profile-2017-08-11-08-59-07-538.rawproto
new file mode 100644
index 0000000..6de9dd6
--- /dev/null
+++ b/build/android-profile/profile-2017-08-11-08-59-07-538.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-11-09-09-21-642.rawproto b/build/android-profile/profile-2017-08-11-09-09-21-642.rawproto
new file mode 100644
index 0000000..41f2957
--- /dev/null
+++ b/build/android-profile/profile-2017-08-11-09-09-21-642.rawproto
Binary files differ
diff --git a/build/android-profile/profile-2017-08-11-09-11-59-541.rawproto b/build/android-profile/profile-2017-08-11-09-11-59-541.rawproto
new file mode 100644
index 0000000..0516c4d
--- /dev/null
+++ b/build/android-profile/profile-2017-08-11-09-11-59-541.rawproto
Binary files differ
--
Gitblit v1.8.0