隐藏uustep

WeiChat/build.gradle

@@ -120,7 +120,6 @@ dependencies {
     compile project(':appme')
     compile project(':appworks')
     compile project(":appbooking")
-  
     compile project(':android-pdf-viewer')
 }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -20,6 +20,7 @@ import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
@@ -42,6 +43,8 @@ import com.modular.appmessages.activity.Subscription2Activity;
 import com.modular.appmessages.adapter.MessageAdapter;
 import com.modular.appmessages.presenter.MessagePresenter;
 import com.modular.appmessages.presenter.imp.IMessageView;
+import com.uas.appme.pedometer.view.UURanking;
+import com.uas.appme.settings.Constant.Constant;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskB2BActivity;
@@ -93,6 +96,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
     private TextView book_time_tv;
     private TextView tv_book_num;
     private MessagePresenter.UnReaderListener unReaderListener;
+    private RelativeLayout uustep_rl;
 
 
     @Override
@@ -133,6 +137,11 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
     public void onResume() {
         super.onResume();
         presenter.loadData();
+        if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1
+              && !CommonUtil.isReleaseVersion()  )
+            uustep_rl.setVisibility(View.VISIBLE);
+        else
+            uustep_rl.setVisibility(View.GONE);
     }
 
     private void initEvent() {
@@ -201,6 +210,8 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
         book_time_tv = (TextView) view.findViewById(R.id.book_time_tv);
         dingyue_num = (TextView) view.findViewById(R.id.tv_dingYue_num);//订阅红点
         tv_dingyue_desc = (TextView) view.findViewById(R.id.tv_dingyue_desc);//订阅红点
+
+        uustep_rl = (RelativeLayout) view.findViewById(R.id.uustep_rl);
         if (CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_dingyue)) {
             dingyue_num.setVisibility(View.GONE);
             tv_dingyue_desc.setVisibility(View.GONE);
@@ -212,6 +223,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
         view.findViewById(R.id.waitting_work_rl).setOnClickListener(this);//待办工作
         view.findViewById(R.id.subscribe_rl).setOnClickListener(this);//我的订阅
         view.findViewById(R.id.booking_rl).setOnClickListener(this);//我的订阅
+        view.findViewById(R.id.uustep_rl).setOnClickListener(this);//UU运动
         if (platform) {
             subscribe_rl.setVisibility(View.GONE);
         } else {
@@ -223,6 +235,12 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
             view.findViewById(R.id.waitting_work_rl).setVisibility(View.GONE);//待办工作
             view.findViewById(R.id.subscribe_rl).setVisibility(View.GONE);//我的订阅
         }
+
+        if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1
+                && !CommonUtil.isReleaseVersion()  )
+            uustep_rl.setVisibility(View.VISIBLE);
+        else
+            uustep_rl.setVisibility(View.GONE);
         return view;
     }
 
@@ -314,6 +332,9 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 ////                intent.putExtra(NoticeMenuActivity.NES, NES_count);
 //                startActivityForResult(intent, REQUESTCODE);
 //                break;
+            case R.id.uustep_rl:
+                startActivity(new Intent(mContext, UURanking.class));
+                break;
         }
 
     }

WeiChat/src/main/res/layout/new_message_header.xml

@@ -306,7 +306,7 @@
             android:layout_centerVertical="true">
 
             <ImageView
-                
+
                 android:layout_width="@dimen/item_img_height"
                 android:layout_height="@dimen/item_img_width"
                 android:layout_gravity="center_vertical"
@@ -325,7 +325,7 @@
                 android:visibility="gone"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp"
-                 />
+                />
         </FrameLayout>
 
         <RelativeLayout
@@ -353,7 +353,7 @@
                 android:layout_below="@+id/book_time_tv"
                 android:layout_toLeftOf="@+id/tv_book_num"
                 android:layout_toStartOf="@+id/tv_book_num"
-               
+
                 android:text="" />
 
             <TextView
@@ -365,7 +365,7 @@
                 android:background="@drawable/hongdian"
                 android:gravity="center"
                 android:text=""
-          
+
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp" />
 
