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

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

@@ -238,7 +238,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 
         if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1
                 && !CommonUtil.isReleaseVersion()  )
-            uustep_rl.setVisibility(View.GONE);
+            uustep_rl.setVisibility(View.VISIBLE);
         else
             uustep_rl.setVisibility(View.GONE);
         return view;

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

@@ -28,6 +28,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.andreabaccega.widget.FormEditText;
+import com.common.config.BaseConfig;
 import com.common.data.StringUtil;
 import com.common.file.PropertiesUtil;
 import com.core.api.wxapi.ApiPlatform;
@@ -79,11 +80,12 @@ public class CommonUtil {
      * function:判断是不是发布版本，true：发布版本
      */
     public static Boolean isReleaseVersion() {
-                return !BuildConfig.DEBUG;  //垃圾方法，得根据自己选择的debug还是release模式返回，根本就不好用，
-        //         只要改变 common目录下的versionconfiguration就可以了
+//                return !BuildConfig.DEBUG;  //垃圾方法，得根据自己选择的debug还是release模式返回，根本就不好用，
+//                 只要改变 common目录下的versionconfiguration就可以了
 //        if (!StringUtil.isEmpty(PropertiesUtil.readData(MyApplication.getInstance(), "release_version", R.raw.versionconfiguration)) &&                "true".equals(PropertiesUtil.readData(MyApplication.getInstance(), "release_version", R.raw.versionconfiguration)))            return true;
 //        else
 //            return false;
+        return !BaseConfig.isDebug();
     }
 
 

app_core/common/src/main/res/drawable/bg_rankwhite_btn.xml

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

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

@@ -20,10 +20,5 @@
         android:dividerHeight="2px"
         android:scrollbars="none" />
 
-    <com.xzjmyk.pm.activity.view.PMsgBottomView
-        android:id="@+id/bottom_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:visibility="gone" />
+
 </LinearLayout>

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

@@ -90,113 +90,113 @@
                     android:layout_marginRight="10dp"
                     >
 
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    >
-                    <TextView
-                        android:id="@+id/work_daily_detail_time_tv"
+                    <RelativeLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="left|top"
-                        android:text="2016-11-02"
-                        android:textColor="#000000"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginBottom="0dp"
-                        android:textSize="@dimen/text_main" />
+                        >
+                        <TextView
+                            android:id="@+id/work_daily_detail_time_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="left|top"
+                            android:text="2016-11-02"
+                            android:textColor="#000000"
+                            android:layout_marginTop="5dp"
+                            android:layout_marginBottom="0dp"
+                            android:textSize="@dimen/text_main" />
+                        <TextView
+                            android:id="@+id/work_daily_detail_status_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginTop="5dp"
+                            android:layout_marginBottom="0dp"
+                            android:textSize="@dimen/text_hine"/>
+                        <ImageView
+                            android:id="@+id/work_daily_unsubmit_iv"
+                            android:layout_toLeftOf="@id/work_daily_detail_status_tv"
+                            android:layout_width="40dp"
+                            android:layout_height="30dp"
+                            android:src="@drawable/unknow_info"
+                            android:paddingBottom="5dp"
+                            android:visibility="gone"
+                            />
+                    </RelativeLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/line"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginRight="5dp"
+                        android:background="@color/item_line" />
                     <TextView
-                        android:id="@+id/work_daily_detail_status_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
+                        android:textSize="18sp"
+                        android:text="@string/wd_summary_title"
+                        android:textColor="#575757"
                         android:layout_marginTop="5dp"
-                        android:layout_marginBottom="0dp"
-                        android:textSize="@dimen/text_hine"/>
-                    <ImageView
-                        android:id="@+id/work_daily_unsubmit_iv"
-                        android:layout_toLeftOf="@id/work_daily_detail_status_tv"
-                        android:layout_width="40dp"
-                        android:layout_height="30dp"
-                        android:src="@drawable/unknow_info"
-                        android:paddingBottom="5dp"
-                        android:visibility="gone"
                         />
-                </RelativeLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/line"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginRight="5dp"
-                    android:background="@color/item_line" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="18sp"
-                    android:text="@string/wd_summary_title"
-                    android:textColor="#575757"
-                    android:layout_marginTop="5dp"
-                    />
-                <TextView
-                    android:id="@+id/work_daily_detail_summary_tv"
-                    style="@style/form_relative_right_text1"
-                    android:text="总结啦"
-                    android:textColor="#575757"
-                    />
+                    <TextView
+                        android:id="@+id/work_daily_detail_summary_tv"
+                        style="@style/form_relative_right_text1"
+                        android:text="总结啦"
+                        android:textColor="#575757"
+                        />
 
-                <LinearLayout
-                    android:id="@+id/work_daily_detail_plan_ll"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:visibility="visible">
-                    <View
+                    <LinearLayout
+                        android:id="@+id/work_daily_detail_plan_ll"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/line"
-                        android:background="@color/item_line"
-                        android:layout_marginRight="5dp"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="18sp"
-                    android:text="@string/wd_plan_title"
-                    android:layout_marginTop="5dp"
-                    android:textColor="#575757"
-                    />
-                <TextView
-                    android:id="@+id/work_daily_detail_plan_tv"
-                    style="@style/form_relative_right_text1"
-                    android:textColor="#575757"
-                    android:text="计划啦"/>
-                </LinearLayout>
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:visibility="visible">
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/line"
+                            android:background="@color/item_line"
+                            android:layout_marginRight="5dp"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textSize="18sp"
+                            android:text="@string/wd_plan_title"
+                            android:layout_marginTop="5dp"
+                            android:textColor="#575757"
+                            />
+                        <TextView
+                            android:id="@+id/work_daily_detail_plan_tv"
+                            style="@style/form_relative_right_text1"
+                            android:textColor="#575757"
+                            android:text="计划啦"/>
+                    </LinearLayout>
 
-                <LinearLayout
+                    <LinearLayout
                         android:id="@+id/work_daily_detail_experience_ll"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
                         android:visibility="visible">
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/line"
-                        android:background="@color/item_line"
-                        android:layout_marginRight="5dp"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/wd_experience_title"
-                        android:layout_marginTop="5dp"
-                        android:textSize="18sp"
-                        android:textColor="#575757"
-                        />
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/line"
+                            android:background="@color/item_line"
+                            android:layout_marginRight="5dp"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/wd_experience_title"
+                            android:layout_marginTop="5dp"
+                            android:textSize="18sp"
+                            android:textColor="#575757"
+                            />
 
-                    <TextView
-                        android:id="@+id/work_daily_detail_experience_tv"
-                        style="@style/form_relative_right_text1"
-                        android:textColor="#575757"
-                        android:text="心得啦"
-                        />
+                        <TextView
+                            android:id="@+id/work_daily_detail_experience_tv"
+                            style="@style/form_relative_right_text1"
+                            android:textColor="#575757"
+                            android:text="心得啦"
+                            />
 
-                 </LinearLayout>
+                    </LinearLayout>
                 </LinearLayout>
 
                 <LinearLayout
@@ -259,13 +259,13 @@
                         android:background="@color/white"
                         />
                 </LinearLayout>
-                    <View
-                        android:id="@+id/hide_above_af"
-                        android:layout_width="match_parent"
-                        android:layout_height="10dp"
-                        android:background="@color/black_gray"
-                        android:layout_marginTop="1dp"
-                        android:visibility="visible"/>
+                <View
+                    android:id="@+id/hide_above_af"
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="@color/black_gray"
+                    android:layout_marginTop="1dp"
+                    android:visibility="visible"/>
 
 
                 <com.core.widget.MyListView
@@ -278,7 +278,7 @@
                 </com.core.widget.MyListView>
 
 
-             </LinearLayout>
+            </LinearLayout>
         </LinearLayout>
     </com.core.widget.CustomerScrollView>
     <LinearLayout

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

@@ -308,27 +308,23 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (!CommonUtil.isReleaseVersion()
-                && StepUtils.isCanStep()) {
-//            getMenuInflater().inflate(R.menu.menu_uusport_list, menu);
-        }
+                && StepUtils.isCanStep())
+            getMenuInflater().inflate(R.menu.menu_uusport_list, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home){
-//            startActivity(new Intent(getApplicationContext(), SettingActivity.class));
             finish();
+        } else if (StepUtils.isCanStep() && !CommonUtil.isReleaseVersion() && item.getItemId() == R.id.more){
+            startActivity(new Intent(this,UURanking.class));
         }
