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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -587,11 +587,12 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
 	private void doHiTask() {
 		int isUUStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
 		if (isUUStep != 0 && StepCountCheckUtil.isSupportStepCountSensor(this)) { // 开启UU运动
-			if (!MyApplication.getInstance().getLoginUserId().equals("100366")) {
-				startService(new Intent(mContext, StepService.class));
+			LogUtil.i("userid="+MyApplication.getInstance().getLoginUserId());
+				startService(new Intent(mContext, StepService.class)
+						.putExtra("my_userid",MyApplication.getInstance().getLoginUserId())
+						.putExtra("token",MyApplication.getInstance().mAccessToken));
 				PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
 				PushManager.resumeWork(MyApplication.getInstance());
-			}
 		}
 		doSendSignAutoLog(); // 获取数据库中监控日志上传至服务器操作
 		//桌面红点显示逻辑

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

@@ -248,7 +248,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
                 break;
 
             case R.id.uustep_rl:
-                //				startActivity(new Intent(mContext, UUSportActivity.class));
+//                startActivity(new Intent(mContext, UUSportActivity.class));
                 startActivity(new Intent(mContext, UURanking.class));
 //				uustepRedtv.setVisibility(View.GONE);
                 PreferenceUtils.putBoolean(Constants.UU_STEP_RED, true);

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

@@ -192,6 +192,19 @@ public class Constants {
             + "aa_telephone TEXT, "
             + "sendstatus TEXT"
             + ")";
+
+    // 用于存贮每天UU运动排名第一的数据表
+    public static final String STEPRANKING_FIRST = "CREATE TABLE StepRankingFirst ("
+            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + "date TEXT,"
+            + "my_userid TEXT,"
+            + "my_rank TEXT, "
+            + "my_steps TEXT, "
+            + "f_userid TEXT, "
+            + "f_name TEXT"
+            + ")";
+
+
     //用于创建记步数统计表
     public static final String CREATE_BANNER = "create table step ("
             + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "

app_core/common/src/main/java/com/core/dao/StepRankingFirstDao.java

@@ -0,0 +1,194 @@
+package com.core.dao;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
+
+import com.core.db.DatabaseManager;
+import com.core.model.StepRankingFirstBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by FANGlh on 2017/11/3.
+ * function:// 用于存贮每天UU运动排名第一的数据表
+ *
+ *
+ + "date TEXT,"
+ + "my_userid TEXT,"
+ + "my_rank TEXT, "
+ + "my_steps TEXT, "
+ + "f_userid TEXT, "
+ + "f_name TEXT,"
+ *
+ *  Ranking First Info  --- RFI
+ */
+
+public class StepRankingFirstDao {
+
+
+    /**
+     * 添加一条新记录
+     *
+     * @param bean
+     */
+    public static void addNewRFIData(StepRankingFirstBean bean){
+        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+
+        try{
+            stepDb.beginTransaction();
+            ContentValues values = new ContentValues();
+            values.put("date", bean.getDate());
+            values.put("my_userid", bean.getMy_userid());
+            values.put("my_rank", bean.getMy_rank());
+            values.put("my_steps", bean.getMy_steps());
+            values.put("f_userid", bean.getF_userid());
+            values.put("f_name", bean.getF_name());
+
+            stepDb.insert("StepRankingFirst", null, values);
+            stepDb.setTransactionSuccessful();
+            stepDb.endTransaction();
+        }catch (SQLException e){
+            e.printStackTrace();
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if (stepDb != null)
+                DatabaseManager.getInstance().closeDatabase();
+        }
+    }
+
+    /**
+     * 查询所有的记录
+     *
+     * @return
+     */
+    public List<StepRankingFirstBean> getAllRFIDatas() {
+        List<StepRankingFirstBean> dataList = new ArrayList<>();
+        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        Cursor cursor = null;
+        try {
+            cursor = stepDb.rawQuery("select * from StepRankingFirst", null);
+            stepDb.beginTransaction();
+            while (cursor.moveToNext()) {
+                String date = cursor.getString(cursor.getColumnIndex("date"));
+                String my_userid = cursor.getString(cursor.getColumnIndex("my_userid"));
+                String my_rank = cursor.getString(cursor.getColumnIndex("my_rank"));
+                String my_steps = cursor.getString(cursor.getColumnIndex("my_steps"));
+                String f_userid = cursor.getString(cursor.getColumnIndex("f_userid"));
+                String f_name = cursor.getString(cursor.getColumnIndex("f_name"));
+                StepRankingFirstBean entity = new StepRankingFirstBean(date, my_userid, my_rank, my_steps, f_userid, f_name);
+                dataList.add(entity);
+            }
+            stepDb.setTransactionSuccessful();
+            stepDb.endTransaction();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            Log.i("fanglh",e.toString());
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            //关闭数据库
+            if (cursor != null){
+                cursor.close();
+            }
+            if (stepDb != null){
+                DatabaseManager.getInstance().closeDatabase();
+            }
+            return dataList;
+        }
+    }
+
+    /**
+     * 更新当前的第一名数据
+     * @param bean
+     */
+    public void updateCurDateRFI(StepRankingFirstBean bean){
+        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        ContentValues values = new ContentValues();
+        try {
+            stepDb.beginTransaction();
+            values.put("my_userid",bean.getMy_userid());
+            values.put("my_rank",bean.getMy_rank());
+            values.put("my_steps",bean.getMy_steps());
+            values.put("f_userid",bean.getF_userid());
+            values.put("f_name",bean.getF_name());
+            stepDb.update("StepRankingFirst", values, "date=?", new String[]{bean.getDate() + ""});
+            stepDb.setTransactionSuccessful();
+            stepDb.endTransaction();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if (stepDb != null)
+                DatabaseManager.getInstance().closeDatabase();
+        }
+    }
+
+    /**
+     *  删除该条bean 数据
+     * @param date
+     */
+    public void deleteOneRFIData(String date){
+        //todo 这里要不要做一下不可删除当前 日期的数据呢
+        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        try {
+            stepDb.beginTransaction();
+            stepDb.delete("StepRankingFirst", "date=?", new String[]{date});
+            stepDb.setTransactionSuccessful();
+            stepDb.endTransaction();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if (stepDb != null)
+                DatabaseManager.getInstance().closeDatabase();
+        }
+    }
+
+
+    /**
+     * 根据日期查询记录
+     *
+     * @param curDate
+     * @return
+     */
+    public StepRankingFirstBean getCurDataByDate(String curDate) {
+
+        StepRankingFirstBean bean = null;
+        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        try {
+            stepDb.beginTransaction();
+
+            Cursor cursor = stepDb.query("StepRankingFirst", null, null, null, null, null, null);
+            while (cursor.moveToNext()) {
+                String date = curDate;
+                if (curDate.equals(date)) {
+                    String my_userid = cursor.getString(cursor.getColumnIndexOrThrow("my_userid"));
+                    String my_rank = cursor.getString(cursor.getColumnIndexOrThrow("my_rank"));
+                    String my_steps = cursor.getString(cursor.getColumnIndexOrThrow("my_steps"));
+                    String f_userid = cursor.getString(cursor.getColumnIndexOrThrow("f_userid"));
+                    String f_name = cursor.getString(cursor.getColumnIndexOrThrow("f_name"));
+                    bean = new StepRankingFirstBean(date, my_userid,my_rank,my_steps,f_userid,f_name);
+                    //跳出循环
+                    break;
+                }
+            }
+            stepDb.setTransactionSuccessful();
+            stepDb.endTransaction();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            if (stepDb != null)
+                DatabaseManager.getInstance().closeDatabase();
+        }
+        return bean;
+    }
+ }

app_core/common/src/main/java/com/core/dao/UUSportDao.java

@@ -1,9 +0,0 @@
-package com.core.dao;
-
-/**
- * Created by FANGlh on 2017/9/27.
- * function:
- */
-
-public class UUSportDao {
-}

app_core/common/src/main/java/com/core/db/DBOpenHelper.java

@@ -13,8 +13,8 @@ import com.core.app.Constants;
  * @注释:建立数据库
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
-    //TODO  上一个发布版本是86
-    private static final int DATABASE_VERSION = 86;
+    //TODO  上一个发布版本是87
+    private static final int DATABASE_VERSION = 88;
     public static String dataBaseName = "erp.db";
     public Context context;
 
@@ -57,6 +57,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
 //            db.execSQL(Constants.TRACK_POINT); //运行轨迹，实时定位点记录表
             db.execSQL(Constants.TABLE_HISTORICAL_RECORD);//数据查询历史记录表
             db.execSQL(Constants.TABLE_UUHELPER_RECORD);//UU助手
+            db.execSQL(Constants.STEPRANKING_FIRST); //用于存贮每天UU运动排名第一相关的数据表
         } catch (Exception e) {
 
         }
@@ -100,6 +101,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
 //        db.execSQL("DROP TABLE IF EXISTS trackPoint");
         db.execSQL("DROP TABLE IF EXISTS " + DatabaseTables.HistoricalRecordTable.NAME);
         db.execSQL("DROP TABLE IF EXISTS " + DatabaseTables.UUHelperTable.NAME);
+        db.execSQL("DROP TABLE IF EXISTS StepRankingFirst");
     }
 
 

