18:07

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

@@ -33,18 +33,10 @@
                     android:textColor="@color/text_main"
                     android:textSize="15sp" />
 
-                <ImageView
-                    style="@style/IMTbleLine_ArrowImg"
-                    android:layout_alignParentRight="true"
-                    android:contentDescription="@string/app_name" />
                 <com.andreabaccega.widget.FormEditText
                     android:id="@+id/reimbursement_title_fet"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginBottom="13dp"
                     android:background="@null"
                     android:gravity="center_vertical|right"
                     android:hint="@string/common_input"
@@ -54,7 +46,11 @@
                     android:textSize="15sp"
                     whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,30}+$"
                     whatever:testErrorString="限制30个之内有效中英文字符"
-                    whatever:testType="regexp" />
+                    whatever:testType="regexp"
+                    android:layout_alignBaseline="@+id/name_tv"
+                    android:layout_alignBottom="@+id/name_tv"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true" />
             </RelativeLayout>
 
             <View

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

@@ -41,7 +41,7 @@
             android:gravity="center_vertical|right"
             android:layout_marginRight="5dp"
             android:textSize="17sp"
-            android:maxLength="6"
+            android:maxLength="8"
             />
     </LinearLayout>
     <LinearLayout

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

@@ -41,7 +41,7 @@
             android:gravity="center_vertical|right"
             android:layout_marginRight="5dp"
             android:textSize="17sp"
-            android:maxLength="6"
+            android:maxLength="8"
             />
     </LinearLayout>
     <LinearLayout

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

@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.common.data.ListUtils;
 import com.uas.appme.R;
@@ -59,7 +60,7 @@ public class UURankingAdapter extends BaseAdapter{
             viewHolder = (ViewHolder) convertView.getTag();
         }
         viewHolder.ranking_tv.setText(position+"");
-        viewHolder.name_tv.setText("方龙海");
+        viewHolder.name_tv.setText("hihi");
         viewHolder.steps_tv.setText(mList.get(position).getSteps());
         viewHolder.prise_tv.setText("0");
         return convertView;

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

@@ -306,7 +306,8 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-//        getMenuInflater().inflate(R.menu.menu_uusport_list, menu);
+//        if (!CommonUtil.isReleaseVersion())
+            getMenuInflater().inflate(R.menu.menu_uusport_list, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -314,11 +315,9 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home){
             startActivity(new Intent(getApplicationContext(), SettingActivity.class));
+        } else if (item.getItemId() == R.id.more){
+            startActivity(new Intent(this,UURanking.class));
         }
-//        else if (item.getItemId() == R.id.more){
-//            ToastMessage("UUSportList");
-//            startActivity(new Intent(this,UURanking.class));
-//        }
         return super.onOptionsItemSelected(item);
     }
 

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

@@ -10,6 +10,7 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
+import com.core.widget.MyListView;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.adapter.UURankingAdapter;
@@ -37,13 +38,14 @@ public class UURanking extends BaseActivity {
     private View mHideAboveAf;
     private LinearLayout mAttentionLl;
     private PullToRefreshListView mAttentionPtlv;
-    private PullToRefreshListView mAllPtlv;
+    private MyListView mAllPtlv;
     private TextView mInviteFriendsTv;
     private StepDataDao stepDataDao;
     private String curSelDate;
     private String myem_name;
     private List<StepEntity> stepEntityList;
     private UURankingAdapter mRankAdapter;
+    private ImageView mHeaderImg;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -55,6 +57,7 @@ public class UURanking extends BaseActivity {
 
     private void initView() {
 
+        mHeaderImg = (ImageView) findViewById(R.id.header_background_im);
         mPhotoImg = (CircleImageView) findViewById(R.id.photo_img);
         mNameTv = (TextView) findViewById(R.id.name_tv);
         mRankingTv = (TextView) findViewById(R.id.ranking_tv);
@@ -64,14 +67,15 @@ public class UURanking extends BaseActivity {
         mHideAboveAf = (View) findViewById(R.id.hide_above_af);
         mAttentionLl = (LinearLayout) findViewById(R.id.attention_ll);
         mAttentionPtlv = (PullToRefreshListView) findViewById(R.id.attention_ptlv);
-        mAllPtlv = (PullToRefreshListView) findViewById(R.id.all_ptlv);
+        mAllPtlv = (MyListView) findViewById(R.id.all_ptlv);
         mInviteFriendsTv = (TextView) findViewById(R.id.invite_friends_tv);
         stepDataDao = new StepDataDao(this);
         curSelDate = TimeUtil.getCurrentDate();
         stepEntityList = new ArrayList<>();
         mRankAdapter = new UURankingAdapter(this);
-        mAllPtlv.getRefreshableView().setAdapter(mRankAdapter);
+        mAllPtlv.setAdapter(mRankAdapter);
 
+        mHeaderImg.requestFocus();
         mAttentionLl.setVisibility(View.GONE);
 
         myem_name = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");

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

@@ -70,8 +70,8 @@
             android:layout_marginRight="5dp"/>
         <ImageView
             android:id="@+id/prise_im"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
             android:src="@drawable/uuu"
             android:layout_alignParentRight="true"
             android:layout_below="@+id/prise_tv"

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

@@ -15,7 +15,7 @@
         android:text="1"
         android:layout_marginTop="20dp"
         android:layout_alignParentLeft="true"
-        android:layout_marginLeft="5dp"
+        android:layout_marginLeft="10dp"
         />
 
     <RelativeLayout
@@ -72,8 +72,8 @@
             android:layout_marginRight="5dp"/>
         <ImageView
             android:id="@+id/prise_im"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
             android:src="@drawable/uuu"
             android:layout_alignParentRight="true"
             android:layout_below="@+id/prise_tv"

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

@@ -16,6 +16,8 @@
           android:layout_height="match_parent"
           android:orientation="vertical">
           <ImageView
+              android:id="@+id/header_background_im"
+              android:focusableInTouchMode="true"
               android:layout_width="match_parent"
               android:layout_height="200dp"
               android:background="@drawable/uuu"/>
@@ -106,7 +108,7 @@
               android:layout_marginTop="1dp"
               android:visibility="visible"/>
 
-        <LinearLayout
+       <LinearLayout
             android:id="@+id/attention_ll"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -125,19 +127,24 @@
                 android:layout_marginTop="1dp"
                 android:visibility="visible"/>
         </LinearLayout>
-              <com.handmark.pulltorefresh.library.PullToRefreshListView
+              <com.core.widget.MyListView
                   android:id="@+id/all_ptlv"
                   android:layout_width="match_parent"
-                  android:layout_height="match_parent"
+                  android:layout_height="wrap_content"
                   android:background="@color/item_line"
                   android:dividerHeight="2px"
                   />
+          <View
+              android:layout_width="match_parent"
+              android:layout_height="@dimen/line"
+              android:background="@color/item_line"/>
           <TextView
               android:id="@+id/invite_friends_tv"
               android:textColor="@color/green"
               android:layout_width="match_parent"
-              android:layout_height="30dp"
+              android:layout_height="60dp"
               android:text="邀请好友参加UU运行"
+              android:gravity="center"
               />
       </LinearLayout>
   </ScrollView>