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

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/expense_details_table_item.xml

@@ -38,11 +38,7 @@
             android:layout_gravity="center_vertical"
             android:textColor="@color/text_main"
             android:textSize="14sp"
-            android:maxLength="7"
             android:paddingLeft="10dp"
-            whatever:customRegexp="^[0-9]+(.[0-9]{2})?$"
-            whatever:testType="regexp"
-            whatever:testErrorString="限制输入7位有效正实数（保留两位小数）"
         />
 
         <View

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

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

WeiChat/src/main/res/menu/menu_uusport_list.xml

@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.xzjmyk.pm.activity.MainActivity">
+
+    <item
+        android:id="@+id/more"
+        android:title="@string/sports_recode"
+        android:icon="@drawable/xlist"
+        app:showAsAction="ifRoom" />
+
+</menu>

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

@@ -93,7 +93,7 @@
                     android:id="@+id/et_task_people"
                     style="@style/TagGroup"
                     android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
+                    android:layout_height="match_parent"
                     android:background="@null" />
             </ScrollView>
 

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

@@ -33,10 +33,6 @@
                     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"

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

@@ -38,11 +38,8 @@
             android:layout_gravity="center_vertical"
             android:textColor="@color/text_main"
             android:textSize="14sp"
-            android:maxLength="7"
             android:paddingLeft="10dp"
-            whatever:customRegexp="^[0-9]+(.[0-9]{2})?$"
-            whatever:testType="regexp"
-            whatever:testErrorString="限制输入7位有效正实数（保留两位小数）"
+
         />
 
         <View

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

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

app_core/common/src/main/res/menu/menu_uusport_list.xml

@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.xzjmyk.pm.activity.MainActivity">
+
+    <item
+        android:id="@+id/more"
+        android:title="@string/sports_recode"
+        android:icon="@drawable/xlist"
+        app:showAsAction="ifRoom" />
+
+</menu>

app_modular/appme/src/main/AndroidManifest.xml

@@ -35,5 +35,7 @@
         <activity
             android:name="com.uas.appme.other.activity.SelectAreaActivity"
             android:screenOrientation="portrait" />
+        <activity android:name=".pedometer.view.UURanking"
+            android:label="排行榜"></activity>
     </application>
 </manifest>

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

