15:16

app_core/common/build.gradle

@@ -50,5 +50,5 @@ dependencies {
     compile project(':lib-zxing')
     compile project(':library-refreshlayout')
     compile project(':recyclerlibrary')
-    compile files('libs/hellocharts-library-1.5.8.jar')
+    compile files('libs/hellocharts-library-1.5.8.jar')  //折线库
 }

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

@@ -37,7 +37,8 @@ public class PolylineUtils {
         getAxisXLables(mAxisXValues,cBeanList);//获取x轴的标注
         getAxisPoints(mPointValues,cBeanList);//获取坐标点
 
-        Line line = new Line(mPointValues).setColor(Color.parseColor("#5DB7CF"));  //折线的颜色
+//        Line line = new Line(mPointValues).setColor(Color.parseColor("#F0FFFF"));  //折线的颜色
+        Line line = new Line(mPointValues).setColor(Color.WHITE);  //折线的颜色
         List<Line> lines = new ArrayList<>();
         line.setShape(ValueShape.CIRCLE);//折线图上每个数据点的形状  这里是圆形 （有三种 ：ValueShape.SQUARE  ValueShape.CIRCLE  ValueShape.SQUARE）
         line.setCubic(false);//曲线是否平滑
@@ -54,8 +55,8 @@ public class PolylineUtils {
         //坐标轴
         Axis axisX = new Axis(); //X轴
         axisX.setHasTiltedLabels(true);  //X轴下面坐标轴字体是斜的显示还是直的，true是斜的显示
-//	    axisX.setTextColor(Color.WHITE);  //设置字体颜色
-        axisX.setTextColor(Color.parseColor("#D6D6D9"));//灰色
+	    axisX.setTextColor(Color.WHITE);  //设置字体颜色
+//        axisX.setTextColor(Color.parseColor("#D6D6D9"));//灰色
 
 //	    axisX.setName("未来几天的天气");  //表格名称
         axisX.setTextSize(11);//设置字体大小
@@ -69,6 +70,7 @@ public class PolylineUtils {
         Axis axisY = new Axis();  //Y轴
         axisY.setName("");//y轴标注
         axisY.setTextSize(11);//设置字体大小
+        axisY.setTextColor(Color.WHITE);
         data.setAxisYLeft(axisY);  //Y轴设置在左边
         //data.setAxisYRight(axisY);  //y轴设置在右边
         //设置行为属性，支持缩放、滑动以及平移

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

@@ -1,12 +1,25 @@
 package com.uas.appme.pedometer.utils;
 
+import android.app.Activity;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
+import com.core.model.Friend;
+import com.core.model.XmppMessage;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
+import com.core.xmpp.ListenerManager;
+import com.core.xmpp.dao.ChatMessageDao;
+import com.core.xmpp.dao.FriendDao;
+import com.core.xmpp.downloader.UploadEngine;
+import com.core.xmpp.listener.ChatMessageListener;
+import com.core.xmpp.model.ChatMessage;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -16,7 +29,9 @@ import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * Created by FANGlh on 2017/9/21.
@@ -71,4 +86,116 @@ public class StepUtils {
     private static boolean isCanStep(){
         return StepCountCheckUtil.isSupportStepCountSensor(MyApplication.getInstance());
     }
+
+
+    /**
+     * 分享UU运动的发消息方法
+     * @param activity 上下文
+     * @param loginim_id  自己的imid
+     * @param friendim_id  要分享的好友的imid
+     */
+    public  void sendShareStepMsg(final ChatMessage message,Activity activity,String loginim_id, String friendim_id){
+        if (interprect(message)) {
+            return;
+        }
+
+        message.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));
+        ChatMessageDao.getInstance().saveNewSingleChatMessage(loginim_id, friendim_id, message);
+        if (message.getType() == XmppMessage.TYPE_VOICE || message.getType() == XmppMessage.TYPE_IMAGE
+                || message.getType() == XmppMessage.TYPE_VIDEO || message.getType() == XmppMessage.TYPE_FILE) {
+            if (!message.isUpload()) {
+                Log.d("roamer", "去更新服务器的数据");
+                UploadEngine.uploadImFile(friendim_id, message, mUploadResponse);
+
+            } else {
+                Log.d("roamer", "sendChatMessage....");
+                mService.sendChatMessage(mFriend.getUserId(), message);
+            }
+        } else {
+            Log.d("roamer", "sendChatMessage");
+
+            mService.sendChatMessage(mFriend.getUserId(), message);
+            //进行百度推送
+            sendPushTask(mLoginUserId, mFriend.getUserId(), message.getContent());
+
+        }
+    }
+
+
+    private void sendMessage(final ChatMessage message) {
+        if (interprect(message)) {
+            return;
+        }
+        Log.i("wang", "send message:" + JSON.toJSONString(message));
+        boolean mHasSend = true;
+        Log.d("roamer", "开始发送消息,ChatBottomView的回调 sendmessage");
+        message.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));
+        ChatMessageDao.getInstance().saveNewSingleChatMessage(mLoginUserId, mFriend.getUserId(), message);
+        if (message.getType() == XmppMessage.TYPE_VOICE || message.getType() == XmppMessage.TYPE_IMAGE
+                || message.getType() == XmppMessage.TYPE_VIDEO || message.getType() == XmppMessage.TYPE_FILE) {
+            if (!message.isUpload()) {
+                Log.d("roamer", "去更新服务器的数据");
+                UploadEngine.uploadImFile(mFriend.getUserId(), message, mUploadResponse);
+
+            } else {
+                Log.d("roamer", "sendChatMessage....");
+                mService.sendChatMessage(mFriend.getUserId(), message);
+            }
+        } else {
+            Log.d("roamer", "sendChatMessage");
+
+            mService.sendChatMessage(mFriend.getUserId(), message);
+            //进行百度推送
+            sendPushTask(mLoginUserId, mFriend.getUserId(), message.getContent());
+
+        }
+    }
+    /**
+     * 拦截发送的消息
+     *
+     * @param message
+     */
+    public boolean interprect(ChatMessage message) {
+        int len = 0;
+        List<Friend> mBlackList  = FriendDao.getInstance().getAllBlacklists(MyApplication.getInstance().mLoginUser.getUserId());
+        if (mBlackList != null) {
+            for (Friend friend : mBlackList) {
+                if (friend.getUserId().equals(mFriend.getUserId())) {
+                    Toast.makeText(mContext, "已经加入黑名单,无法发送消息", Toast.LENGTH_SHORT).show();
+                    len++;
+                }
+            }
+        }
+        Log.d("wang", "....kkkkk");
+        if (len != 0) {
+            // finish();
+            ListenerManager.getInstance().notifyMessageSendStateChange(mLoginUserId, mFriend.getUserId(),
+                    message.get_id(), ChatMessageListener.MESSAGE_SEND_FAILED);
+            return true;
+        }
+        return false;
+    }
+    private UploadEngine.ImFileUploadResponse mUploadResponse = new UploadEngine.ImFileUploadResponse() {
+        @Override
+        public void onSuccess(String toUserId, ChatMessage message) {
+            mService.sendChatMessage(mFriend.getUserId(), message);
+
+        }
+
+        @Override
+        public void onFailure(String toUserId, ChatMessage message) {
+            for (int i = 0; i < mChatMessages.size(); i++) {
+                ChatMessage msg = mChatMessages.get(i);
+                if (message.get_id() == msg.get_id()) {
+                    msg.setMessageState(ChatMessageListener.MESSAGE_SEND_FAILED);
+                    ChatMessageDao.getInstance().updateMessageSendState(mLoginUserId, mFriend.getUserId(),
+                            message.get_id(), ChatMessageListener.MESSAGE_SEND_FAILED);
+                    mChatContentView.notifyDataSetInvalidated(false);
+                    break;
+                }
+            }
+        }
+
+    };
+
 }

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