-//        else if (StepUtils.isCanStep() && !CommonUtil.isReleaseVersion() && item.getItemId() == R.id.more){
-//            startActivity(new Intent(this,UURanking.class));
-//        }
         return super.onOptionsItemSelected(item);
     }
 
     @Override
     public void onBackPressed() {
-//        startActivity(new Intent(getApplicationContext(), SettingActivity.class));
         finish();
         super.onBackPressed();
     }

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

@@ -141,7 +141,7 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
 
     private void showStepsInfo() {
         progressDialog.dismiss();
-        if (mPersonalStepBean == null || ListUtils.isEmpty(mPersonalStepBean.getWeekSteps()))  return;
+        if (mPersonalStepBean == null || ListUtils.isEmpty(mPersonalStepBean.getWeekSteps()) || ListUtils.isEmpty( mPersonalStepBean.getMonthSteps()))  return;
         int weekSteps_size = mPersonalStepBean.getWeekSteps().size();
         int monthSteps_size = mPersonalStepBean.getMonthSteps().size();
         String curDate = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(TimeUtil.getCurrentDate(), "yyyy年MM月dd日"));

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

@@ -6,16 +6,15 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import com.core.app.AppConstant;
 import com.core.base.BaseActivity;
 import com.core.model.UUSportModel;
