数据库修改备份

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkActivity.java

@@ -9,7 +9,6 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -150,7 +149,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
         listview.setLayoutManager(new LinearLayoutManager(ct));
         listview.setAdapter(adapter);
         presenter.start(true);
-        date_tv.setText(TimeUtils.long2str(System.currentTimeMillis(), "yyyy年MM月dd日") +
+        date_tv.setText(TimeUtils.long2str(System.currentTimeMillis(), "yyyy年MM月dd日") +" "+
                 TimeUtils.getWeek(System.currentTimeMillis()));
         findViewById(R.id.signin_btn).setOnClickListener(this);
         findViewById(R.id.unoffice_).setOnClickListener(this);
@@ -158,10 +157,10 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
     }
 
     @Override
-    public void showDistance(String distance) {
-        if (!StringUtils.isEmpty(distance))
-            unoffice_mm.setText(distance);
-        else unoffice_mm.setText("");
+    public void showDistance(double distance) {
+        if (distance != 0)
+            unoffice_mm.setText("约" + distance + "米");
+        else unoffice_mm.setText("约0米");
     }
 
     @Override
@@ -191,16 +190,6 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
                 showEmptyView(false, false);
                 line.setVisibility(View.VISIBLE);
                 adapter.setModels(isToday, false, selectTime, models);
-                for (WorkModel e : models) {
-                    Log.i("gongpengming", "getWorkStart =" + e.getWorkStart());
-                    Log.i("gongpengming", "getWorkTime =" + e.getWorkTime());
-                    Log.i("gongpengming", "getWorkend =" + e.getWorkend());
-                    Log.i("gongpengming", "getWorkSignin =" + e.getWorkSignin());
-                    Log.i("gongpengming", "getOffStart =" + e.getOffStart());
-                    Log.i("gongpengming", "getOffTime =" + e.getOffTime());
-                    Log.i("gongpengming", "getOffend =" + e.getOffend());
-                    Log.i("gongpengming", "getOffSignin =" + e.getOffSignin());
-                }
             }
         }
 
@@ -367,7 +356,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
                 String time = year + "-" + month + "-" + day;
                 selectTime = TimeUtils.s_str_2_long(time);
                 isToday = time.equals(TimeUtils.s_long_2_str(System.currentTimeMillis())) ? true : false;
-                date_tv.setText(year + "年" + month + "月" + day + "日  " + TimeUtils.getWeek(selectTime));
+                date_tv.setText(year + "年" + month + "月" + day + "日 " + TimeUtils.getWeek(selectTime));
                 presenter.loadWorkData(selectTime, true);
             }
         });

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -216,9 +216,9 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
     }
 
     //获取与公司距离
-    private String getDistance() {
+    private double getDistance() {
         try {
-            if (ListUtils.isEmpty(locationList)) return "";
+            if (ListUtils.isEmpty(locationList)) return 0;
             for (WorkLocationModel b : locationList) {
                 String dis = getInstence().getDistance(
                         new LatLng(b.getLocation().longitude, b.getLocation().latitude)
@@ -229,9 +229,9 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
                     companyLocation = b;
                 }
             }
-            return "约" + distance + "米";
+            return distance;
         } catch (Exception e) {
-            return "";
+            return 0;
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/IWorkView.java

@@ -11,7 +11,7 @@ import java.util.List;
  */
 public interface IWorkView extends HttpImp {
 
-    void showDistance(String distance);//显示距离
+    void showDistance(double distance);//显示距离
 
     void showLocation(String location);//显示当前位置