@@ -27,6 +27,8 @@ import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.uas.appcontact.model.contacts.ContactsModel;
+import com.uas.appcontact.ui.activity.ContactsActivity;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.ComPolylineBean;
 import com.uas.appme.pedometer.bean.PersonalStepBean;
@@ -58,11 +60,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
     private TextView mMovementTotalStepsTimeTv;
     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);
@@ -256,6 +254,10 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         }else if (v.getId() == R.id.cancel_attention_tv){
             doAttendHandle(0);
         }else if (v.getId() == R.id.share_friend_tv){
+            Intent intent = new Intent(this, ContactsActivity.class);
+            intent.putExtra("type", 1);
+            intent.putExtra("title", "分享好友");
+            startActivityForResult(intent, 0x01);
             ToastMessage("share_friend_tv");
             closePopupWindow();
         }else if (v.getId() == R.id.share_monments_tv){
@@ -266,4 +268,14 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
             closePopupWindow();
         }
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (data == null) return;
+        if (requestCode == 0x01){
+            ContactsModel model = data.getParcelableExtra("data");
+            LogUtil.d("0x01",JSON.toJSONString(model));
+        }
+    }
 }

app_modular/appme/src/main/res/drawable/bg_green_btn.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/light_green" />
+            <corners android:radius="8dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -154,12 +154,19 @@
                 </LinearLayout>
             </LinearLayout>
         </RelativeLayout>
-        <lecho.lib.hellocharts.view.LineChartView
-            android:id="@+id/line_chart"
-            android:layout_width="match_parent"
-            android:layout_height="250dp"
+        <RelativeLayout
             android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"/>
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:background="#48D1CC">
+            <lecho.lib.hellocharts.view.LineChartView
+                android:id="@+id/line_chart"
+                android:layout_width="match_parent"
+                android:layout_height="300dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="20dp"/>
+        </RelativeLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -169,7 +176,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:background="@drawable/bg_bule_btn"
+                android:background="@drawable/bg_green_btn"
                 android:padding="10dp"
                 android:text="关  注"
                 android:textColor="@color/white"