app_core/common/src/main/java/com/core/model/StepRankingFirstBean.java

@@ -0,0 +1,80 @@
+package com.core.model;
+
+/**
+ * Created by FANGlh on 2017/11/3.
+ * function:
+ */
+
+public class StepRankingFirstBean {
+    /**
+     + "date TEXT,"
+     + "my_userid TEXT,"
+     + "my_rank TEXT, "
+     + "my_steps TEXT, "
+     + "f_userid TEXT, "
+     + "f_name TEXT,"
+     */
+    private String date;
+    private String my_userid;
+    private String my_rank;
+    private String my_steps;
+    private String f_userid;
+    private String f_name;
+
+    public StepRankingFirstBean(String date, String my_userid, String my_rank, String my_steps, String f_userid, String f_name) {
+        this.date = date;
+        this.my_userid = my_userid;
+        this.my_rank = my_rank;
+        this.my_steps = my_steps;
+        this.f_userid = f_userid;
+        this.f_name = f_name;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getMy_userid() {
+        return my_userid;
+    }
+
+    public void setMy_userid(String my_userid) {
+        this.my_userid = my_userid;
+    }
+
+    public String getMy_rank() {
+        return my_rank;
+    }
+
+    public void setMy_rank(String my_rank) {
+        this.my_rank = my_rank;
+    }
+
+    public String getMy_steps() {
+        return my_steps;
+    }
+
+    public void setMy_steps(String my_steps) {
+        this.my_steps = my_steps;
+    }
+
+    public String getF_userid() {
+        return f_userid;
+    }
+
+    public void setF_userid(String f_userid) {
+        this.f_userid = f_userid;
+    }
+
+    public String getF_name() {
+        return f_name;
+    }
+
+    public void setF_name(String f_name) {
+        this.f_name = f_name;
+    }
+}

app_core/common/src/main/java/com/core/model/UUSportModel.java

@@ -1,9 +0,0 @@
-package com.core.model;
-
-/**
- * Created by FANGlh on 2017/9/27.
- * function:
- */
-
-public class UUSportModel  {
-}

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

@@ -22,6 +22,7 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.util.Log;
 
 import com.baidu.mapapi.model.LatLng;
 import com.common.LogUtil;
@@ -79,6 +80,8 @@ public class StepService extends Service implements SensorEventListener {
     private NotificationManager notificationManager;
     private Intent nfIntent;
     private int VERSION_CODES = Build.VERSION.SDK_INT;
+    private String my_userid;
+    private String token;
 
     @Override
     public void onCreate() {
@@ -92,17 +95,24 @@ public class StepService extends Service implements SensorEventListener {
         }).start();
         startTimeCount();
         initTodayData();
+
     }
 
     @Override
     public IBinder onBind(Intent intent) {
-        return messenger.getBinder();
+        return null;
     }
 
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        if (intent!=null){
+            my_userid = intent.getStringExtra("my_userid");
+            token = intent.getStringExtra("token");
+        }
+        Log.i("fanglh",my_userid+","+token);
+
         /**
          * 此处设将Service为前台，不然当APP结束以后很容易被GC给干掉，这也就是大多数音乐播放器会在状态栏设置一个
          * 原理大都是相通的
@@ -400,9 +410,9 @@ public class StepService extends Service implements SensorEventListener {
         }
 //        StepUtils.doSaveLocalStepsToJudgeHttps();
 //        TrackUtils.doSaveTrackPoint(latLngsList);
+        StepUtils.doBeforeSavaRFIToLocal(my_userid,token); //将每天的第一名信息保存在本地数据库，供第二天展示
     }
 
-
     @Override
     public void onDestroy() {
         super.onDestroy();

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

@@ -16,7 +16,9 @@ import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
+import com.core.dao.StepRankingFirstDao;
 import com.core.model.Friend;
+import com.core.model.StepRankingFirstBean;
 import com.core.model.XmppMessage;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
@@ -28,6 +30,7 @@ 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.Result2Listener;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.pedometer.bean.PersonalStepBean;
@@ -301,4 +304,75 @@ public class StepUtils {
         }
         return false;
     }
+
+
+    //将每天的第一名信息保存在本地数据库，供第二天展示
+    public static void doBeforeSavaRFIToLocal(final String my_userid,String token){
+        //获取所有人的当天步数数据
+            HttpClient httpClient = new HttpClient.Builder(Constants.BASE_STEP_URL).isDebug(true).build(true);
+            httpClient.Api().send(new HttpClient.Builder()
+                    .url("appStepsrank")
+                    .add("userid",my_userid)
+                    .add("token",token)
+                    .connectTimeout(10000)
+                    .method(Method.POST)
+                    .build(),new ResultSubscriber<>(new Result2Listener<Object>() {
+                @Override
+                public void onResponse(Object o) {
+                    LogUtil.prinlnLongMsg("appStepsrank", o.toString()+","+my_userid);
+                    if (!JSONUtil.validate(o.toString()) || o == null) return;
+                    if (o.toString().contains("toalrank"))
+                        doSavaRFIToLocal(o.toString(),my_userid);
+                    else
+                        return;
+                }
+
+                @Override
+                public void onFailure(Object t) {
+                    LogUtil.prinlnLongMsg("appStepsrank", JSON.toJSONString(t));
+                }
+            }));
+    }
+
+    private static void doSavaRFIToLocal(String result,String my_userid) {
+        try {
+            StepsRankingBean bean = JSON.parseObject(result.toString(),StepsRankingBean.class);
+            if (bean == null) return;
+            if (ListUtils.isEmpty(bean.getToalrank())) return;
+            String my_rank,my_steps,f_userid,f_name= null;
+            f_name = bean.getToalrank().get(0).getAs_username();
+            f_userid = bean.getToalrank().get(0).getAs_userid();
+
+            for (int i = 0; i < bean.getToalrank().size(); i++) {
+                if (my_userid.equals(bean.getToalrank().get(i).getAs_userid())){
+                    my_rank = bean.getToalrank().get(i).getRank()+"";
+                    my_steps = bean.getToalrank().get(i).getAs_uusteps();
+
+                    if (!StringUtil.isEmpty(f_name) && !StringUtil.isEmpty(f_userid) &&
+                            !StringUtil.isEmpty(my_rank) && !StringUtil.isEmpty(my_steps)){
+                        String CURRENT_DATE = TimeUtil.getCurrentDate();
+                        StepRankingFirstDao dao = new StepRankingFirstDao();
+                        StepRankingFirstBean fbean = null;
+
+                        fbean = dao.getCurDataByDate(CURRENT_DATE);
+                        LogUtil.prinlnLongMsg("fbean1",JSON.toJSONString(fbean));
+                        if (fbean == null){  //进行新增操作
+                            fbean = new StepRankingFirstBean(CURRENT_DATE,my_userid,my_rank,my_steps,f_userid,f_name);
+                            dao.addNewRFIData(fbean);
+                        }else {  //进行更新操作
+                            fbean = new StepRankingFirstBean(CURRENT_DATE,my_userid,my_rank,my_steps,f_userid,f_name);
+                            dao.updateCurDateRFI(fbean);
+                        }
+
+                        LogUtil.prinlnLongMsg("fbean2",JSON.toJSONString(fbean));
+                    }
+
+                    break;
+                }
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -95,7 +95,8 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
             startActivity(new Intent(ct,BusinessHoursSetting.class)
                     .putExtra("setType",2));
         }else if (v.getId() == R.id.business_introduction_rl){
-
+            startActivity(new Intent(ct,BusinessHoursSetting.class)
+                    .putExtra("setType",3));
         }
     }
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BusinessHoursSetting.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -42,6 +43,7 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
     private TextView timpoint_tv;
     private int sc_booktype = -1;
     private int setType;
+    private EditText bIntroductionEt;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -73,14 +75,22 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
         timpoint_tv = (TextView) findViewById(R.id.timpoint_tv);
         timpoint_tv.setOnClickListener(this);
 
+        bIntroductionEt = (EditText) findViewById(R.id.business_Introduction_et);
         if (setType == 1){
             getSupportActionBar().setTitle("设置营业时间");
             set_hour_ll.setVisibility(View.VISIBLE);
             set_booktype_ll.setVisibility(View.GONE);
+            bIntroductionEt.setVisibility(View.GONE);
         }else if (setType == 2){
             getSupportActionBar().setTitle("设置预约时间类型");
             set_hour_ll.setVisibility(View.GONE);
             set_booktype_ll.setVisibility(View.VISIBLE);
+            bIntroductionEt.setVisibility(View.GONE);
+        }else if (setType == 3){
+            getSupportActionBar().setTitle("商家详情");
+            set_hour_ll.setVisibility(View.GONE);
+            set_booktype_ll.setVisibility(View.GONE);
+            bIntroductionEt.setVisibility(View.VISIBLE);
         }
     }
 
@@ -96,6 +106,8 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
                 doSaveBHours();
             else if (setType == 2)
                 doSaveTimeType();
+            else if (setType == 3)
+                doSaveBIntroduction();
         }else if (v.getId() == R.id.tv_startTime){
             startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
                             .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
@@ -121,6 +133,42 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
         }
     }
 
+    private void doSaveBIntroduction() {
+        if (StringUtil.isEmpty(bIntroductionEt.getText().toString())){
+            ToastMessage("请输入商家详情介绍");
+            return;
+        }
+
+        Map<String,Object> param = new HashMap<>();
+        param.put("sc_uu",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
+        param.put("sc_introduce",bIntroductionEt.getText().toString());
+
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appStoreUpdate")
+                .add("map", JSONUtil.map2JSON(param))
+                .add("token", MyApplication.getInstance().mAccessToken)
+                .method(Method.POST)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                try {
+                    if (!JSONUtil.validate(o.toString()) || o == null) return;
+                    LogUtil.prinlnLongMsg("appStoreUpdate", o.toString()+"");
+                    //{"result":"true"}
+                    if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")){
+                        Toast.makeText(ct,getString(R.string.save_success),Toast.LENGTH_LONG).show();
+                        finish();
+                    }
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }));
+
+    }
+
     private void doSaveTimeType() {
         if (sc_booktype == -1){
             ToastMessage("请选择预约时间类型");
@@ -205,6 +253,9 @@ public class BusinessHoursSetting extends BaseActivity implements View.OnClickLi
                             timpoint_tv.setBackgroundResource(R.color.aqua);
                         }
                     }
+                    if (o.toString().contains("introduce") && !StringUtil.isEmpty(JSON.parseObject(o.toString()).getString("introduce"))){
+            bIntroductionEt.setText(JSON.parseObject(o.toString()).getString("introduce"));
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

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

@@ -61,6 +61,23 @@
             android:text="按时间点"
             android:gravity="center"/>
     </LinearLayout>
+
+
+    <EditText
+        android:id="@+id/business_Introduction_et"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:background="@drawable/full_edit_bg"
+        android:gravity="top"
+        android:hint="请输入商家详情介绍限"
+        android:inputType="textMultiLine"
+        android:minHeight="200dp"
+        android:padding="10dp"
+        android:textColor="@color/black"
+        android:textColorHint="@color/grey"
+        android:textSize="16sp"
+        android:maxLength="400"/>
     <Button
             android:id="@+id/submit_btn"
             android:layout_width="match_parent"

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/UUSportActivity.java

@@ -9,13 +9,19 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
+import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
+import com.common.data.ListUtils;
 import com.core.app.AppConstant;
 import com.core.base.BaseActivity;
-import com.core.model.UUSportModel;
+import com.core.dao.StepRankingFirstDao;
+import com.core.model.StepRankingFirstBean;
+import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
 import com.modular.appmessages.R;
 import com.modular.appmessages.adapter.UUSportLVAdapter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -33,6 +39,10 @@ public class UUSportActivity extends BaseActivity implements View.OnClickListene
     private LinearLayoutManager manager;
     private MyListView content_mylv;
     private UUSportLVAdapter lvAdapter;
+    private List<StepRankingFirstBean> model;
+    private StepRankingFirstDao mStepRankingFirstDao;
+    private EmptyLayout mEmptyLayout;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -43,8 +53,14 @@ public class UUSportActivity extends BaseActivity implements View.OnClickListene
     }
 
     private void initData() {
-//        List<UUSportModel> models = UUSportDao.getInstance().getAllModels();
-        List<UUSportModel> models = null;
+        model = mStepRankingFirstDao.getAllRFIDatas();
+        LogUtil.prinlnLongMsg("fanglh", JSON.toJSONString(model));
+        if (ListUtils.isEmpty(model)){
+            mEmptyLayout.showEmpty();
+            return;
+        }
+        lvAdapter.setModels(model);
+        lvAdapter.notifyDataSetChanged();
     }
 
     private void initView() {
@@ -53,10 +69,16 @@ public class UUSportActivity extends BaseActivity implements View.OnClickListene
 
         lvAdapter = new UUSportLVAdapter(this);
         content_mylv.setAdapter(lvAdapter);
-//        content_mylv.setSelection(7);
-        lvAdapter.notifyDataSetChanged();
 
         findViewById(R.id.step_rank_ll).setOnClickListener(this);
+
+        model = new ArrayList<>();
+        mStepRankingFirstDao = new StepRankingFirstDao();
+
+        mEmptyLayout = new EmptyLayout(this, content_mylv);
+        mEmptyLayout.setShowEmptyButton(false);
+        mEmptyLayout.setShowErrorButton(false);
+        mEmptyLayout.setShowLoadingButton(false);
     }
 
     @Override

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

@@ -1,114 +0,0 @@
-package com.modular.appmessages.adapter;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.common.data.ListUtils;
-import com.core.model.UUSportModel;
-import com.modular.appmessages.R;
-
-import java.util.List;
-
-import de.hdodenhof.circleimageview.CircleImageView;
-
-/**
- * Created by FANGlh on 2017/9/27.
- * function:
- */
-
-public class UUSportAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-    private Context ct;
-    private List<UUSportModel> models;
-    private LayoutInflater inflater;
-
-    public UUSportAdapter(Context ct, List<UUSportModel> models) {
-        this.ct = ct;
-        this.models = models;
-    }
-
-    public List<UUSportModel> getModels() {
-        return models;
-    }
-
-    public void setModels(List<UUSportModel> models) {
-        this.models = models;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return position;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        return null;
-    }
-
-    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        UUSportModel model = models.get(position);
-    }
-
-    @Override
-    public int getItemCount() {
-        return ListUtils.getSize(models);
-    }
-
-    private View getViewByLayout(int layout, ViewGroup parent) {
-        if (inflater == null) {
-            inflater = LayoutInflater.from(ct);
-        }
-        return inflater.inflate(layout, parent, false);
-    }
-
-    class DayRankHolder extends RecyclerView.ViewHolder {
-
-        private TextView mTimeTV,mRankTv,mRankTvStr,mStepsTv,mRstepsTvStr,mChampionDescTv;
-        private View mLine;
-        private CircleImageView mChampionIm;
-        private RelativeLayout mRankInfoRl;
-        private LinearLayout mrankLl;
-
-        public DayRankHolder(ViewGroup parent) {
-            this(getViewByLayout(R.layout.item_dayrank, parent));
-        }
-
-        public DayRankHolder(View itemView) {
-            super(itemView);
-
-            mTimeTV = (TextView) itemView.findViewById(R.id.timeTV);
-            mRankInfoRl = (RelativeLayout) itemView.findViewById(R.id.rank_info_rl);
-            mRankTv = (TextView) itemView.findViewById(R.id.rank_tv);
-            mRankTvStr = (TextView) itemView.findViewById(R.id.rank_tv_str);
-            mStepsTv = (TextView) itemView.findViewById(R.id.steps_tv);
-            mRstepsTvStr = (TextView) itemView.findViewById(R.id.rsteps_tv_str);
-            mLine = (View) itemView.findViewById(R.id.line);
-            mChampionIm = (CircleImageView) itemView.findViewById(R.id.champion_im);
-            mChampionDescTv = (TextView) itemView.findViewById(R.id.champion_desc_tv);
-            mrankLl = (LinearLayout) itemView.findViewById(R.id.rank_ll);
-        }
-
-    }
-
-    private void onLongItemClick(final UUSportModel model, final int position) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(ct);
-        builder.setTitle(R.string.prompt_title).setMessage("确定删除" + "model.getContent()" + "吗?").setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-//                UUSportDao.getInstance().deleteData(model.getId());
-//                models.remove(position);
-//                notifyItemRemoved(position);
-//                notifyItemRangeChanged(position, models.size());
-            }
-        }).setNegativeButton(R.string.cancel, null).show();
-    }
-
-}

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