+import com.core.widget.MyListView;
 import com.modular.appmessages.R;
-import com.modular.appmessages.adapter.UUSportAdapter;
+import com.modular.appmessages.adapter.UUSportLVAdapter;
 
 import java.util.List;
 
@@ -25,8 +24,6 @@ import java.util.List;
  */
 
 public class UUSportActivity extends BaseActivity implements View.OnClickListener {
-    private RecyclerView contentRV;
-    private UUSportAdapter mAdapter;
     private BroadcastReceiver updateReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -34,8 +31,8 @@ public class UUSportActivity extends BaseActivity implements View.OnClickListene
         }
     };
     private LinearLayoutManager manager;
-
-
+    private MyListView content_mylv;
+    private UUSportLVAdapter lvAdapter;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -48,23 +45,16 @@ public class UUSportActivity extends BaseActivity implements View.OnClickListene
     private void initData() {
 //        List<UUSportModel> models = UUSportDao.getInstance().getAllModels();
         List<UUSportModel> models = null;
-        showModel(models);
-    }
-    private void showModel(final List<UUSportModel> models) {
-        if (mAdapter == null) {
-            mAdapter = new UUSportAdapter(ct, models);
-            contentRV.setAdapter(mAdapter);
-        } else {
-            mAdapter.setModels(models);
-            mAdapter.notifyDataSetChanged();
-        }
-//        ViewUtils.move2Position(manager, contentRV, ListUtils.getSize(models) - 1);
     }
+
     private void initView() {
-        contentRV = (RecyclerView) findViewById(R.id.contentRV);
-        contentRV.setItemAnimator(new DefaultItemAnimator());
         manager = new LinearLayoutManager(ct);
-        contentRV.setLayoutManager(manager);
+        content_mylv = (MyListView) findViewById(R.id.content_mylv);
+
+        lvAdapter = new UUSportLVAdapter(this);
+        content_mylv.setAdapter(lvAdapter);
+//        content_mylv.setSelection(7);
+        lvAdapter.notifyDataSetChanged();
 
         findViewById(R.id.step_rank_ll).setOnClickListener(this);
     }
@@ -73,7 +63,6 @@ public class UUSportActivity extends BaseActivity implements View.OnClickListene
     public void onClick(View v) {
        if (v.getId() == R.id.step_rank_ll){
            startActivity(new Intent("com.modular.appme.UURanking"));
-           ToastMessage("step_rank_ll");
        }
     }
 }

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

@@ -1,14 +1,24 @@
 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:
@@ -27,6 +37,7 @@ public class UUSportAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     public List<UUSportModel> getModels() {
         return models;
     }
+
     public void setModels(List<UUSportModel> models) {
         this.models = models;
     }
@@ -36,8 +47,6 @@ public class UUSportAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
         return position;
     }
 