@@ -0,0 +1,76 @@
+package com.uas.appme.pedometer.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.common.data.ListUtils;
+import com.uas.appme.R;
+import com.uas.appme.pedometer.bean.StepEntity;
+
+import java.util.List;
+
+import de.hdodenhof.circleimageview.CircleImageView;
+
+/**
+ * Created by FANGlh on 2017/9/19.
+ * function:
+ */
+
+public class UUAttentionAdapter extends BaseAdapter{
+    private List<StepEntity> mList;
+    private Context mContext;
+
+    public List<StepEntity> getmList() {return mList;}
+    public void setmList(List<StepEntity> mList) {this.mList = mList;}
+    public UUAttentionAdapter(Context mContext){this.mContext = mContext;}
+    @Override
+    public int getCount() {
+        return ListUtils.isEmpty(mList) ? 0 : mList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mList.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_uuattention,null);
+            viewHolder.ranking_tv = (TextView) convertView.findViewById(R.id.ranking_tv);
+            viewHolder.name_tv = (TextView) convertView.findViewById(R.id.name_tv);
+            viewHolder.steps_tv = (TextView) convertView.findViewById(R.id.steps_tv);
+            viewHolder.prise_tv = (TextView) convertView.findViewById(R.id.prise_tv);
+            viewHolder.photo_img = (CircleImageView) convertView.findViewById(R.id.photo_img);
+            viewHolder.prise_im = (ImageView) convertView.findViewById(R.id.prise_im);
+            convertView.setTag(viewHolder);
+        }else {
+            viewHolder = (ViewHolder) convertView.getTag();
+        }
+        viewHolder.ranking_tv.setText(position+"");
+        viewHolder.name_tv.setText("方龙海");
+        viewHolder.steps_tv.setText(mList.get(position).getSteps());
+        viewHolder.prise_tv.setText("0");
+        return convertView;
+    }
+
+    class ViewHolder{
+        TextView ranking_tv;
+        CircleImageView photo_img;
+        TextView name_tv;
+        TextView steps_tv;
+        TextView prise_tv;
+        ImageView prise_im;
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.uas.appme.pedometer.adapter;
+
+import android.content.Context;
+import android.view.View;
+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;
+import com.uas.appme.pedometer.bean.StepEntity;
+
+import java.util.List;
+
+import de.hdodenhof.circleimageview.CircleImageView;
+
+/**
+ * Created by FANGlh on 2017/9/19.
+ * function:
+ */
+
+public class UURankingAdapter extends BaseAdapter{
+    private List<StepEntity> mList;
+    private Context mContext;
+
+    public List<StepEntity> getmList() {return mList;}
+    public void setmList(List<StepEntity> mList) {this.mList = mList;}
+    public UURankingAdapter(Context mContext){this.mContext = mContext;}
+    @Override
+    public int getCount() {
+        return ListUtils.isEmpty(mList) ? 0 : mList.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mList.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_uuranking,null);
+            viewHolder.ranking_tv = (TextView) convertView.findViewById(R.id.ranking_tv);
+            viewHolder.name_tv = (TextView) convertView.findViewById(R.id.name_tv);
+            viewHolder.steps_tv = (TextView) convertView.findViewById(R.id.steps_tv);
+            viewHolder.prise_tv = (TextView) convertView.findViewById(R.id.prise_tv);
+            viewHolder.photo_img = (CircleImageView) convertView.findViewById(R.id.photo_img);
+            viewHolder.prise_im = (ImageView) convertView.findViewById(R.id.prise_im);
+            convertView.setTag(viewHolder);
+        }else {
+            viewHolder = (ViewHolder) convertView.getTag();
+        }
+        viewHolder.ranking_tv.setText(position+"");
+        viewHolder.name_tv.setText("hihi");
+        viewHolder.steps_tv.setText(mList.get(position).getSteps());
+        viewHolder.prise_tv.setText("0");
+        return convertView;
+    }
+
+    class ViewHolder{
+        TextView ranking_tv;
+        CircleImageView photo_img;
+        TextView name_tv;
+        TextView steps_tv;
+        TextView prise_tv;
+        ImageView prise_im;
+    }
+}

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

@@ -218,7 +218,14 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
      */
     private void setDatas() {
         StepEntity stepEntity = stepDataDao.getCurDataByDate(curSelDate);
+        //制作一些假数据
 
+//        for(int k=1;k<20;k++){
+//            StepEntity entity = new StepEntity();
+//            entity.setCurDate("2017-09-"+k);
+//            entity.setSteps(123*k+"");
+//            stepDataDao.addNewData(entity);
+//        }
         if (stepEntity != null) {
             int steps = Integer.parseInt(stepEntity.getSteps());
 
@@ -299,6 +306,8 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+//        if (!CommonUtil.isReleaseVersion())
+            getMenuInflater().inflate(R.menu.menu_uusport_list, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -306,6 +315,8 @@ 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));
         }
         return super.onOptionsItemSelected(item);
     }
@@ -315,4 +326,5 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         startActivity(new Intent(getApplicationContext(), SettingActivity.class));
         super.onBackPressed();
     }
+
 }

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

