Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/AutoErpService.java

@@ -320,7 +320,7 @@ public class AutoErpService extends Service {
 
                         if (dnoticeIter == i) {
                             LogUtil.i("dnoticeIter == i");
-                            MyApplication.getInstance().getBdLocationHelper().requestLocation();
+//                            MyApplication.getInstance().getBdLocationHelper().requestLocation();   // 暂时去掉定位
                         }
                         if (dnoticeIter == 0 || dnoticeIter == DNOTICE_ITER) {
                             dnoticeIter = 0;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/DepositNoticeUtil.java

@@ -19,10 +19,10 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
-import com.core.app.AppConstant;
 import com.core.net.http.ViewUtil;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.utils.NotificationManage;
@@ -31,7 +31,6 @@ import com.core.utils.TimeUtils;
 import com.uas.appme.pedometer.utils.TimeUtil;
 import com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingListActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.book.SureBookModel;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,7 +47,6 @@ import static com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil.getInstence;
 
 public class DepositNoticeUtil {
     private boolean isB2b;
-    public static final String DEPOSIT_NOTICE_TASK = "DEPOSIT_NOTICE_TASK";//预约计划提醒任务
     private static NotificationManage notificationManage;
     private static List<SureBookModel> mSureBookModel = new ArrayList<>();
 
@@ -130,20 +128,37 @@ public class DepositNoticeUtil {
      */
     public static void isNoticeTimeInMainLooper(List<SureBookModel> models) {
         for (SureBookModel model : models) {
-            LatLng latLng = new LatLng(Double.valueOf(model.getAb_latitude()), Double.valueOf(model.getAb_longitude()));
+
+            // 暂时去掉定位
+/*            LatLng latLng = new LatLng(Double.valueOf(model.getAb_latitude()), Double.valueOf(model.getAb_longitude()));
             float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
             if (distance == -1f) {
                 LogUtil.i("distance == -1f");
                 continue;
-            }
+            }*/
             if (model.getAb_starttime().compareTo(TimeUtils.f_long_2_str(System.currentTimeMillis())) > 0) {
-                setNoticeTime(model.getAb_starttime(), latLng, distance);
+//                setNoticeTime(model.getAb_starttime(), latLng, distance);    // 暂时去掉定位
+                setNotice2Time(model.getAb_starttime());
             }
             LogUtil.prinlnLongMsg("startTime,current_T", model.getAb_starttime() + "," + TimeUtils.f_long_2_str(System.currentTimeMillis()));
 
         }
     }
 
+    private static void setNotice2Time(String startTime) {
+        long startNoticeTime = TimeUtils.f_str_2_long(startTime) - 20 * 60 * 1000;
+        if (startNoticeTime <= System.currentTimeMillis()) {
+            //TODO 提醒
+            Log.i("notificationManage", "开始提醒");
+            notificationManage.sendNotification(MyApplication.getInstance(),
+                    "您有预约计划即将开始！", BookingListActivity.class);
+        } else {
+            Log.i("notificationManage", "提醒时间不符合");
+        }
+        LogUtil.i("startNoticeTime=" + TimeUtils.f_long_2_str(startNoticeTime));
+        LogUtil.i("System.currentTimeMillis()=" + TimeUtils.f_long_2_str(System.currentTimeMillis()));
+    }
+
     public static List<SureBookModel> getsureBookData() {
         return mSureBookModel;
     }

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

@@ -426,7 +426,7 @@
                 android:background="@color/transparent"
                 android:contentDescription="@string/app_name"
                 android:padding="1dp"
-                android:src="@drawable/uu_step" />
+                android:src="@drawable/uu_run" />
 
             <TextView
                 android:id="@+id/uustep_num_tv"

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

@@ -1,5 +1,6 @@
 package com.core.utils;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
@@ -9,9 +10,11 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
@@ -21,6 +24,7 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.util.Log;
+import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -56,6 +60,9 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static android.view.View.DRAWING_CACHE_QUALITY_HIGH;
+import static android.view.View.DRAWING_CACHE_QUALITY_LOW;
+
 /**
  * Created by Arison on 2017/8/29.
  */

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

@@ -426,7 +426,7 @@
                 android:background="@color/transparent"
                 android:contentDescription="@string/app_name"
                 android:padding="1dp"
-                android:src="@drawable/uu_step" />
+                android:src="@drawable/uu_run" />
 
             <TextView
                 android:id="@+id/uustep_num_tv"

app_modular/appme/src/main/AndroidManifest.xml

@@ -43,5 +43,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".pedometer.view.PersonalPageActivity"/>
+        <activity android:name=".pedometer.view.ShareStepsActivity"
+            android:label="分享"/>
     </application>
 </manifest>

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

@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.common.data.ListUtils;
+import com.core.app.MyApplication;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepsRankingBean;
 import com.uas.appme.pedometer.utils.StepUtils;
@@ -65,11 +66,16 @@ public class UUAttentionAdapter extends BaseAdapter{
 //        if(!MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAttrank().get(position).getAs_userid())){  //关注的人不应该显示自己，但是数据返回了自己，这里要判断一下不显示
             viewHolder.name_tv.setText(model.getAttrank().get(position).getAs_username());
             viewHolder.steps_tv.setText(model.getAttrank().get(position).getAs_uusteps());
+            viewHolder.prise_tv.setText(model.getAttrank().get(position).getAs_prise());
             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;
             }
+
+            if (MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAttrank().get(position).getAs_userid())
+                    && Integer.valueOf(model.getAttrank().get(position).getAs_prise()) > 0)
+                viewHolder.prise_im.setImageResource(R.drawable.praised);
         }
         viewHolder.prise_im.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.common.data.ListUtils;
+import com.core.app.MyApplication;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepsRankingBean;
 import com.uas.appme.pedometer.utils.StepUtils;
@@ -66,7 +67,13 @@ public class UURankingAdapter extends BaseAdapter{
         viewHolder.ranking_tv.setText(model.getToalrank().get(position).getRank()+"");
         viewHolder.name_tv.setText(model.getToalrank().get(position).getAs_username());
         viewHolder.steps_tv.setText(model.getToalrank().get(position).getAs_uusteps());
+        viewHolder.prise_tv.setText(model.getToalrank().get(position).getAs_prise());
 
+        if (MyApplication.getInstance().mLoginUser.getUserId().equals(model.getToalrank().get(position).getAs_userid())
+                && Integer.valueOf(model.getToalrank().get(position).getAs_prise()) > 0)
+            viewHolder.prise_im.setImageResource(R.drawable.praised);
+        else
+            viewHolder.prise_im.setImageResource(R.drawable.praise);
         viewHolder.prise_im.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -33,6 +33,7 @@ public class StepsRankingBean {
         /**
          * as_date : 2017-09-22 00:00:00.0
          * as_id : 6
+         * "as_prise": "2",
          * as_userid : 109079
          * as_username : 陈爱平
          * as_uusteps : 50
@@ -41,11 +42,20 @@ public class StepsRankingBean {
 
         private String as_date;
         private String as_id;
+        private String as_prise;
         private String as_userid;
         private String as_username;
         private String as_uusteps;
         private int rank;
 
+        public String getAs_prise() {
+            return as_prise;
+        }
+
+        public void setAs_prise(String as_prise) {
+            this.as_prise = as_prise;
+        }
+
         public String getAs_date() {
             return as_date;
         }
@@ -99,6 +109,7 @@ public class StepsRankingBean {
         /**
          * as_date : 2017-09-22 00:00:00.0
          * as_id : 6
+         * as_prise: "2",
          * as_userid : 109079
          * as_username : 陈爱平
          * as_uusteps : 50
@@ -107,11 +118,20 @@ public class StepsRankingBean {
 
         private String as_date;
         private String as_id;
+        private String as_prise;
         private String as_userid;
         private String as_username;
         private String as_uusteps;
         private int rank;
 
+        public String getAs_prise() {
+            return as_prise;
+        }
+
+        public void setAs_prise(String as_prise) {
+            this.as_prise = as_prise;
+        }
+
         public String getAs_date() {
             return as_date;
         }

app_modular/appme/src/main/java/com/uas/appme/pedometer/service/StepService.java

@@ -169,7 +169,7 @@ public class StepService extends Service implements SensorEventListener {
         // 屏幕解锁广播
         filter.addAction(Intent.ACTION_USER_PRESENT);
         filter.addAction("updateStepEntity");
-        filter.addAction("addStepEntity");
+//        filter.addAction("addStepEntity");
         // 当长按电源键弹出“关机”对话或者锁屏时系统会发出这个广播
         // example：有时候会用到系统对话框，权限可能很高，会覆盖在锁屏界面或者“关机”对话框之上，
         // 所以监听这个广播，当收到时就隐藏自己的对话，如点击pad右下角部分弹出的对话框
@@ -215,7 +215,7 @@ public class StepService extends Service implements SensorEventListener {
                         isNewDay();
                         break;
                     case "updateStepEntity":
-                    case "addStepEntity":
+//                    case "addStepEntity":
                         int remoteSteps = intent.getIntExtra("remoteSteps", -1);
                         LogUtil.prinlnLongMsg("stepDb.update","updateStepEntity="+remoteSteps);
                         if (remoteSteps > CURRENT_STEP) {

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

@@ -2,18 +2,29 @@ package com.uas.appme.pedometer.utils;
 
 import android.content.Intent;
 import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
+import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.AppConstant;
 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.CoreService;
+import com.core.xmpp.ListenerManager;
+import com.core.xmpp.dao.ChatMessageDao;
+import com.core.xmpp.dao.FriendDao;
+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;
@@ -25,7 +36,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.
@@ -90,9 +103,10 @@ public class StepUtils {
 
 
             if (stepEntity == null) {
-                Intent intent = new Intent("addStepEntity");
-                intent.putExtra("remoteSteps", remoteSteps);
-                BaseConfig.getContext().sendBroadcast(intent);
+//                Intent intent = new Intent("addStepEntity");  //隔夜数据未清空，有点问题，先不用
+//                intent.putExtra("remoteSteps", remoteSteps);
+//                BaseConfig.getContext().sendBroadcast(intent);
+                return;
             } else if (remoteSteps > CommonUtil.getNumByString(stepEntity.getSteps())) { //  本地步数小于服务端 ，更新本地步数，使其通服务器一样
                 Intent intent = new Intent("updateStepEntity");
                 intent.putExtra("remoteSteps", remoteSteps);
@@ -154,93 +168,125 @@ public class StepUtils {
      * @param position
      */
     public static void doStepPriseHttp(StepsRankingBean model, int type, int position) {
+        String userid = null;
         switch (type){
             case 2:
+                userid = model.getAttrank().get(position).getAs_userid();
                 break;
             case 3:
+                userid = model.getToalrank().get(position).getAs_userid();
                 break;
         }
-
-        //TODO 请求操作成功后发广播更新排行版界面
-        //发送本地广播
-        LocalBroadcastManager.getInstance(MyApplication.getInstance().getApplicationContext()).sendBroadcast(new Intent(AppConstant.UPDATE_STEPRANKING_PRISE));
+        if (StringUtil.isEmpty(userid) || MyApplication.getInstance().mLoginUser.getUserId().equals(userid)) return;  //不可以赞自己
+        //点赞操作
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("appStepPrise")
+                .add("userid",userid) // 点赞对象ID
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .add("selfid",MyApplication.getInstance().mLoginUser.getUserId())
+                .add("selfname",CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname"))
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                LogUtil.prinlnLongMsg("appStepPrise", o.toString()+"");
+                try {
+                    //TODO 请求操作成功后发广播更新排行版界面
+                    //发送本地广播
+                    LocalBroadcastManager.getInstance(MyApplication.getInstance().getApplicationContext()).sendBroadcast(new Intent(AppConstant.UPDATE_STEPRANKING_PRISE));
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+        }));
     }
 
 
-    /**
-     * 分享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)) {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * 分享UU运动的发消息方法
+     * @param ownerId
+     * @param ownerName
+     * @param objectId
+     * @param text
+     */
+    public static void sendMessage( CoreService mService,final String ownerId,String ownerName, final String objectId,  final String text) {
+//         ServiceConnection mConnection = new ServiceConnection() {
+//            @Override
+//            public void onServiceDisconnected(ComponentName name) {
+//                mService = null;
+//            }
+//
+//            @Override
+//            public void onServiceConnected(ComponentName name, IBinder service) {
+//                mService= ((CoreService.CoreServiceBinder) service).getService();
+//
+//            }
+//        };
+        ChatMessage message = new ChatMessage();
+        message.setType(XmppMessage.TYPE_TEXT);
+        message.setContent(text);
+        message.setFromUserName(ownerName);
+        message.setFromUserId(ownerId);
+        message.setTimeSend(CalendarUtil.getSecondMillion());
+        if (interprect(ownerId,objectId,message)) {
             return;
         }
         Log.i("wang", "send message:" + JSON.toJSONString(message));
-        boolean mHasSend = true;
+        // mHasSend = true;
         Log.d("roamer", "开始发送消息,ChatBottomView的回调 sendmessage");
         message.setPacketId(UUID.randomUUID().toString().replaceAll("-", ""));
-        ChatMessageDao.getInstance().saveNewSingleChatMessage(mLoginUserId, mFriend.getUserId(), message);
+        ChatMessageDao.getInstance().saveNewSingleChatMessage(ownerId, objectId, 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);
+                // UploadEngine.uploadImFile(mFriend.getUserId(), message, mUploadResponse);
 
             } else {
                 Log.d("roamer", "sendChatMessage....");
-                mService.sendChatMessage(mFriend.getUserId(), message);
+                mService.sendChatMessage(objectId, message);
             }
         } else {
             Log.d("roamer", "sendChatMessage");
-
-            mService.sendChatMessage(mFriend.getUserId(), message);
-            //进行百度推送
-            sendPushTask(mLoginUserId, mFriend.getUserId(), message.getContent());
+            mService.sendChatMessage(objectId, message);
 
         }
     }
-    *//**
+
+    /**
      * 拦截发送的消息
      *
      * @param message
-     *//*
-    public boolean interprect(ChatMessage message) {
+     */
+    private static boolean interprect(String ownerId,String objectId,ChatMessage message) {
         int len = 0;
-        List<Friend> mBlackList  = FriendDao.getInstance().getAllBlacklists(MyApplication.getInstance().mLoginUser.getUserId());
-        if (mBlackList != null) {
+        List<Friend> mBlackList = FriendDao.getInstance().getAllBlacklists(ownerId);
+        if (mBlackList!=null) {
             for (Friend friend : mBlackList) {
-                if (friend.getUserId().equals(mFriend.getUserId())) {
-                    Toast.makeText(mContext, "已经加入黑名单,无法发送消息", Toast.LENGTH_SHORT).show();
+                if (friend.getUserId().equals(objectId)) {
+                    Toast.makeText(MyApplication.getInstance(), "已经加入黑名单,无法发送消息", Toast.LENGTH_SHORT).show();
                     len++;
                 }
             }
@@ -248,33 +294,10 @@ public class StepUtils {
         Log.d("wang", "....kkkkk");
         if (len != 0) {
             // finish();
-            ListenerManager.getInstance().notifyMessageSendStateChange(mLoginUserId, mFriend.getUserId(),
+            ListenerManager.getInstance().notifyMessageSendStateChange(ownerId, objectId,
                     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

@@ -1,6 +1,10 @@
 package com.uas.appme.pedometer.view;
 
+import android.annotation.TargetApi;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Gravity;
@@ -9,6 +13,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
@@ -16,6 +21,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
@@ -23,6 +29,7 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
+import com.core.xmpp.CoreService;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -34,6 +41,7 @@ import com.uas.appme.pedometer.bean.ComPolylineBean;
 import com.uas.appme.pedometer.bean.PersonalStepBean;
 import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.utils.PolylineUtils;
+import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.pedometer.utils.TimeUtil;
 
 import java.text.DecimalFormat;
@@ -43,6 +51,10 @@ import java.util.List;
 
 import lecho.lib.hellocharts.view.LineChartView;
 
+import static android.view.View.DRAWING_CACHE_QUALITY_AUTO;
+import static android.view.View.DRAWING_CACHE_QUALITY_HIGH;
+import static android.view.View.DRAWING_CACHE_QUALITY_LOW;
+
 /**
  * Created by FANGlh on 2017/9/21.
  * function:
@@ -61,6 +73,11 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
     private PersonalStepBean mPersonalStepBean;
     private Button mbtnAttention;
     private LineChartView lineChart;
+    private String shareStepStr = "分享了UU运动内容给你";
+    private ImageView share_bitmap_im;
+    private LinearLayout line_chart_ll;
+    private int my_rank;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -76,6 +93,8 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         userid = intent.getStringExtra("userid");
         em_name = intent.getStringExtra("em_name");
         type = intent.getIntExtra("type", -1);
+        if (type == 1)
+            my_rank = intent.getIntExtra("my_rank",-1);
         getSupportActionBar().setTitle(title);
 
         LogUtil.i("userid",userid);
@@ -84,14 +103,16 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         mMovementTotalStepsTv = (TextView) findViewById(R.id.movement_total_steps_tv);
         mMovementTotalStepsTimeTv = (TextView) findViewById(R.id.movement_total_steps_time_tv);
         mbtnAttention = (Button) findViewById(R.id.btn_attention);
+        share_bitmap_im = (ImageView) findViewById(R.id.share_bitmap_im);
         mbtnAttention.setOnClickListener(this);
         mPersonalStepBean = new PersonalStepBean();
 //        LineChartView line_chart = findViewById(R.id.line_chart);
-        if (type == 3)  // type 1、2 我、已关注的人
+        if (type == 3)  // type 1、2:我、已关注的人
             mbtnAttention.setVisibility(View.VISIBLE);
         else
             mbtnAttention.setVisibility(View.GONE);
         lineChart = (LineChartView)findViewById(R.id.line_chart);
+        line_chart_ll = (LinearLayout) findViewById(R.id.line_chart_ll);
     }
 
     private void initData() {
@@ -118,6 +139,25 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
                 initPolylineData();
             }
         }));
+
+        //获取点赞信息
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("appPriseList")
+                .add("userid",userid)
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                LogUtil.prinlnLongMsg("appPriseList", o.toString()+"");
+                try {
+
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+        }));
     }
 
 
@@ -264,20 +304,71 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
             ToastMessage("share_friend_tv");
             closePopupWindow();
         }else if (v.getId() == R.id.share_monments_tv){
-            ToastMessage("share_monments_tv");
+            Intent intent = new Intent(this,ShareStepsActivity.class);
+            intent.putExtra("my_rank",my_rank);
+            intent.putExtra("my_steps",mMovementTotalStepsTv.getText().toString());
+            intent.putExtra("im_ids","im_ids");
+            startActivity(intent);
+//            Bitmap bitmap = getViewToBitmap(line_chart_ll);
+//            share_bitmap_im.setImageBitmap(bitmap);
             closePopupWindow();
         }else if (v.getId() == R.id.not_rankingwith_tv){
             ToastMessage("not_rankingwith_tv");
             closePopupWindow();
         }
     }
-
+    /**
+     * 获取某视图下截图，返回其BitMap对象
+     * @param view
+     * @return
+     */
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    public Bitmap getViewToBitmap(View view) {
+        Bitmap bitmap = null;
+        int width = view.getRight() - view.getLeft();
+        int height = view.getBottom() - view.getTop();
+        final boolean opaque = view.getDrawingCacheBackgroundColor() != 0 || view.isOpaque();
+        Bitmap.Config quality;
+        if (!opaque) {
+            switch (view.getDrawingCacheQuality()) {
+                case DRAWING_CACHE_QUALITY_AUTO:
+                case DRAWING_CACHE_QUALITY_LOW:
+                case DRAWING_CACHE_QUALITY_HIGH:
+                default:
+                    quality = Bitmap.Config.ARGB_8888;
+                    break;
+            }
+        } else {
+            quality = Bitmap.Config.RGB_565;
+        }
+        bitmap = Bitmap.createBitmap(getResources().getDisplayMetrics(),
+                width, height, quality);
+        bitmap.setDensity(getResources().getDisplayMetrics().densityDpi);
+        if (opaque) bitmap.setHasAlpha(false);
+        boolean clear = view.getDrawingCacheBackgroundColor() != 0;
+        Canvas canvas = new Canvas(bitmap);
+        if (clear) {
+            bitmap.eraseColor(view.getDrawingCacheBackgroundColor());
+        }
+        view.computeScroll();
+        final int restoreCount = canvas.save();
+        canvas.translate(-view.getScrollX(), -view.getScrollY());
+        view.draw(canvas);
+        canvas.restoreToCount(restoreCount);
+        canvas.setBitmap(null);
+        return bitmap;
+    }
     @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");
+            String ownerId = MyApplication.getInstance().mLoginUser.getUserId();
+            String ownerName = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
+            String objectId = model.getImid();
+            CoreService mService = new CoreService();
+            StepUtils.sendMessage(mService,ownerId,ownerName,objectId,shareStepStr);
             LogUtil.d("0x01",JSON.toJSONString(model));
         }
     }

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

@@ -0,0 +1,119 @@
+package com.uas.appme.pedometer.view;
+
+
+import android.annotation.TargetApi;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.core.base.BaseActivity;
+import com.uas.appme.R;
+
+import de.hdodenhof.circleimageview.CircleImageView;
+
+import static android.view.View.DRAWING_CACHE_QUALITY_AUTO;
+import static android.view.View.DRAWING_CACHE_QUALITY_HIGH;
+import static android.view.View.DRAWING_CACHE_QUALITY_LOW;
+
+/**
+ * Created by FANGlh on 2017/9/29.
+ * function:
+ */
+
+public class ShareStepsActivity extends BaseActivity {
+    private LinearLayout mShareLl;
+    private ImageView mStepsShareBg;
+    private CircleImageView mSharerIm;
+    private TextView mMtRankTvStr;
+    private TextView mMtRankTv;
+    private TextView mMtStepsTvStr;
+    private TextView mMtStepsTv;
+    private ImageView mNssb;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.share_steps_activity);
+        initView();
+        initData();
+    }
+
+    private void initView() {
+        mShareLl = (LinearLayout) findViewById(R.id.share_ll);
+        mStepsShareBg = (ImageView) findViewById(R.id.steps_share_bg);
+        mSharerIm = (CircleImageView) findViewById(R.id.sharer_im);
+        mMtRankTvStr = (TextView) findViewById(R.id.mt_rank_tv_str);
+        mMtRankTv = (TextView) findViewById(R.id.mt_rank_tv);
+        mMtStepsTvStr = (TextView) findViewById(R.id.mt_steps_tv_str);
+        mMtStepsTv = (TextView) findViewById(R.id.mt_steps_tv);
+        mNssb = (ImageView) findViewById(R.id.nssb);
+    }
+
+    private void initData() {
+        int my_rank = getIntent().getIntExtra("my_rank", -1);
+        String my_steps = getIntent().getStringExtra("my_steps");
+        String im_ids = getIntent().getStringExtra("im_ids");
+
+        mMtRankTv.setText(String.valueOf(my_rank));
+        mMtStepsTv.setText(my_steps);
+        Bitmap bitmap = getViewToBitmap(mShareLl);
+
+        if (bitmap == null) return;
+        Intent intent = new Intent("com.modilar.circle.SendShuoshuoActivity");
+        intent.putExtra("type", 1);
+
+        mNssb.setImageBitmap(bitmap);
+    }
+
+
+    /**
+     * 获取某视图下截图，返回其BitMap对象
+     *
+     * @param view
+     * @return
+     */
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    public Bitmap getViewToBitmap(View view) {
+        Bitmap bitmap = null;
+//        int width = view.getRight() - view.getLeft();
+//        int height = view.getBottom() - view.getTop();
+        int width = 480;
+        int height = 640;
+        final boolean opaque = view.getDrawingCacheBackgroundColor() != 0 || view.isOpaque();
+        Bitmap.Config quality;
+        if (!opaque) {
+            switch (view.getDrawingCacheQuality()) {
+                case DRAWING_CACHE_QUALITY_AUTO:
+                case DRAWING_CACHE_QUALITY_LOW:
+                case DRAWING_CACHE_QUALITY_HIGH:
+                default:
+                    quality = Bitmap.Config.ARGB_8888;
+                    break;
+            }
+        } else {
+            quality = Bitmap.Config.RGB_565;
+        }
+        bitmap = Bitmap.createBitmap(getResources().getDisplayMetrics(),
+                width, height, quality);
+        bitmap.setDensity(getResources().getDisplayMetrics().densityDpi);
+        if (opaque) bitmap.setHasAlpha(false);
+        boolean clear = view.getDrawingCacheBackgroundColor() != 0;
+        Canvas canvas = new Canvas(bitmap);
+        if (clear) {
+            bitmap.eraseColor(view.getDrawingCacheBackgroundColor());
+        }
+        view.computeScroll();
+        final int restoreCount = canvas.save();
+        canvas.translate(-view.getScrollX(), -view.getScrollY());
+        view.draw(canvas);
+        canvas.restoreToCount(restoreCount);
+        canvas.setBitmap(null);
+        return bitmap;
+    }
+}

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

@@ -72,6 +72,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
             initData();
         }
     };
+    private int my_rank = -1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -142,11 +143,9 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
-                if (o == null) return;
-                if (!JSONUtil.validate(o.toString())) return;
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("appStepsrank", o.toString()+"");
                 try {
-                    if (!JSONUtil.validate(o.toString())) return;
                     mStepsRankingBean = JSON.parseObject(o.toString(),StepsRankingBean.class);
                     mRankAdapter.setModel(mStepsRankingBean);
                     mAllPtlv.setAdapter(mRankAdapter);
@@ -157,8 +156,6 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
                     mAttenAdapter.notifyDataSetChanged();
 //                    if (mStepsRankingBean.getAttrank().size()>1)
                         mAttentionLl.setVisibility(View.VISIBLE);
-                    progressDialog.dismiss();
-                    doPositionFocus();
                     showMyInfo();
                     LogUtil.prinlnLongMsg("mStepsRankingBean", JSON.toJSONString(mStepsRankingBean)+"");
                 }catch (Exception e){
@@ -167,6 +164,7 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
             }
         }));
 