@@ -392,6 +392,109 @@
         </RelativeLayout>
 
     </RelativeLayout>
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent" />
+
+    <RelativeLayout
+        android:id="@+id/uustep_rl"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:descendantFocusability="blocksDescendants"
+        android:minHeight="@dimen/item_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:visibility="gone">
+
+        <FrameLayout
+            android:id="@+id/head_uustep"
+            android:layout_width="57dp"
+            android:layout_height="64dp"
+            android:layout_centerVertical="true">
+
+            <ImageView
+
+                android:layout_width="@dimen/item_img_height"
+                android:layout_height="@dimen/item_img_width"
+                android:layout_gravity="center_vertical"
+                android:background="@color/transparent"
+                android:contentDescription="@string/app_name"
+                android:padding="1dp"
+                android:src="@drawable/uu_step" />
+
+            <TextView
+                android:id="@+id/uustep_num_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:visibility="gone"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dp"
+                />
+        </FrameLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="3dp"
+            android:layout_toRightOf="@id/head_uustep"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/uustep_name_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/time_tv"
+                android:ellipsize="end"
+                android:text="@string/set_sport"
+                android:textColor="@color/text_main"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_uustep_num"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_alignParentRight="true"
+                android:layout_gravity="top|right"
+                android:background="@drawable/hongdian"
+                android:gravity="center"
+                android:text=""
+
+                android:textColor="@android:color/white"
+                android:textSize="10.0dp" />
+
+            <TextView
+                android:id="@+id/uustep_time_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:ellipsize="end"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/uustep_content_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/uustep_name_tv"
+                android:layout_marginTop="8dp"
+                android:ellipsize="end"
+                android:lines="1"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+    </RelativeLayout>
     <!--<RelativeLayout-->
     <!--android:id="@+id/notice_rl"-->
     <!--android:layout_width="match_parent"-->

app_core/common/build.gradle

@@ -22,7 +22,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile deps.junit
     compile deps.appcompatV7
     compile deps.fastjson