@@ -0,0 +1,106 @@
+package com.uas.appme.pedometer.view;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+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;
+import com.uas.appme.pedometer.bean.StepEntity;
+import com.uas.appme.pedometer.db.StepDataDao;
+import com.uas.appme.pedometer.utils.TimeUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import de.hdodenhof.circleimageview.CircleImageView;
+
+/**
+ * Created by FANGlh on 2017/9/19.
+ * function:
+ */
+
+public class UURanking extends BaseActivity {
+    private CircleImageView mPhotoImg;
+    private TextView mNameTv;
+    private TextView mRankingTv;
+    private TextView mStepsTv;
+    private TextView mPriseTv;
+    private ImageView mPriseIm;
+    private View mHideAboveAf;
+    private LinearLayout mAttentionLl;
+    private PullToRefreshListView mAttentionPtlv;
+    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) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.uu_ranking_activity);
+        initView();
+        initData();
+    }
+
+    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);
+        mStepsTv = (TextView) findViewById(R.id.steps_tv);
+        mPriseTv = (TextView) findViewById(R.id.prise_tv);
+        mPriseIm = (ImageView) findViewById(R.id.prise_im);
+        mHideAboveAf = (View) findViewById(R.id.hide_above_af);
+        mAttentionLl = (LinearLayout) findViewById(R.id.attention_ll);
+        mAttentionPtlv = (PullToRefreshListView) findViewById(R.id.attention_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.setAdapter(mRankAdapter);
+
+        mHeaderImg.requestFocus();
+        mAttentionLl.setVisibility(View.GONE);
+
+        myem_name = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
+        mNameTv.setText(myem_name+"");
+        String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        AvatarHelper.getInstance().display(loginUserId, mPhotoImg, true, false);
+        StepEntity stepEntity = stepDataDao.getCurDataByDate(curSelDate);
+        if (stepEntity != null) {
+            int steps = Integer.parseInt(stepEntity.getSteps());
+            //获取全局的步数
+            mStepsTv.setText(String.valueOf(steps));
+        } else {
+            //获取全局的步数
+            mStepsTv.setText("0");
+        }
+
+        stepEntityList.clear();
+        stepEntityList.addAll(stepDataDao.getAllDatas());
+        mRankAdapter.setmList(stepEntityList);
+        mRankAdapter.notifyDataSetChanged();
+    }
+
+    private void initData() {
+
+    }
+
+
+}

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

@@ -0,0 +1,80 @@
+<?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="match_parent">
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="5dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/bg_main"
+        >
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/photo_img"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:contentDescription="@string/app_name"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:src="@drawable/common_header_boy"/>
+
+        <TextView
+            android:id="@+id/name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_toRightOf="@+id/photo_img"
+            android:textColor="@color/black"
+            android:textSize="@dimen/text_hine"
+            android:layout_marginTop="10dp"
+            android:text="张三"
+
+            />
+        <TextView
+            android:id="@+id/ranking_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_toRightOf="@+id/photo_img"
+            android:layout_below="@id/name_tv"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/text_hine"
+            android:layout_marginTop="4dp"
+            android:text="第一名"/>
+
+        <TextView
+            android:id="@+id/steps_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="0dp"
+            android:textSize="@dimen/BigTextSize"
+            android:text="9999"
+            android:textColor="@color/green"
+            android:layout_toLeftOf="@+id/prise_tv"
+            android:layout_marginRight="20dp"
+            />
+
+        <TextView
+            android:id="@+id/prise_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"
+            android:text="1"
+            android:textColor="@color/text_hine"
+            android:layout_marginRight="5dp"/>
+        <ImageView
+            android:id="@+id/prise_im"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:src="@drawable/uuu"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/prise_tv"
+            android:layout_marginTop="5dp"/>
+    </RelativeLayout>
+</LinearLayout>

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

@@ -0,0 +1,82 @@
+<?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="match_parent"
+    android:orientation="horizontal"
+    android:background="@color/bg_main">
+
+    <TextView
+        android:id="@+id/ranking_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/photo_img"
+        android:textColor="@color/black"
+        android:textSize="@dimen/text_main"
+        android:text="1"
+        android:layout_marginTop="20dp"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="10dp"
+        />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="5dp"
+        android:layout_marginRight="10dp"
+        >
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/photo_img"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:contentDescription="@string/app_name"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:src="@drawable/common_header_boy"/>
+
+        <TextView
+            android:id="@+id/name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_toRightOf="@+id/photo_img"
+            android:textColor="@color/black"
+            android:textSize="@dimen/text_hine"
+            android:text="张三"
+            android:layout_marginTop="20dp"
+            />
+
+
+        <TextView
+            android:id="@+id/steps_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/BigTextSize"
+            android:text="9999"
+            android:textColor="@color/green"
+            android:layout_marginRight="15dp"
+            android:layout_below="@+id/prise_tv"
+            android:layout_toLeftOf="@+id/prise_im"
+            android:layout_toStartOf="@+id/prise_im"
+            android:layout_marginEnd="15dp" />
+
+        <TextView
+            android:id="@+id/prise_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"
+            android:text="1"
+            android:textColor="@color/text_hine"
+            android:layout_marginRight="5dp"/>
+        <ImageView
+            android:id="@+id/prise_im"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:src="@drawable/uuu"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/prise_tv"
+            android:layout_marginTop="5dp"/>
+    </RelativeLayout>
+</LinearLayout>

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