+
     }
 
     private void showMyInfo() {
@@ -175,10 +173,16 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
         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()+"名");
+                my_rank =  mStepsRankingBean.getToalrank().get(i).getRank();  //显示个人排名
                 mStepsTv.setText(mStepsRankingBean.getToalrank().get(i).getAs_uusteps());
+                mPriseTv.setText(mStepsRankingBean.getToalrank().get(i).getAs_prise());
+                if (Integer.valueOf(mStepsRankingBean.getToalrank().get(i).getAs_prise()) > 0)
+                    mPriseIm.setImageResource(R.drawable.praised);
                 break;
             }
         }
+
+        doPositionFocus();
     }
 
 
@@ -210,7 +214,8 @@ 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;
+                all_position=-1;
+                att_position=-1;
                 break;
             case 2:
                 title = mStepsRankingBean.getAttrank().get(position).getAs_username();
@@ -247,8 +252,8 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
 
                 break;
         }
-
         intent.putExtra("type",type);
+        intent.putExtra("my_rank",my_rank);
         intent.putExtra("title",title+"的主页");
         intent.putExtra("userid",userid);
         intent.putExtra("em_name",em_name);
@@ -282,5 +287,8 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
         }else if (att_position != -1 && att_position >= mStepsRankingBean.getAttrank().size()) {
             mAttentionPtlv.setSelection(mStepsRankingBean.getAttrank().size() - 1);
         }