@@ -9,7 +9,9 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.common.data.ListUtils;
-import com.core.model.UUSportModel;
+import com.core.model.StepRankingFirstBean;
+import com.core.utils.CommonUtil;
+import com.core.utils.helper.AvatarHelper;
 import com.modular.appmessages.R;
 
 import java.util.List;
@@ -23,12 +25,20 @@ import de.hdodenhof.circleimageview.CircleImageView;
 
 public class UUSportLVAdapter extends BaseAdapter{
     private Context mContext;
-    List<UUSportModel> models;
+    List<StepRankingFirstBean> models;
+
+    public List<StepRankingFirstBean> getModels() {
+        return models;
+    }
+
+    public void setModels(List<StepRankingFirstBean> models) {
+        this.models = models;
+    }
 
     public UUSportLVAdapter(Context mContext){this.mContext = mContext;}
 
     @Override
-    public int getCount() {return 10;}
+    public int getCount() {return ListUtils.isEmpty(models) ? 0 : models.size();}
     @Override
     public Object getItem(int position) {return ListUtils.isEmpty(models) ? null : models.get(position);}
     @Override
@@ -44,24 +54,32 @@ public class UUSportLVAdapter extends BaseAdapter{
             viewHolder.mRankInfoRl = (RelativeLayout) convertView.findViewById(R.id.rank_info_rl);
             viewHolder.mRankTv = (TextView) convertView.findViewById(R.id.rank_tv);
             viewHolder.mRankTvStr = (TextView) convertView.findViewById(R.id.rank_tv_str);
-            viewHolder. mStepsTv = (TextView) convertView.findViewById(R.id.steps_tv);
-            viewHolder. mRstepsTvStr = (TextView) convertView.findViewById(R.id.rsteps_tv_str);
+            viewHolder.mStepsTv = (TextView) convertView.findViewById(R.id.steps_tv);
+            viewHolder.mRstepsTvStr = (TextView) convertView.findViewById(R.id.rsteps_tv_str);
             viewHolder.mLine = (View) convertView.findViewById(R.id.line);
             viewHolder.mChampionIm = (CircleImageView) convertView.findViewById(R.id.champion_im);
-            viewHolder. mChampionDescTv = (TextView) convertView.findViewById(R.id.champion_desc_tv);
-            viewHolder. mrankLl = (LinearLayout) convertView.findViewById(R.id.rank_ll);
+            viewHolder.mChampionDescTv = (TextView) convertView.findViewById(R.id.champion_desc_tv);
+            viewHolder.mrankLl = (LinearLayout) convertView.findViewById(R.id.rank_ll);
             convertView.setTag(viewHolder);
         }else {
             viewHolder = (ViewHolder) convertView.getTag();
         }
-        viewHolder.mRankTv.setText(String.valueOf(position+1));
-        viewHolder.mStepsTv.setText(String.valueOf(12345*(10-position)-1));
-        if ( position == 0) {
-            viewHolder.mRankInfoRl.setVisibility(View.GONE);
-            viewHolder. mChampionDescTv.setText("心净则美刚刚赞了你");
+
+        if (CommonUtil.getNumByString(models.get(getCount() - position -1).getMy_rank()) <10){
+            viewHolder.mRankTv.setTextColor(mContext.getResources().getColor(R.color.approvaling));
+            viewHolder.mStepsTv.setTextColor(mContext.getResources().getColor(R.color.approvaling));
         }else {
-            viewHolder.mRankInfoRl.setVisibility(View.VISIBLE);
+            viewHolder.mRankTv.setTextColor(mContext.getResources().getColor(R.color.green));
+            viewHolder.mStepsTv.setTextColor(mContext.getResources().getColor(R.color.green));
         }
+
+        viewHolder.mTimeTV.setText(models.get(getCount() - position -1).getDate());
+        viewHolder.mRankTv.setText(models.get(getCount() - position -1).getMy_rank());
+        viewHolder.mStepsTv.setText(models.get(getCount() - position -1).getMy_steps());
+        viewHolder.mChampionDescTv.setText(models.get(getCount() - position-1).getF_name() + "夺得了"
+                + models.get(getCount() - position -1).getDate() +"排行榜冠军");
+        AvatarHelper.getInstance().displayAvatar(models.get(getCount() - position -1).getF_userid(), viewHolder.mChampionIm, true);
+
         return convertView;
     }
 

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -51,6 +51,7 @@ import com.modular.appmessages.activity.ProcessMsgActivity;
 import com.modular.appmessages.activity.RealTimeFormActivity;
 import com.modular.appmessages.activity.Subscription2Activity;
 import com.modular.appmessages.activity.UUHelperActivity;
+import com.modular.appmessages.activity.UUSportActivity;
 import com.modular.appmessages.db.SubsDao;
 import com.modular.appmessages.model.MessageHeader;
 import com.modular.appmessages.model.SubMessage;

app_modular/appmessages/src/main/res/layout/item_dayrank.xml

@@ -101,7 +101,10 @@
                 android:id="@+id/champion_im"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:src="@drawable/common_header_boy"/>
+                android:src="@drawable/common_header_boy"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true" />
 
 
             <TextView