@@ -38,7 +38,6 @@ dependencies {
     compile deps.photoView
     compile deps.stickyListHeaders
     compile deps.stickyGridHeaders
-
     compile project(':pullToRefershLibraryMy')
     compile project(':MPAndroidChart')
     compile project(':libedittextformlibrary')
@@ -49,5 +48,5 @@ dependencies {
     compile project(':lib-zxing')
     compile project(':library-refreshlayout')
     compile project(':recyclerlibrary')
-
+    compile files('libs/hellocharts-library-1.5.8.jar')
 }

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -25,9 +25,9 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.andreabaccega.formedittext.BuildConfig;
 import com.andreabaccega.widget.FormEditText;
 import com.common.data.StringUtil;
+import com.common.file.PropertiesUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
@@ -41,6 +41,8 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -72,7 +74,11 @@ public class CommonUtil {
      * function:判断是不是发布版本，true：发布版本
      */
     public static Boolean isReleaseVersion() {
-        return !BuildConfig.DEBUG;
+        //        return !BuildConfig.DEBUG;  //垃圾方法，得根据自己选择的debug还是release模式返回，根本就不好用，
+        //         只要改变 common目录下的versionconfiguration就可以了
+        if (!StringUtil.isEmpty(PropertiesUtil.readData(MyApplication.getInstance(), "release_version", R.raw.versionconfiguration)) &&                "true".equals(PropertiesUtil.readData(MyApplication.getInstance(), "release_version", R.raw.versionconfiguration)))            return true;
+        else
+            return false;
     }
 
 
@@ -716,4 +722,19 @@ public class CommonUtil {
         Matcher m = p.matcher(s);
         return m.matches();
     }
+
+    public static String getUTF8String(String str){
+        String xmString = "";
+        String xmlUTF8="";
+        StringBuffer sb = new StringBuffer();
+        sb.append(str);
+        try {
+            xmString = new String(sb.toString().getBytes("UTF-8"));
+            xmlUTF8 = URLEncoder.encode(xmString, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        return xmlUTF8;
+    }
 }

app_core/common/src/main/res/layout/activity_newstep.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
    >
-
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
     <LinearLayout
         android:orientation="horizontal"
         android:id="@+id/movement_records_calender_ll"
@@ -213,3 +216,4 @@
         android:layout_marginLeft="10dp"
         />
 </LinearLayout>
+</ScrollView>

app_core/common/src/main/res/layout/new_message_header.xml

@@ -306,7 +306,7 @@
             android:layout_centerVertical="true">
 
             <ImageView
-                
+
                 android:layout_width="@dimen/item_img_height"
                 android:layout_height="@dimen/item_img_width"
                 android:layout_gravity="center_vertical"
@@ -325,7 +325,7 @@
                 android:visibility="gone"
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp"
-                 />
+                />
         </FrameLayout>
 
         <RelativeLayout
@@ -353,7 +353,7 @@
                 android:layout_below="@+id/book_time_tv"
                 android:layout_toLeftOf="@+id/tv_book_num"
                 android:layout_toStartOf="@+id/tv_book_num"
-               
+
                 android:text="" />
 
             <TextView
@@ -365,7 +365,7 @@
                 android:background="@drawable/hongdian"
                 android:gravity="center"
                 android:text=""
-          
+
                 android:textColor="@android:color/white"
                 android:textSize="10.0dp" />
 
@@ -392,6 +392,109 @@
         </RelativeLayout>
 
     </RelativeLayout>
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent" />
+
+    <RelativeLayout
+        android:id="@+id/uustep_rl"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:descendantFocusability="blocksDescendants"
+        android:minHeight="@dimen/item_height"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:visibility="gone">
+
+        <FrameLayout
+            android:id="@+id/head_uustep"
+            android:layout_width="57dp"
+            android:layout_height="64dp"
+            android:layout_centerVertical="true">
+
+            <ImageView
+
+                android:layout_width="@dimen/item_img_height"
+                android:layout_height="@dimen/item_img_width"
+                android:layout_gravity="center_vertical"
+                android:background="@color/transparent"
+                android:contentDescription="@string/app_name"
+                android:padding="1dp"
+                android:src="@drawable/uu_step" />
+
+            <TextView
+                android:id="@+id/uustep_num_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|right"
+                android:background="@drawable/tab_unread_bg"
+                android:gravity="center"
+                android:visibility="gone"
+                android:textColor="@android:color/white"
+                android:textSize="10.0dp"
+                />
+        </FrameLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="3dp"
+            android:layout_toRightOf="@id/head_uustep"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/uustep_name_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/time_tv"
+                android:ellipsize="end"
+                android:text="@string/set_sport"
+                android:textColor="@color/text_main"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_uustep_num"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_alignParentRight="true"
+                android:layout_gravity="top|right"
+                android:background="@drawable/hongdian"
+                android:gravity="center"
+                android:text=""
+
+                android:textColor="@android:color/white"
+                android:textSize="10.0dp" />
+
+            <TextView
+                android:id="@+id/uustep_time_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:ellipsize="end"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/uustep_content_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/uustep_name_tv"
+                android:layout_marginTop="8dp"
+                android:ellipsize="end"
+                android:lines="1"
+                android:textColor="@color/text_hine"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+    </RelativeLayout>
     <!--<RelativeLayout-->
     <!--android:id="@+id/notice_rl"-->
     <!--android:layout_width="match_parent"-->

app_core/common/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
-#release_version=false
-release_version=true
+release_version=false
+#release_version=true

app_modular/appme/src/main/java/com/uas/appme/pedometer/adapter/UUAttentionAdapter.java

@@ -62,9 +62,14 @@ public class UUAttentionAdapter extends BaseAdapter{
             viewHolder = (ViewHolder) convertView.getTag();
         }
 //        if(!MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAttrank().get(position).getAs_userid())){  //关注的人不应该显示自己，但是数据返回了自己，这里要判断一下不显示
-            viewHolder.ranking_tv.setText("第"+model.getAttrank().get(position).getRank()+"名");
             viewHolder.name_tv.setText(model.getAttrank().get(position).getAs_username());
             viewHolder.steps_tv.setText(model.getAttrank().get(position).getAs_uusteps());
+            for (int i = 0; i < model.getToalrank().size(); i++) {
+            if (model.getAttrank().get(position).getAs_userid().equals(model.getToalrank().get(i).getAs_userid())){
+                viewHolder.ranking_tv.setText("第"+model.getToalrank().get(i).getRank()+"名");
+                break;
+            }
+        }
 //            viewHolder.prise_tv.setText("0");
 //        }
 

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

@@ -0,0 +1,40 @@
+package com.uas.appme.pedometer.bean;
+
+/**
+ * Created by FANGlh on 2017/9/25.
+ * function:
+ */
+
+public class ComPolylineBean  {
+    private String xValue;
+    private int yValue;
+
+    public ComPolylineBean(String xValue, int yValue) {
+        this.xValue = xValue;
+        this.yValue = yValue;
+    }
+
+    public String getxValue() {
+        return xValue;
+    }
+
+    public void setxValue(String xValue) {
+        this.xValue = xValue;
+    }
+
+    public int getyValue() {
+        return yValue;
+    }
+
+    public void setyValue(int yValue) {
+        this.yValue = yValue;
+    }
+
+    @Override
+    public String toString() {
+        return "ComPolylineBean{" +
+                "xValue='" + xValue + '\'' +
+                ", yValue='" + yValue + '\'' +
+                '}';
+    }
+}

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

@@ -0,0 +1,118 @@
+package com.uas.appme.pedometer.utils;
+
+import android.graphics.Color;
+import android.view.View;
+
+import com.uas.appme.pedometer.bean.ComPolylineBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lecho.lib.hellocharts.gesture.ZoomType;
+import lecho.lib.hellocharts.model.Axis;
+import lecho.lib.hellocharts.model.AxisValue;
+import lecho.lib.hellocharts.model.Line;
+import lecho.lib.hellocharts.model.LineChartData;
+import lecho.lib.hellocharts.model.PointValue;
+import lecho.lib.hellocharts.model.ValueShape;
+import lecho.lib.hellocharts.model.Viewport;
+import lecho.lib.hellocharts.view.LineChartView;
+
+/**
+ * Created by FANGlh on 2017/9/25.
+ * function: 折线工具类
+ */
+
+public class PolylineUtils {
+    /**
+     * 初始化LineChart的一些设置
+     * @param lineChart   控件id 的对象
+     * @param cBeanList     包含 X，y轴对象的列表
+     */
+    private static void initLineChart(LineChartView lineChart,List<ComPolylineBean> cBeanList){
+
+         List<PointValue> mPointValues = new ArrayList<PointValue>();
+         List<AxisValue> mAxisXValues = new ArrayList<AxisValue>();
+
+        getAxisXLables(mAxisXValues,cBeanList);//获取x轴的标注
+        getAxisPoints(mPointValues,cBeanList);//获取坐标点
+
+        Line line = new Line(mPointValues).setColor(Color.parseColor("#5DB7CF"));  //折线的颜色
+        List<Line> lines = new ArrayList<Line>();
+        line.setShape(ValueShape.CIRCLE);//折线图上每个数据点的形状  这里是圆形 （有三种 ：ValueShape.SQUARE  ValueShape.CIRCLE  ValueShape.SQUARE）
+        line.setCubic(false);//曲线是否平滑
+        line.setStrokeWidth(1);//线条的粗细，默认是3
+        line.setFilled(false);//是否填充曲线的面积
+        line.setHasLabels(false);//曲线的数据坐标是否加上备注
+//		line.setHasLabelsOnlyForSelected(true);//点击数据坐标提示数据（设置了这个line.setHasLabels(true);就无效）
+        line.setHasLines(true);//是否用直线显示。如果为false 则没有曲线只有点显示
+        line.setHasPoints(true);//是否显示圆点 如果为false 则没有原点只有点显示
+        lines.add(line);
+        LineChartData data = new LineChartData();
+        data.setLines(lines);
+
+        //坐标轴
+        Axis axisX = new Axis(); //X轴
+        axisX.setHasTiltedLabels(true);  //X轴下面坐标轴字体是斜的显示还是直的，true是斜的显示
+//	    axisX.setTextColor(Color.WHITE);  //设置字体颜色
+        axisX.setTextColor(Color.parseColor("#D6D6D9"));//灰色
+
+//	    axisX.setName("未来几天的天气");  //表格名称
+        axisX.setTextSize(11);//设置字体大小
+        axisX.setMaxLabelChars(7); //最多几个X轴坐标，意思就是你的缩放让X轴上数据的个数7<=x<=mAxisValues.length
+        axisX.setValues(mAxisXValues);  //填充X轴的坐标名称
+        data.setAxisXBottom(axisX); //x 轴在底部
+//	    data.setAxisXTop(axisX);  //x 轴在顶部
+        axisX.setHasLines(true); //x 轴分割线
+
+
+        Axis axisY = new Axis();  //Y轴
+        axisY.setName("");//y轴标注
+        axisY.setTextSize(11);//设置字体大小
+        data.setAxisYLeft(axisY);  //Y轴设置在左边
+        //data.setAxisYRight(axisY);  //y轴设置在右边
+        //设置行为属性，支持缩放、滑动以及平移
+        lineChart.setInteractive(true);
+        lineChart.setZoomType(ZoomType.HORIZONTAL);  //缩放类型，水平
+        lineChart.setMaxZoom((float) 3);//缩放比例
+        lineChart.setLineChartData(data);
+        lineChart.setVisibility(View.VISIBLE);
+        /**注：下面的7，10只是代表一个数字去类比而已
+         * 尼玛搞的老子好辛苦！！！参考见（http://forum.xda-developers.com/tools/programming/library-hellocharts-charting-library-t2904456/page2）;
+         * 下面几句可以设置X轴数据的显示个数（x轴0-7个数据），当数据点个数小于（29）的时候，缩小到极致hellochart默认的是所有显示。当数据点个数大于（29）的时候，
+         * 若不设置axisX.setMaxLabelChars(int count)这句话,则会自动适配X轴所能显示的尽量合适的数据个数。
+         * 若设置axisX.setMaxLabelChars(int count)这句话,
+         * 33个数据点测试，若 axisX.setMaxLabelChars(10);里面的10大于v.right= 7; 里面的7，则
+         刚开始X轴显示7条数据，然后缩放的时候X轴的个数会保证大于7小于10
+         若小于v.right= 7;中的7,反正我感觉是这两句都好像失效了的样子 - -!
+         * 并且Y轴是根据数据的大小自动设置Y轴上限
+         * 若这儿不设置 v.right= 7; 这句话，则图表刚开始就会尽可能的显示所有数据，交互性太差
+         */
+        Viewport v = new Viewport(lineChart.getMaximumViewport());
+        v.left = 0;
+        v.right= 7;
+        lineChart.setCurrentViewport(v);
+    }
+
+    /**
+     *  X 轴的显示
+     * @param mAxisXValues
+     * @param cBeanList
+     */
+    private static void getAxisXLables(List<AxisValue> mAxisXValues,List<ComPolylineBean> cBeanList){
+        for (int i = 0; i < cBeanList.size(); i++) {
+            mAxisXValues.add(new AxisValue(i).setLabel(cBeanList.get(i).getxValue()));
+        }
+    }
+
+    /**
+     * Y 轴的显示
+     * @param mPointValues
+     * @param cBeanList
+     */
+    private static void getAxisPoints(List<PointValue> mPointValues,List<ComPolylineBean> cBeanList){
+        for (int i = 0; i < cBeanList.size(); i++) {
+            mPointValues.add(new PointValue(i, cBeanList.get(i).getyValue()));
+        }
+    }
+}

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

@@ -15,6 +15,7 @@ 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;
 
@@ -25,7 +26,7 @@ import java.util.Map;
 
 public class StepUtils {
 
-    public static void doSaveLocalStepsToHttps() {
+    public static void doSaveLocalStepsToHttps(){
         StepDataDao stepDataDao = new StepDataDao(MyApplication.getInstance());
         //获取当前时间
         String CURRENT_DATE = TimeUtil.getCurrentDate();
@@ -33,16 +34,22 @@ public class StepUtils {
         if (entity == null) return;
         String steps = entity.getSteps();
         String date = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(entity.getCurDate(), "yyyy年MM月dd日"));
-
+        String em_name = "";
+        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();
+        }
         LogUtil.prinlnLongMsg("steps=,date=",steps+","+date);
         if (StringUtil.isEmpty(steps) || StringUtil.isEmpty(date)) return;
         Map<String,Object> saveMap = new HashMap<>();
         saveMap.put("as_userid",MyApplication.getInstance().mLoginUser.getUserId());
-        saveMap.put("as_username", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname"));
+        saveMap.put("as_username", em_name);
         saveMap.put("as_uusteps",steps);
         saveMap.put("as_date",date);
         String map = JSONUtil.map2JSON(saveMap);
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).build();
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appUUsteps")
                 .add("map",map)

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

@@ -34,6 +34,8 @@ import com.uas.appme.pedometer.utils.TimeUtil;
 
 import java.text.DecimalFormat;
 
+import lecho.lib.hellocharts.view.LineChartView;
+
 /**
  * Created by FANGlh on 2017/9/21.
  * function:
@@ -52,11 +54,14 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
     private PersonalStepBean mPersonalStepBean;
     private Button mbtnAttention;
 
+
+    private LineChartView lineChart;
+    String[] date = {"5-23","5-22","6-22","5-23","5-22","2-22","5-22","4-22","9-22","10-22","11-22","12-22","1-22","6-22","5-23","5-22","2-22","5-22","4-22","9-22","10-22","11-22","12-22","4-22","9-22","10-22","11-22","zxc"};//X轴的标注
+    int[] score= {74,22,18,79,20,74,20,74,42,90,74,42,90,50,42,90,33,10,74,22,18,79,20,74,22,18,79,20};//图表的数据
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.personal_page_activity);
-
         initView();
         initData();
     }
@@ -78,11 +83,12 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         mbtnAttention = (Button) findViewById(R.id.btn_attention);
         mbtnAttention.setOnClickListener(this);
         mPersonalStepBean = new PersonalStepBean();
-
+//        LineChartView line_chart = findViewById(R.id.line_chart);
         if (type == 3)  // type 1、2 我、已关注的人
             mbtnAttention.setVisibility(View.VISIBLE);
         else
             mbtnAttention.setVisibility(View.GONE);
+        lineChart = (LineChartView)findViewById(R.id.line_chart);
     }
 
     private void initData() {
@@ -103,10 +109,24 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
             public void onResponse(Object o) {
                 LogUtil.prinlnLongMsg("appSteps", o.toString());
                 mPersonalStepBean = JSON.parseObject(o.toString(),PersonalStepBean.class);
-                showStepsInfo();            }
+                showStepsInfo();
+                initPolylineData();
+            }
         }));
     }
 
+
+    //初始化折线数据
+    private void initPolylineData() {
+       /* if (mPersonalStepBean == null) return;
+        if (ListUtils.isEmpty(mPersonalStepBean.getMonthSteps()))  return;
+        List<ComPolylineBean> polyList = new ArrayList<>();
+        for (int i=0;i<mPersonalStepBean.getMonthSteps().size();i++){
+            if (!StringUtil.isEmpty(mPersonalStepBean.getMonthSteps().get(i).getAs_date())
+                    !&&)
+        }*/
+    }
+
     private void showStepsInfo() {
         progressDialog.dismiss();
         if (mPersonalStepBean == null || ListUtils.isEmpty(mPersonalStepBean.getWeekSteps()))  return;
@@ -142,6 +162,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
             @Override
             public void onResponse(Object o) {
                 LogUtil.prinlnLongMsg("appUUSet", o.toString());
+                setResult(0x02);
                 finish();
             }
         }));
@@ -223,11 +244,13 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
             doAttendHandle(0);
         }else if (v.getId() == R.id.share_friend_tv){
             ToastMessage("share_friend_tv");
+            closePopupWindow();
         }else if (v.getId() == R.id.share_monments_tv){
             ToastMessage("share_monments_tv");
+            closePopupWindow();
         }else if (v.getId() == R.id.not_rankingwith_tv){
             ToastMessage("not_rankingwith_tv");
+            closePopupWindow();
         }
-
     }
 }

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