+
+        progressDialog.dismiss();
     }
+
 }

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

@@ -154,20 +154,21 @@
                 </LinearLayout>
             </LinearLayout>
         </RelativeLayout>
-        <RelativeLayout
+        <LinearLayout
+            android:id="@+id/line_chart_ll"
             android:layout_marginTop="20dp"
             android:layout_width="match_parent"
-            android:layout_height="300dp"
+            android:layout_height="320dp"
             android:background="#48D1CC"
-            android:layout_marginBottom="20dp">
+            android:layout_marginBottom="20dp"
+            >
             <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"
                 android:visibility="gone"/>
-        </RelativeLayout>
+        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -185,5 +186,12 @@
                 android:textSize="@dimen/text_main"
                 android:layout_marginBottom="20dp"/>
         </LinearLayout>
+
+        <ImageView
+            android:visibility="gone"
+            android:id="@+id/share_bitmap_im"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/rankb"/>
     </LinearLayout>
 </ScrollView>

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

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bg_main"
+    android:orientation="vertical"
+    >
+
+    <LinearLayout
+        android:id="@+id/share_ll"
+        android:layout_width="match_parent"
+        android:layout_height="380dp"
+        android:orientation="vertical"
+        android:visibility="visible"
+        >
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        >
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:id="@+id/steps_share_bg"
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:background="@drawable/steps_share_bg"/>
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/sharer_im"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:src="@drawable/common_header_boy"
+                android:layout_marginRight="168dp"
+                android:layout_marginTop="170dp"
+                android:layout_centerHorizontal="true"/>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp">
+            <TextView
+                android:id="@+id/mt_rank_tv_str"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:text="我的名次"
+                android:layout_centerVertical="true"
+                android:textColor="@color/black"
+                android:gravity="right"/>
+            <TextView
+                android:id="@+id/mt_rank_tv"
+                android:layout_toRightOf="@+id/mt_rank_tv_str"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dp"
+                android:textColor="@color/blue"
+                android:textSize="20sp"
+                android:text="1"/>
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:layout_marginTop="20dp">
+            <TextView
+                android:id="@+id/mt_steps_tv_str"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:text="我的步数"
+                android:layout_centerVertical="true"
+                android:textColor="@color/black"
+                android:gravity="right"/>
+            <TextView
+                android:id="@+id/mt_steps_tv"
+                android:layout_toRightOf="@+id/mt_steps_tv_str"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="30dp"
+                android:textColor="@color/blue"
+                android:textSize="20sp"
+                android:text="122222"/>
+        </LinearLayout>
+    </LinearLayout>
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/nssb"
+        android:layout_width="match_parent"
+        android:layout_height="600dp"
+        android:src="@drawable/bg"
+        android:visibility="gone"/>
+</LinearLayout>

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

