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

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

@@ -50,6 +50,7 @@ import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
+import com.common.config.BaseConfig;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
@@ -1556,7 +1557,8 @@ public class CommonUtil {
      * function:判断是不是发布版本，true：发布版本
      */
     public static Boolean isReleaseVersion() {
-        return !BuildConfig.DEBUG;
+//        return !BuildConfig.DEBUG;
+        return !BaseConfig.isDebug();
     }
 
     /**

app_core/common/src/main/java/com/core/app/AppConstant.java

@@ -70,6 +70,7 @@ public class AppConstant {
 
     public static final String UPDATA_UUHELPER = "UPDATA_UUHELPER";
     public static final String UUSPORT_PUSH = "UUSPORT_PUSH";
+    public static final String UPDATE_STEPRANKING_PRISE = "UPDATE_STEPRANKING_PRISE";
 
     public static final int RESULT_CODE = 0x865;
 }

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

@@ -10,6 +10,7 @@ import android.widget.TextView;
 import com.common.data.ListUtils;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepsRankingBean;
+import com.uas.appme.pedometer.utils.StepUtils;
 
 import de.hdodenhof.circleimageview.CircleImageView;
 
@@ -46,7 +47,7 @@ public class UUAttentionAdapter extends BaseAdapter{
     }
 
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
+    public View getView(final int position, View convertView, ViewGroup parent) {
         ViewHolder viewHolder = null;
         if (convertView == null){
             viewHolder = new ViewHolder();
@@ -70,12 +71,14 @@ public class UUAttentionAdapter extends BaseAdapter{
                 break;
             }
         }
-//            viewHolder.prise_tv.setText("0");
-//        }
-
+        viewHolder.prise_im.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                StepUtils.doStepPriseHttp(model,2,position);
+            }
+        });
         return convertView;
     }
-
     class ViewHolder{
         TextView ranking_tv;
         CircleImageView photo_img;

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

@@ -10,6 +10,7 @@ import android.widget.TextView;
 import com.common.data.ListUtils;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepsRankingBean;
+import com.uas.appme.pedometer.utils.StepUtils;
 
 import de.hdodenhof.circleimageview.CircleImageView;
 
@@ -47,7 +48,7 @@ public class UURankingAdapter extends BaseAdapter{
     }
 
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
+    public View getView(final int position, View convertView, ViewGroup parent) {
         ViewHolder viewHolder = null;
         if (convertView == null){
             viewHolder = new ViewHolder();
@@ -65,6 +66,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_im.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                StepUtils.doStepPriseHttp(model,3,position);
+            }
+        });
         return convertView;
     }
 

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

@@ -1,6 +1,7 @@
 package com.uas.appme.pedometer.utils;
 
 import android.content.Intent;
+import android.support.v4.content.LocalBroadcastManager;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
@@ -9,6 +10,7 @@ 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.utils.CommonUtil;
 import com.core.utils.TimeUtils;
@@ -18,6 +20,7 @@ import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.pedometer.bean.PersonalStepBean;
 import com.uas.appme.pedometer.bean.StepEntity;
+import com.uas.appme.pedometer.bean.StepsRankingBean;
 import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 
@@ -53,7 +56,6 @@ public class StepUtils {
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appUUsteps")
                 .add("map", map)
-//                .header("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8")
                 .add("token", MyApplication.getInstance().mAccessToken)
                 .method(Method.POST)
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
@@ -73,10 +75,12 @@ public class StepUtils {
      */
     public static void canUnloadToRemote(String s) {
         PersonalStepBean mPersonalStepBean = new PersonalStepBean();
-        mPersonalStepBean = JSON.parseObject(s.toString(), PersonalStepBean.class);
-        String CURRENT_DATE = TimeUtil.getCurrentDate();
-        StepDataDao stepDataDao = new StepDataDao(MyApplication.getInstance());
-        StepEntity stepEntity = stepDataDao.getCurDataByDate(CURRENT_DATE);
+        try {
+            if (!JSONUtil.validate(s)) return;
+            mPersonalStepBean = JSON.parseObject(s.toString(), PersonalStepBean.class);
+            String CURRENT_DATE = TimeUtil.getCurrentDate();
+            StepDataDao stepDataDao = new StepDataDao(MyApplication.getInstance());
+            StepEntity stepEntity = stepDataDao.getCurDataByDate(CURRENT_DATE);
 
         if (mPersonalStepBean == null || ListUtils.isEmpty(mPersonalStepBean.getWeekSteps())) {
             doSaveLocalStepsToHttps(stepEntity);
@@ -84,13 +88,8 @@ public class StepUtils {
         }
         int remoteSteps = CommonUtil.getNumByString(mPersonalStepBean.getWeekSteps().get(mPersonalStepBean.getWeekSteps().size() - 1).getAs_uusteps());
 
-        try {
-            if (stepEntity == null) {
-//                stepEntity = new StepEntity();
-//                stepEntity.setSteps(remoteSteps + "");
-//                stepEntity.setCurDate(CURRENT_DATE);
-//                stepDataDao.addNewData(stepEntity);
 
+            if (stepEntity == null) {
                 Intent intent = new Intent("addStepEntity");
                 intent.putExtra("remoteSteps", remoteSteps);
                 BaseConfig.getContext().sendBroadcast(intent);
@@ -148,6 +147,26 @@ public class StepUtils {
     }
 
 
+    /**
+     * UURANKing列表点赞后的逻辑
+     * @param model
+     * @param type
+     * @param position
+     */
+    public static void doStepPriseHttp(StepsRankingBean model, int type, int position) {
+        switch (type){
+            case 2:
+                break;
+            case 3:
+                break;
+        }
+
+        //TODO 请求操作成功后发广播更新排行版界面
+        //发送本地广播
+        LocalBroadcastManager.getInstance(MyApplication.getInstance().getApplicationContext()).sendBroadcast(new Intent(AppConstant.UPDATE_STEPRANKING_PRISE));
+    }
+
+
     /**
      * 分享UU运动的发消息方法
      * @param activity 上下文

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

@@ -111,6 +111,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
             @Override
             public void onResponse(Object o) {
                 if (o == null) return;
+
                 LogUtil.prinlnLongMsg("appSteps", o.toString());
                 mPersonalStepBean = JSON.parseObject(o.toString(),PersonalStepBean.class);
                 showStepsInfo();

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

@@ -1,7 +1,11 @@
 package com.uas.appme.pedometer.view;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ImageView;
@@ -10,7 +14,9 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
+import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
@@ -60,12 +66,19 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
     private StepsRankingBean mStepsRankingBean;
     private int att_position = -1;
     private int all_position = -1;
+    private BroadcastReceiver updateReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            initData();
+        }
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.uu_ranking_activity);
         StepUtils.doSaveLocalStepsToJudgeHttps();
+        LocalBroadcastManager.getInstance(this).registerReceiver(updateReceiver, new IntentFilter(AppConstant.UPDATE_STEPRANKING_PRISE));
         initView();
         initData();
         initEvents();
@@ -130,9 +143,10 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
             @Override
             public void onResponse(Object o) {
                 if (o == null) return;
-
+                if (!JSONUtil.validate(o.toString())) 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);

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

@@ -66,16 +66,17 @@
             android:layout_marginBottom="0dp"
             android:textSize="@dimen/text_hine"
             android:textColor="@color/text_hine"
-            android:layout_marginRight="5dp"
-            android:visibility="invisible"/>
+            android:layout_marginRight="8dp"
+            android:visibility="visible"
+            android:text="0"/>
         <ImageView
             android:id="@+id/prise_im"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            android:src="@drawable/uuu"
+            android:src="@drawable/praise"
             android:layout_alignParentRight="true"
             android:layout_below="@+id/prise_tv"
             android:layout_marginTop="5dp"
-            android:visibility="invisible"/>
+            android:visibility="visible"/>
     </RelativeLayout>
 </LinearLayout>

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

@@ -55,16 +55,17 @@
             android:layout_marginBottom="0dp"
             android:textSize="@dimen/text_hine"
             android:textColor="@color/text_hine"
-            android:layout_marginRight="5dp"/>
+            android:layout_marginRight="8dp"
+            android:text="0"/>
         <ImageView
             android:id="@+id/prise_im"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            android:src="@drawable/uuu"
+            android:src="@drawable/praise"
             android:layout_alignParentRight="true"
             android:layout_below="@+id/prise_tv"
             android:layout_marginTop="5dp"
-            android:visibility="invisible"/>
+            android:visibility="visible"/>
     </RelativeLayout>
     <TextView
         android:id="@+id/ranking_tv"

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

@@ -87,21 +87,21 @@
                   android:layout_marginTop="5dp"
                   android:layout_marginBottom="0dp"
                   android:textSize="@dimen/text_hine"
-                  android:text="1"
+                  android:text="0"
                   android:textColor="@color/text_hine"
-                  android:layout_marginRight="15dp"
-                  android:visibility="invisible"
+                  android:layout_marginRight="18dp"
+                  android:visibility="visible"
                   />
               <ImageView
                   android:id="@+id/prise_im"
                   android:layout_width="20dp"
                   android:layout_height="20dp"
-                  android:src="@drawable/uuu"
+                  android:src="@drawable/praise"
                   android:layout_alignParentRight="true"
                   android:layout_below="@+id/prise_tv"
                   android:layout_marginTop="5dp"
                   android:layout_marginRight="10dp"
-                  android:visibility="invisible"/>
+                  android:visibility="visible"/>
           </RelativeLayout>
           <View
               android:id="@+id/hide_above_af"