@@ -0,0 +1,151 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+
+  <ScrollView
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:fillViewport="true"
+      android:scrollbars="none"
+      android:visibility="visible">
+      <LinearLayout
+          android:layout_width="match_parent"
+          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"/>
+
+
+          <RelativeLayout
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:padding="5dp"
+              android:background="@color/bg_main"
+              >
+
+              <de.hdodenhof.circleimageview.CircleImageView
+                  android:id="@+id/photo_img"
+                  android:layout_width="45dp"
+                  android:layout_height="45dp"
+                  android:contentDescription="@string/app_name"
+                  android:layout_marginTop="5dp"
+                  android:layout_marginBottom="5dp"
+                  android:src="@drawable/common_header_boy"
+                  android:layout_marginLeft="20dp"
+                  />
+
+              <TextView
+                  android:id="@+id/name_tv"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_marginLeft="8dp"
+                  android:layout_toRightOf="@+id/photo_img"
+                  android:textColor="@color/black"
+                  android:textSize="@dimen/text_hine"
+                  android:layout_marginTop="10dp"
+                  android:text="张三"
+
+                  />
+              <TextView
+                  android:id="@+id/ranking_tv"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_marginLeft="8dp"
+                  android:layout_toRightOf="@+id/photo_img"
+                  android:layout_below="@id/name_tv"
+                  android:textColor="@color/gray"
+                  android:textSize="@dimen/text_hine"
+                  android:layout_marginTop="4dp"
+                  android:text="第一名"/>
+
+              <TextView
+                  android:id="@+id/steps_tv"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_marginTop="20dp"
+                  android:layout_marginBottom="0dp"
+                  android:textSize="@dimen/BigTextSize"
+                  android:text="9999"
+                  android:textColor="@color/green"
+                  android:layout_toLeftOf="@+id/prise_tv"
+                  android:layout_marginRight="20dp"
+                  />
+
+              <TextView
+                  android:id="@+id/prise_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"
+                  android:text="1"
+                  android:textColor="@color/text_hine"
+                  android:layout_marginRight="15dp"
+                  />
+              <ImageView
+                  android:id="@+id/prise_im"
+                  android:layout_width="20dp"
+                  android:layout_height="20dp"
+                  android:src="@drawable/uuu"
+                  android:layout_alignParentRight="true"
+                  android:layout_below="@+id/prise_tv"
+                  android:layout_marginTop="5dp"
+                  android:layout_marginRight="10dp"/>
+          </RelativeLayout>
+          <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"/>
+
+       <LinearLayout
+            android:id="@+id/attention_ll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <com.handmark.pulltorefresh.library.PullToRefreshListView
+                android:id="@+id/attention_ptlv"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/item_line"
+                android:dividerHeight="2px"
+                android:scrollbars="none" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:background="@color/black_gray"
+                android:layout_marginTop="1dp"
+                android:visibility="visible"/>
+        </LinearLayout>
+              <com.core.widget.MyListView
+                  android:id="@+id/all_ptlv"
+                  android:layout_width="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="60dp"
+              android:text="邀请好友参加UU运行"
+              android:gravity="center"
+              />
+      </LinearLayout>
+  </ScrollView>
+</LinearLayout>

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/TaskAddErpActivity.java

@@ -64,7 +64,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
     private int save = 0;
     private String selectCode = null;
     private int type = 0;
