备份

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/appmessages/src/main/java/com/modular/appmessages/activity/UUSportActivity.java

@@ -14,7 +14,6 @@ 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) {
@@ -48,28 +45,17 @@ 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);
     }
 

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

@@ -28,7 +28,7 @@ public class UUSportLVAdapter extends BaseAdapter{
     public UUSportLVAdapter(Context mContext){this.mContext = mContext;}
 
     @Override
-    public int getCount() {return 20;}
+    public int getCount() {return 10;}
     @Override
     public Object getItem(int position) {return ListUtils.isEmpty(models) ? null : models.get(position);}
     @Override
@@ -54,6 +54,14 @@ public class UUSportLVAdapter extends BaseAdapter{
         }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;
     }
 

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

@@ -1,45 +1,46 @@
 <?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"
-   >
-    <ScrollView
+    android:orientation="vertical">
+
+    <com.core.widget.CustomerScrollView
+        android:id="@+id/csv_hide"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_weight="1"
         android:fillViewport="true"
         android:scrollbars="none"
         android:visibility="visible">
-
-        <com.core.widget.MyListView
-            android:id="@+id/content_mylv"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="none" />
-        </ScrollView>
-    <!--<android.support.v7.widget.RecyclerView-->
-        <!--android:id="@+id/contentRV"-->
-        <!--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="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="40dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:background="@drawable/selector_me_menu_item_bg">
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:background="@color/item_line"/>
         <TextView
             android:id="@+id/invite_friends_tv"
-            android:background="@drawable/bg_rankwhite_btn"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:text="步数排行榜"
@@ -47,4 +48,4 @@
             android:textColor="@color/black"
             />
     </LinearLayout>
-</RelativeLayout>
+</LinearLayout>

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

@@ -4,7 +4,8 @@
     android:layout_height="wrap_content"
     android:layout_marginLeft="25dp"
     android:layout_marginRight="25dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    >
 
     <TextView
         android:id="@+id/timeTV"
@@ -23,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:background="@drawable/rl_circular_bg">
+        android:background="@drawable/bg_rankwhite_btn">
 
         <RelativeLayout
             android:id="@+id/rank_info_rl"
@@ -33,7 +34,6 @@
                 android:id="@+id/rank_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingBottom="5dp"
                 android:paddingTop="5dp"
                 android:text="99"
                 android:textColor="@color/green"
@@ -60,7 +60,6 @@
                 android:id="@+id/steps_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingBottom="5dp"
                 android:paddingTop="10dp"
                 android:text="9999"
                 android:textColor="@color/green"

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 117,
-            versionName      : '5.9.5',
+            versionCode      : 118,
+            versionName      : '5.9.6',
     ]
 
     depsVersion = [