@@ -56,6 +56,8 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
     private UUAttentionAdapter mAttenAdapter;
     private ImageView mHeaderImg;
     private StepsRankingBean mStepsRankingBean;
+    private int att_position = -1;
+    private int all_position = -1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -113,7 +115,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
 
         progressDialog.show();
         //获取所有人的当天步数数据
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).build();
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appStepsrank")
                 .add("userid",MyApplication.getInstance().mLoginUser.getUserId())
@@ -132,9 +134,10 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
                     mAttenAdapter.setModel(mStepsRankingBean);
                     mAttentionPtlv.setAdapter(mAttenAdapter);
                     mAttenAdapter.notifyDataSetChanged();
-                    if (mStepsRankingBean.getAttrank().size()>1)
+//                    if (mStepsRankingBean.getAttrank().size()>1)
                         mAttentionLl.setVisibility(View.VISIBLE);
                     progressDialog.dismiss();
+                    doPositionFocus();
                     LogUtil.prinlnLongMsg("mStepsRankingBean", JSON.toJSONString(mStepsRankingBean)+"");
                 }catch (Exception e){
                     e.printStackTrace();
@@ -144,6 +147,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
 
     }
 
+
     private void initEvents() {
         mAttentionPtlv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -159,6 +163,8 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
         });
     }
 