-
+    private boolean timeSelected = false;//是否已经进行选择时间操作
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -136,10 +136,16 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
 
     @Override
     public void onClick(View v) {
+        String sT = et_startime.getText().toString();
+        String eT = et_endtime.getText().toString();
         if (v.getId() == R.id.et_startime){
+            if (timeSelected) {
+               sT = sT +":00"; //这里传的跳时间选择界面时需要带上秒，统一考勤界面的时间选择逻辑
+               eT = eT +":00";
+            }
             startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
-                            .putExtra("startDate", et_startime.getText().toString())
-                            .putExtra("endDate", et_endtime.getText().toString())
+                            .putExtra("startDate", sT)
+                            .putExtra("endDate", eT)
                             .putExtra("hasMenu", false)
                             .putExtra("caller", "Workovertime")
                     , 0x30);
@@ -152,9 +158,13 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
             intent.putExtra(OAConfig.MODEL_DATA, bean);
             startActivityForResult(intent, 0x01);
         }else if (v.getId() == R.id.et_endtime){
+            if (timeSelected) {
+                sT = sT +":00";
+                eT = eT +":00";
+            }
             startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
-                            .putExtra("startDate", et_startime.getText().toString())
-                            .putExtra("endDate", et_endtime.getText().toString())
+                            .putExtra("startDate", sT)
+                            .putExtra("endDate", eT)
                             .putExtra("hasMenu", false)
                             .putExtra("caller", "Workovertime")
                     , 0x30);
@@ -217,6 +227,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         }
 
         if (requestCode == 0x30 && resultCode == 0x11) {
+            timeSelected = true;
             String startDate = data.getStringExtra("startDate");
             String endDate = data.getStringExtra("endDate");
 //            startDate=startDate+":00";

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/ExpenseReimbursementActivity.java

@@ -637,6 +637,16 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
 
     private void doShowFormData(JSONArray formdataArray, List<CommonDocAMBean.DatasBean.FormconfigsBean> mFormconfigsList) {
         if (!ListUtils.isEmpty(mFormconfigsList)  &&  !ListUtils.isEmpty(formdataArray)){
+
+            fb_attach = formdataArray.getJSONObject(0).getString("fb_attach");
+            Log.i("fb_attach_ss",fb_attach+"?");
+            if (!StringUtil.isEmpty(fb_attach)) {
+                getUpdatePicture(); //获取发票图片
+            }else {
+                progressDialog.dismiss();
+            }
+
+
             for (int i = 0; i < mFormconfigsList.size(); i++) {
                 String key = mFormconfigsList.get(i).getFD_FIELD();
                 if (StringUtil.isEmpty(key)) return;
@@ -657,15 +667,6 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                         break;
                 }
             }
-
-            fb_attach = formdataArray.getJSONObject(0).getString("fb_attach");
-            Log.i("fb_attach_ss",fb_attach+"?");
-            if (!StringUtil.isEmpty(fb_attach)) {
-                getUpdatePicture(); //获取发票图片
-            }else {
-                progressDialog.dismiss();
-            }
-
         }
     }
 
@@ -924,13 +925,14 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         }else if (v.getId() == R.id.c_equal){
             String stringresult = c_result.getText().toString();
             String nowedit = c_edit.getText().toString();
-
             if (StringUtil.isEmpty(stringresult)){
                 if(!StringUtil.isEmpty(nowedit)){
+                    double d = CommonUtil.getTwoPointDouble(Double.valueOf(nowedit));
                     costFormModel_list.get(et_position).setCost_money(CommonUtil.getTwoPointDouble(Double.valueOf(nowedit)));
                     dtAdapter.notifyDataSetChanged();
                     doAutoCalculateJudge();
                     c_edit.setText(null);
+                    Log.i("left=,right=,d=",stringresult+","+nowedit+","+d);
                     closeCalculatorWindow();
                 }else {
                     ToastMessage("请输入");

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/WorkDailyAddActivity.java

@@ -558,7 +558,6 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
                             } else {
                                 Intent intent1 = new Intent("com.modular.work.OAActivity");
                                 intent1.putExtra("WorkDailyAdd", "WorkDailyAdd");
-                                intent1.addCategory("com.modular.work.OAActivity");
                                 startActivity(intent1);
                             }
                             finish();

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/adapter/WorkDailyAdapter.java

@@ -53,10 +53,6 @@ public class WorkDailyAdapter extends BaseAdapter {
         this.mContext = mContext;
     }
 
-//    public List<WorkDailyBean> getmWorkDailyBeanList() {
-//        return mWorkDailyBeanList;
-//    }
-
     public void setmWorkDailyBeanList(List<WorkDailyBean> mWorkDailyBeans) {
         this.mWorkDailyBeanList = mWorkDailyBeans;
     }

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 114,
-            versionName      : '5.9.2',
+            versionCode      : 115,
+            versionName      : '5.9.3',
     ]
 
     depsVersion = [