18:07

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -75,18 +75,19 @@ import com.core.xmpp.ListenerManager;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.listener.AuthStateListener;
 import com.core.xmpp.model.SignAutoLogEntity;
+import com.modular.appmessages.presenter.MessagePresenter;
 import com.modular.login.LoginActivity;
 import com.uas.appcontact.listener.ImStatusListener;
 import com.uas.appcontact.ui.fragment.ContactsFragment;
 import com.uas.appcontact.ui.fragment.GroupChatFragment;
 import com.uas.appme.pedometer.service.StepService;
 import com.uas.appme.pedometer.utils.StepCountCheckUtil;
+import com.uas.appme.pedometer.utils.StepUtils;
 import com.uas.appme.settings.activity.FeedbackActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
-import com.modular.appmessages.presenter.MessagePresenter;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.me.ScreenListener;
@@ -587,7 +588,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
             }
         }
         doSendSignAutoLog(); // 获取数据库中监控日志上传至服务器操作
-        //TODO 桌面红点显示逻辑
+        //桌面红点显示逻辑
         if (OAConfig.canShowRed) {
             if (handler == null) {
                 handler = new Handler();
@@ -597,7 +598,11 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
             }
             handler.post(runnable);
         }
+        //语音导航 ，目前还未正式开发
         hiQuickSearch();
+
+        //将本地的UU运动步数更新至服务器
+        StepUtils.doSaveLocalStepsToHttps();
     }
 
     private void hiQuickSearch() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/CommonUtil.java

@@ -1502,7 +1502,16 @@ public class CommonUtil {
             return 0;
         }
     }
-
+    public static String getTwoPointStr(double m){
+        String  strValue = "";
+        try {
+            DecimalFormat df = new DecimalFormat("#,###.##");
+            strValue   =   df.format(m);
+            return strValue;
+        } catch (Exception e) {
+            return strValue;
+        }
+    }
     /*获取账套，erp的账套  b2b的公司uu号*/
     public static String getMaster() {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;

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

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

app_core/common/src/main/java/com/core/dao/TrackPointDao.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * Created by FANGlh on 2017/9/13.
- * function:
+ * function:   //运行轨迹存贮本地、删除、查询Dao类
  +"latitude double(13,10)," //纬度
  +"longitude double(13,10)," //经度
  +"timestamp varchar(50)," //实时定位时的时间戳

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

@@ -502,6 +502,16 @@ public class CommonUtil {
         }
     }
 
+    public static String getTwoPointStr(double m){
+        String  strValue = "";
+        try {
+            DecimalFormat df = new DecimalFormat("#,###.##");
+            strValue   =   df.format(m);
+            return strValue;
+        } catch (Exception e) {
+            return strValue;
+        }
+    }
     /**
      * 根据手机的分辨率从 dp 的单位 转成为 px(像素)
      */

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

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

app_modular/appme/src/main/AndroidManifest.xml

@@ -37,5 +37,6 @@
             android:screenOrientation="portrait" />
         <activity android:name=".pedometer.view.UURanking"
             android:label="排行榜"></activity>
+        <activity android:name=".pedometer.view.PersonalPageActivity"/>
     </application>
 </manifest>

app_modular/appme/src/main/java/com/uas/appme/pedometer/bean/StepsRankingBean.java

@@ -0,0 +1,9 @@
+package com.uas.appme.pedometer.bean;
+
+/**
+ * Created by FANGlh on 2017/9/21.
+ * function:
+ */
+
+public class StepsRankingBean {
+}

app_modular/appme/src/main/java/com/uas/appme/pedometer/constant/Constant.java

@@ -22,5 +22,6 @@ public class Constant {
     public static final int LATEST_COLUMN = Integer.MAX_VALUE;
     public static final int BASE_COLUMN = 100000000;
     public static String TRACK_STEP = "TRACKSTEP";
+    public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
 
 }

app_modular/appme/src/main/java/com/uas/appme/pedometer/service/StepService.java

@@ -22,13 +22,21 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.baidu.mapapi.model.LatLng;
 import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.utils.CommonUtil;
+import com.core.utils.TimeUtils;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
 import com.uas.appme.pedometer.constant.Constant;
@@ -40,7 +48,9 @@ import com.uas.appme.pedometer.view.StepSplashActivity;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by FANGLH
@@ -389,6 +399,8 @@ public class StepService extends Service implements SensorEventListener {
     }
 
 