+
+
     private void inTentToPersonal(int type, int position) {
         Intent intent = new Intent(this,PersonalPageActivity.class);
         String title = "";
@@ -170,27 +176,49 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
                 title = "我";
                 userid = MyApplication.getInstance().mLoginUser.getUserId();
                 em_name = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
+                all_position=-1;att_position=-1;
                 break;
             case 2:
                 title = mStepsRankingBean.getAttrank().get(position).getAs_username();
                 userid = mStepsRankingBean.getAttrank().get(position).getAs_userid();
                 em_name = mStepsRankingBean.getAttrank().get(position).getAs_username();
+                all_position=-1;att_position=position;
+
+                if (MyApplication.getInstance().mLoginUser.getUserId().equals(userid)) {
+                    type = 1;
+                    title = "我";
+                }
                 break;
             case 3:
                 title = mStepsRankingBean.getToalrank().get(position).getAs_username();
                 userid = mStepsRankingBean.getToalrank().get(position).getAs_userid();
                 em_name = mStepsRankingBean.getToalrank().get(position).getAs_username();
+                all_position=position;att_position=-1;
+
+                if (MyApplication.getInstance().mLoginUser.getUserId().equals(userid)) {
+                    type = 1;
+                    title = "我";
+                }else {
+                    for (int i = 0; i < mStepsRankingBean.getAttrank().size(); i++) {
+                        if (mStepsRankingBean.getToalrank().get(position).getAs_userid()
+                                .equals(mStepsRankingBean.getAttrank().get(i).getAs_userid())){  //当点击的所有人某一人在关注人的遍历中存在时
+                            type = 2;
+                            break;
+                        }else if (i == mStepsRankingBean.getAttrank().size()-1){
+                            type = 3;
+                        }
+
+                    }
+                }
+
                 break;
         }