-
-
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         return null;
@@ -45,11 +54,61 @@ public class UUSportAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-
+        UUSportModel model = models.get(position);
     }
 
     @Override
     public int getItemCount() {
-        return 0;
+        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

@@ -0,0 +1,80 @@
+package com.modular.appmessages.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+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/28.
+ * function:
+ */
+
+public class UUSportLVAdapter extends BaseAdapter{
+    private Context mContext;
+    List<UUSportModel> models;
+
+    public UUSportLVAdapter(Context mContext){this.mContext = mContext;}
+
+    @Override
+    public int getCount() {return 10;}
+    @Override
+    public Object getItem(int position) {return ListUtils.isEmpty(models) ? null : models.get(position);}
+    @Override
+    public long getItemId(int position) {return position;}
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+
+        ViewHolder viewHolder = null;
+        if (convertView == null){
+            viewHolder = new ViewHolder();
+            convertView =  View.inflate(mContext, R.layout.item_dayrank,null);
+            viewHolder.mTimeTV = (TextView) convertView.findViewById(R.id.timeTV);
+            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.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);
+            convertView.setTag(viewHolder);
+        }else {
+            viewHolder = (ViewHolder) convertView.getTag();
+        }
+        viewHolder.mRankTv.setText(String.valueOf(position+1));
+        viewHolder.mStepsTv.setText(String.valueOf(1234*(10-position)-1));
+        if ( position == 5) {
+            viewHolder.mRankInfoRl.setVisibility(View.GONE);
+            viewHolder. mChampionDescTv.setText("心净则美刚刚赞了你");
+        }else {
+            viewHolder.mRankInfoRl.setVisibility(View.VISIBLE);
+        }
+        return convertView;
+    }
+
+    class ViewHolder{
+        TextView mTimeTV;
+        TextView mRankTv;
+        TextView mRankTvStr;
+        TextView mStepsTv;
+        TextView mRstepsTvStr;
+        TextView mChampionDescTv;
+        View mLine;
+        RelativeLayout mRankInfoRl;
+        CircleImageView mChampionIm;
+        LinearLayout mrankLl;
+    }
+}

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

@@ -1,25 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/base_bg"
-   >
+    android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/contentRV"
+    <com.core.widget.CustomerScrollView
+        android:id="@+id/csv_hide"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:layout_above="@id/operationLL"
-        android:layout_alignParentTop="true" />
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:fillViewport="true"
+        android:scrollbars="none"
+        android:visibility="visible">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <com.core.widget.MyListView
+                android:id="@+id/content_mylv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scrollbars="none"
+                android:layout_marginLeft="25dp"
+                android:layout_marginRight="25dp"
+                android:paddingBottom="20dp"/>
+        </LinearLayout>
+    </com.core.widget.CustomerScrollView>
+
 
     <LinearLayout
         android:id="@+id/step_rank_ll"
-        android:layout_alignParentBottom="true"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:orientation="vertical">
+        android:layout_height="40dp"
+        android:orientation="vertical"
+        android:background="@drawable/selector_me_menu_item_bg">
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
@@ -27,10 +42,10 @@
         <TextView
             android:id="@+id/invite_friends_tv"
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="40dp"
             android:text="步数排行榜"
             android:gravity="center"
             android:textColor="@color/black"
             />
     </LinearLayout>
-</RelativeLayout>
+</LinearLayout>

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

@@ -0,0 +1,129 @@
+<?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="wrap_content"
+    android:layout_marginLeft="25dp"
+    android:layout_marginRight="25dp"
+    android:orientation="vertical"
+    >
+
+    <TextView
+        android:id="@+id/timeTV"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/text_hint_bg"
+        android:text="2017-11-11"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_min" />
+
+    <LinearLayout
+        android:id="@+id/rank_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@drawable/rl_circular_bg">
+
+        <RelativeLayout
+            android:id="@+id/rank_info_rl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/rank_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="5dp"
+                android:text="99"
+                android:textColor="@color/green"
+                android:textSize="25sp"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentLeft="true"
+                android:layout_marginLeft="20dp"
+                />
+
+            <TextView
+                android:id="@+id/rank_tv_str"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingBottom="5dp"
+                android:paddingTop="10dp"
+                android:text="名次"
+                android:textColor="@color/green"
+                android:textSize="14sp"
+                android:layout_below="@+id/rank_tv"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_marginLeft="20dp"/>
+            <TextView
+                android:id="@+id/steps_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="10dp"
+                android:text="9999"
+                android:textColor="@color/green"
+                android:textSize="25sp"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="20dp"
+                />
+            <TextView
+                android:id="@+id/rsteps_tv_str"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingBottom="5dp"
+                android:paddingTop="10dp"
+                android:text="步数"
+                android:textColor="@color/green"
+                android:textSize="14sp"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/steps_tv"
+                android:layout_marginRight="20dp"
+                />
+
+            <View
+                android:id="@+id/line"
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:layout_below="@id/rank_tv_str"
+                android:background="@color/item_line"
+                android:layout_marginTop="20dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dp">
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/champion_im"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:src="@drawable/common_header_boy"/>
+
+
+            <TextView
+                android:id="@+id/champion_desc_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="夺得09月27排行版冠军"
+                android:textColor="@color/green"
+                android:layout_toRightOf="@+id/champion_im"
+                android:layout_marginLeft="15dp"
+                android:layout_centerVertical="true"/>
+
+
+            <ImageView
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:src="@drawable/next"
+                android:layout_marginRight="19dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="19dp" />
+        </RelativeLayout>
+    </LinearLayout>
+</LinearLayout>