@@ -51,7 +51,6 @@
                   android:textColor="@color/black"
                   android:textSize="@dimen/text_hine"
                   android:layout_marginTop="10dp"
-                  android:text="张三"
 
                   />
               <TextView
@@ -64,7 +63,7 @@
                   android:textColor="@color/gray"
                   android:textSize="@dimen/text_hine"
                   android:layout_marginTop="4dp"
-                  android:text="第一名"/>
+                  />
 
               <TextView
                   android:id="@+id/steps_tv"
@@ -73,7 +72,6 @@
                   android:layout_marginTop="20dp"
                   android:layout_marginBottom="0dp"
                   android:textSize="@dimen/BigTextSize"
-                  android:text="9999"
                   android:textColor="@color/green"
                   android:layout_toLeftOf="@+id/prise_tv"
                   android:layout_marginRight="20dp"

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/UUSportLVAdapter.java

@@ -55,8 +55,8 @@ public class UUSportLVAdapter extends BaseAdapter{
             viewHolder = (ViewHolder) convertView.getTag();
         }
         viewHolder.mRankTv.setText(String.valueOf(position+1));
-        viewHolder.mStepsTv.setText(String.valueOf(1234*(10-position)-1));
-        if ( position == 5) {
+        viewHolder.mStepsTv.setText(String.valueOf(12345*(10-position)-1));
+        if ( position == 0) {
             viewHolder.mRankInfoRl.setVisibility(View.GONE);
             viewHolder. mChampionDescTv.setText("心净则美刚刚赞了你");
         }else {