+
+
     @Override
     public void onDestroy() {
         super.onDestroy();

app_modular/appme/src/main/java/com/uas/appme/pedometer/utils/StepUtils.java

@@ -0,0 +1,57 @@
+package com.uas.appme.pedometer.utils;
+
+import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
+import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
+import com.core.app.MyApplication;
+import com.core.utils.CommonUtil;
+import com.core.utils.TimeUtils;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.uas.appme.pedometer.bean.StepEntity;
+import com.uas.appme.pedometer.constant.Constant;
+import com.uas.appme.pedometer.db.StepDataDao;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by FANGlh on 2017/9/21.
+ * function: UU计步工具类 区分与 Track轨迹公共类
+ */
+
+public class StepUtils {
+
+    public static void doSaveLocalStepsToHttps() {
+        StepDataDao stepDataDao = new StepDataDao(MyApplication.getInstance());
+        //获取当前时间
+        String CURRENT_DATE = TimeUtil.getCurrentDate();
+        StepEntity entity = stepDataDao.getCurDataByDate(CURRENT_DATE);
+        String steps = entity.getSteps();
+        String date = TimeUtils.s_long_2_str(DateFormatUtil.str2Long(entity.getCurDate(), "yyyy年MM月dd日"));
+
+        LogUtil.prinlnLongMsg("steps=,date=",steps+","+date);
+        if (StringUtil.isEmpty(steps) || StringUtil.isEmpty(date)) return;
+        Map<String,Object> saveMap = new HashMap<>();
+        saveMap.put("as_userid",MyApplication.getInstance().mLoginUser.getUserId());
+        saveMap.put("as_username", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname"));
+        saveMap.put("as_uusteps",steps);
+        saveMap.put("as_date",date);
+        String map = JSONUtil.map2JSON(saveMap);
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).build();
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("appUUsteps")
+                .add("map",map)
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.prinlnLongMsg("appUUsteps",o.toString()+"");
+            }
+        }));
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.uas.appme.pedometer.view;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import com.alibaba.fastjson.JSON;
+import com.common.LogUtil;
+import com.common.data.StringUtil;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.uas.appme.R;
+import com.uas.appme.pedometer.constant.Constant;
+
+/**
+ * Created by FANGlh on 2017/9/21.
+ * function:
+ */
+
+public class PersonalPageActivity extends BaseActivity {
+
+    private String title;
+    private String userid;
+    private String em_name;
+    private int type;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.personal_page_activity);
+
+        initView();
+        initData();
+    }
+
+    private void initView() {
+        Intent intent = getIntent();
+        title = intent.getStringExtra("title");
+        userid = intent.getStringExtra("userid");
+        em_name = intent.getStringExtra("em_name");
+        type = intent.getIntExtra("type",-1);
+        getSupportActionBar().setTitle(title);
+    }
+
+    private void initData() {
+        if (StringUtil.isEmpty(userid)) return;
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).build();
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("appSteps")
+                .add("userid",userid)
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+               LogUtil.prinlnLongMsg("appSteps", JSON.toJSONString(o)+"");
+                Toast.makeText(MyApplication.getInstance(),JSON.toJSONString(o)+"",Toast.LENGTH_LONG).show();
+            }
+        }));
+    }
+}

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

@@ -1,20 +1,27 @@
 package com.uas.appme.pedometer.view;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.common.LogUtil;
 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.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.adapter.UURankingAdapter;
 import com.uas.appme.pedometer.bean.StepEntity;
+import com.uas.appme.pedometer.constant.Constant;
 import com.uas.appme.pedometer.db.StepDataDao;
 import com.uas.appme.pedometer.utils.TimeUtil;
 
@@ -28,7 +35,7 @@ import de.hdodenhof.circleimageview.CircleImageView;
  * function:
  */
 