-        if (MyApplication.getInstance().mLoginUser.getUserId().equals(userid)) {
-            type = 1;
-            title = "我";
-        }
+
         intent.putExtra("type",type);
         intent.putExtra("title",title+"的主页");
         intent.putExtra("userid",userid);
         intent.putExtra("em_name",em_name);
-        startActivity(intent);
+        startActivityForResult(intent,0x01);
     }
 
     @Override
@@ -199,4 +227,26 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
             inTentToPersonal(1,0);
         }
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == 0x01 && resultCode == 0x02){
+            initData();
+        }
+    }
+
+    //对于处理点击关注或者取消关注后返回的焦点聚焦，回到之前位置的问题
+    private void doPositionFocus() {
+        if (all_position != -1 && all_position<mStepsRankingBean.getToalrank().size()){
+            mAllPtlv.setSelection(all_position);
+        }else if (all_position != -1 && all_position >= mStepsRankingBean.getToalrank().size()){
+            mAllPtlv.setSelection(mStepsRankingBean.getToalrank().size()-1);
+        }else if (att_position != -1 && att_position<mStepsRankingBean.getAttrank().size()){
+            mAttentionPtlv.setSelection(att_position);
+        }else if (att_position != -1 && att_position >= mStepsRankingBean.getAttrank().size()) {
+            mAttentionPtlv.setSelection(mStepsRankingBean.getAttrank().size() - 1);
+        }
+    }
 }

