baba jj bug

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="6"
             />
     </LinearLayout>
     <LinearLayout

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

@@ -92,7 +92,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="6"
             />
     </LinearLayout>
     <LinearLayout

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/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());
 

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

@@ -37,7 +37,6 @@ public class UURanking extends BaseActivity {
     private View mHideAboveAf;
     private LinearLayout mAttentionLl;
     private PullToRefreshListView mAttentionPtlv;
-    private LinearLayout mAllLl;
     private PullToRefreshListView mAllPtlv;
     private TextView mInviteFriendsTv;
     private StepDataDao stepDataDao;
@@ -65,7 +64,6 @@ 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);
-        mAllLl = (LinearLayout) findViewById(R.id.all_ll);
         mAllPtlv = (PullToRefreshListView) findViewById(R.id.all_ptlv);
         mInviteFriendsTv = (TextView) findViewById(R.id.invite_friends_tv);
         stepDataDao = new StepDataDao(this);
@@ -74,6 +72,8 @@ public class UURanking extends BaseActivity {
         mRankAdapter = new UURankingAdapter(this);
         mAllPtlv.getRefreshableView().setAdapter(mRankAdapter);
 
+        mAttentionLl.setVisibility(View.GONE);
+
         myem_name = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
         mNameTv.setText(myem_name+"");
         String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();

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

@@ -2,7 +2,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:orientation="horizontal"
+    android:background="@color/bg_main">
 
     <TextView
         android:id="@+id/ranking_tv"
@@ -22,7 +23,6 @@
         android:layout_height="wrap_content"
         android:padding="5dp"
         android:layout_marginRight="10dp"
-        android:background="@color/bg_main"
         >
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/photo_img"

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

@@ -4,97 +4,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <ImageView
-        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"/>
-  <com.core.widget.CustomerScrollView
+  <ScrollView
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:fillViewport="true"
@@ -102,20 +13,108 @@
       android:visibility="visible">
       <LinearLayout
           android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:focusable="true"
-          android:focusableInTouchMode="true"
+          android:layout_height="match_parent"
           android:orientation="vertical">
+          <ImageView
+              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="wrap_content"
+            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:layout_below="@id/seach_top"
                 android:background="@color/item_line"
                 android:dividerHeight="2px"
                 android:scrollbars="none" />
@@ -126,33 +125,20 @@
                 android:layout_marginTop="1dp"
                 android:visibility="visible"/>
         </LinearLayout>
-          <LinearLayout
-              android:id="@+id/all_ll"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
               <com.handmark.pulltorefresh.library.PullToRefreshListView
                   android:id="@+id/all_ptlv"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
-                  android:layout_below="@id/seach_top"
                   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>
+                  />
+          <TextView
+              android:id="@+id/invite_friends_tv"
+              android:textColor="@color/green"
+              android:layout_width="match_parent"
+              android:layout_height="30dp"
+              android:text="邀请好友参加UU运行"
+              />
       </LinearLayout>
-  </com.core.widget.CustomerScrollView>
-    <TextView
-        android:id="@+id/invite_friends_tv"
-        android:textColor="@color/green"
-        android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:text="邀请好友参加UU运行"
-        />
+  </ScrollView>
 </LinearLayout>

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

@@ -62,7 +62,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);
@@ -130,10 +130,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);
@@ -146,9 +152,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);
@@ -211,6 +221,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();

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 = [