切换draft分支

app_modular/appme/src/main/java/com/uas/appme/pedometer/bean/ComPolylineBean.java

@@ -2,7 +2,7 @@ package com.uas.appme.pedometer.bean;
 
 /**
  * Created by FANGlh on 2017/9/25.
- * function:
+ * function:  通用折线实体类，将X,Y轴数据以列表形式存贮
  */
 
 public class ComPolylineBean  {

app_modular/appme/src/main/java/com/uas/appme/pedometer/constant/Constant.java

@@ -23,5 +23,5 @@ public class Constant {
     public static final int BASE_COLUMN = 100000000;
     public static String TRACK_STEP = "TRACKSTEP";
     public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
-//    public static String BASE_STEP_URL = "http://192.168.253.136:8092/user/";
+//    public static String BASE_STEP_URL = "http://192.168.253.136:8092/";
 }

app_modular/appme/src/main/java/com/uas/appme/pedometer/utils/StepUtils.java

@@ -15,7 +15,6 @@ import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 
-import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,6 +26,7 @@ import java.util.Map;
 public class StepUtils {
 
     public static void doSaveLocalStepsToHttps(){
+        if (!isCanStep()) return;  //不支持则不上传
         StepDataDao stepDataDao = new StepDataDao(MyApplication.getInstance());
         //获取当前时间
         String CURRENT_DATE = TimeUtil.getCurrentDate();
@@ -35,12 +35,12 @@ public class StepUtils {
         String steps = entity.getSteps();
         String date = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(entity.getCurDate(), "yyyy年MM月dd日"));
         String em_name = "";
-        try {
+//        try {
             em_name = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
-            em_name = new String(em_name.getBytes("UTF-8"),"UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
+//            em_name = new String(em_name.getBytes("UTF-8"),"UTF-8");
+//        } catch (UnsupportedEncodingException e) {
+//            e.printStackTrace();
+//        }
         LogUtil.prinlnLongMsg("steps=,date=",steps+","+date);
         if (StringUtil.isEmpty(steps) || StringUtil.isEmpty(date)) return;
         Map<String,Object> saveMap = new HashMap<>();
@@ -62,4 +62,13 @@ public class StepUtils {
             }
         }));
     }
+
+
+    /**
+     * 判断当前手机硬件是否支持计步功能
+     * @return
+     */
+    private static boolean isCanStep(){
+        return StepCountCheckUtil.isSupportStepCountSensor(MyApplication.getInstance());
+    }
 }

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepActivity.java

@@ -21,6 +21,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.core.base.BaseActivity;
+import com.core.utils.CommonUtil;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.calendar.BeforeOrAfterCalendarView;
@@ -306,7 +307,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-//        if (!CommonUtil.isReleaseVersion())
+        if (!CommonUtil.isReleaseVersion())
             getMenuInflater().inflate(R.menu.menu_uusport_list, menu);
         return super.onCreateOptionsMenu(menu);
     }
@@ -315,7 +316,7 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home){
             startActivity(new Intent(getApplicationContext(), SettingActivity.class));
-        } else if (item.getItemId() == R.id.more){
+        } else if (!CommonUtil.isReleaseVersion() && item.getItemId() == R.id.more){
             startActivity(new Intent(this,UURanking.class));
         }
         return super.onOptionsItemSelected(item);

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/UURanking.java

@@ -10,6 +10,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
+import com.common.data.ListUtils;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -94,6 +95,8 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
         mNameTv.setText(myem_name+"");
         String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         AvatarHelper.getInstance().display(loginUserId, mPhotoImg, true, false);
+
+        //初始化个人信息，先从本地数据库取
         StepDataDao stepDataDao = new StepDataDao(this);
         StepEntity stepEntity = stepDataDao.getCurDataByDate(curSelDate);
         if (stepEntity != null) {
@@ -138,6 +141,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
                         mAttentionLl.setVisibility(View.VISIBLE);
                     progressDialog.dismiss();
                     doPositionFocus();
+                    showMyInfo();
                     LogUtil.prinlnLongMsg("mStepsRankingBean", JSON.toJSONString(mStepsRankingBean)+"");
                 }catch (Exception e){
                     e.printStackTrace();
@@ -147,6 +151,18 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
 
     }
 
+    private void showMyInfo() {
+        if (mStepsRankingBean == null || ListUtils.isEmpty(mStepsRankingBean.getAttrank())) return;
+        //显示当前登录人的步数排名
+        for (int i = 0; i < mStepsRankingBean.getToalrank().size(); i++) {
+            if (MyApplication.getInstance().mLoginUser.getUserId().equals(mStepsRankingBean.getToalrank().get(i).getAs_userid())){
+                mRankingTv.setText("第" + mStepsRankingBean.getToalrank().get(i).getRank()+"名");
+                mStepsTv.setText(mStepsRankingBean.getToalrank().get(i).getAs_uusteps());
+                break;
+            }
+        }
+    }
+
 
     private void initEvents() {
         mAttentionPtlv.setOnItemClickListener(new AdapterView.OnItemClickListener() {