-public class UURanking extends BaseActivity {
+public class UURanking extends BaseActivity implements View.OnClickListener {
     private CircleImageView mPhotoImg;
     private TextView mNameTv;
     private TextView mRankingTv;
@@ -74,6 +81,7 @@ public class UURanking extends BaseActivity {
         stepEntityList = new ArrayList<>();
         mRankAdapter = new UURankingAdapter(this);
         mAllPtlv.setAdapter(mRankAdapter);
+        findViewById(R.id.my_info_rl).setOnClickListener(this);
 
         mHeaderImg.requestFocus();
         mAttentionLl.setVisibility(View.GONE);
@@ -100,7 +108,32 @@ public class UURanking extends BaseActivity {
 
     private void initData() {
 
+        //获取所有人的当天步数数据
+        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).build();
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("appStepsrank")
+                .add("userid",MyApplication.getInstance().mLoginUser.getUserId())
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.prinlnLongMsg("appStepsrank", o.toString()+"");
+            }
+        }));
+
     }
 
 
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.my_info_rl){
+            Intent intent = new Intent(this,PersonalPageActivity.class);
+            intent.putExtra("type",1);
+            intent.putExtra("title","我的主页");
+            intent.putExtra("userid",MyApplication.getInstance().mLoginUser.getUserId());
+            intent.putExtra("em_name",CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname"));
+            startActivity(intent);
+        }
+    }
 }

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

@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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"
@@ -19,10 +17,12 @@
         />
 
     <RelativeLayout
+        android:layout_toRightOf="@+id/ranking_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="5dp"
         android:layout_marginRight="10dp"
+        android:layout_marginLeft="10dp"
         >
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/photo_img"
@@ -79,4 +79,4 @@
             android:layout_below="@+id/prise_tv"
             android:layout_marginTop="5dp"/>
     </RelativeLayout>
-</LinearLayout>
+</RelativeLayout>

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

@@ -0,0 +1,7 @@
+<?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">
+
+
+</LinearLayout>

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

@@ -24,6 +24,7 @@
 
 
           <RelativeLayout
+              android:id="@+id/my_info_rl"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:padding="5dp"
@@ -38,7 +39,7 @@
                   android:layout_marginTop="5dp"
                   android:layout_marginBottom="5dp"
                   android:src="@drawable/common_header_boy"
-                  android:layout_marginLeft="20dp"
+                  android:layout_marginLeft="25dp"
                   />
 
               <TextView
@@ -143,7 +144,7 @@
               android:textColor="@color/green"
               android:layout_width="match_parent"
               android:layout_height="60dp"
-              android:text="邀请好友参加UU运行"
+              android:text="邀请好友开启UU运动"
               android:gravity="center"
               />
       </LinearLayout>

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

@@ -49,6 +49,7 @@ import com.common.ui.ImageUtil;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
@@ -65,7 +66,6 @@ import com.core.widget.view.Activity.ImgFileListActivity;
 import com.core.widget.view.Activity.MultiImagePreviewActivity;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.MyGridView;
-import com.core.app.AppConstant;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.exception.HttpException;
@@ -73,7 +73,6 @@ import com.lidroid.xutils.http.RequestParams;
 import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
-import com.uas.appworks.R;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appworks.OA.erp.activity.form.FormListSelectActivity;
 import com.uas.appworks.OA.erp.model.AddCostBean;
@@ -85,8 +84,10 @@ import com.uas.appworks.OA.erp.model.CostTypeSingleBean;
 import com.uas.appworks.OA.erp.model.CostUpdatePModel;
 import com.uas.appworks.OA.erp.model.SaveCostDetailsGridStoreBean;
 import com.uas.appworks.OA.erp.model.UpdateCostDetailsGridStoreBean;
+import com.uas.appworks.R;
 
 import java.io.File;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -1049,7 +1050,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         activity.getWindow().setAttributes(lp);
     }
     private void c_onclick(String s) {
-        if (c_edit.getText().length() > 7) return;
+        if (c_edit.getText().length() > 7 || CommonUtil.getNumByString(c_edit.getText().toString()) > 1000000) return;
         if(isClickEqu)
         {
             c_edit.setText(null);
@@ -1376,7 +1377,13 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
             if (costFormModel_list.get(i).getCost_money() > 0){
                 sum_money = sum_money + Double.valueOf(costFormModel_list.get(i).getCost_money());
                 if (i == (costFormModel_list.size() - 1)){
-                    sum_money_tv.setText(CommonUtil.getTwoPointDouble(sum_money)+"");
+                    DecimalFormat df = new DecimalFormat("0.##");
+                    Double d = new Double(CommonUtil.getTwoPointDouble(sum_money));
+                    if (!df.format(d).contains("."))
+                        sum_money_tv.setText(df.format(d)+".0");
+                    else
+                        sum_money_tv.setText(df.format(d)+"");
+
                 }
             }else {
 //                ToastMessage("请输入消费金额");