app_modular/appme/src/main/res/layout/item_uuattention.xml

@@ -53,7 +53,8 @@
             android:textSize="@dimen/BigTextSize"
             android:textColor="@color/green"
             android:layout_toLeftOf="@+id/prise_tv"
-            android:layout_marginRight="20dp"
+            android:layout_marginRight="30dp"
+            android:text="11"
             />
 
         <TextView
@@ -65,7 +66,8 @@
             android:layout_marginBottom="0dp"
             android:textSize="@dimen/text_hine"
             android:textColor="@color/text_hine"
-            android:layout_marginRight="5dp"/>
+            android:layout_marginRight="5dp"
+            android:visibility="invisible"/>
         <ImageView
             android:id="@+id/prise_im"
             android:layout_width="25dp"

app_modular/appme/src/main/res/layout/item_uuranking.xml

@@ -21,7 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp"
+        android:layout_marginLeft="15dp"
         >
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/photo_img"

app_modular/appme/src/main/res/layout/personal_page_activity.xml

@@ -1,5 +1,8 @@
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_main"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -151,6 +154,12 @@
                 </LinearLayout>
             </LinearLayout>
         </RelativeLayout>
+        <lecho.lib.hellocharts.view.LineChartView
+            android:id="@+id/line_chart"
+            android:layout_width="match_parent"
+            android:layout_height="250dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"/>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -164,7 +173,8 @@
                 android:padding="10dp"
                 android:text="关  注"
                 android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_main"
+                android:layout_marginBottom="20dp"/>
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+</ScrollView>