日报换行bug解决

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -9,12 +9,12 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.StrictMode;
 import android.support.multidex.MultiDex;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.Volley;
 import com.baidu.mapapi.SDKInitializer;
-import com.baidu.mapapi.model.LatLng;
 import com.facebook.stetho.Stetho;
 import com.lidroid.xutils.DbUtils;
 import com.lidroid.xutils.HttpUtils;
@@ -35,9 +35,11 @@ import com.xzjmyk.pm.activity.bean.ConfigBean;
 import com.xzjmyk.pm.activity.bean.User;
 import com.xzjmyk.pm.activity.db.SQLiteHelper;
 import com.xzjmyk.pm.activity.ui.SplashActivity;
+import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.SharedUtil;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 
 import org.apache.http.cookie.Cookie;
@@ -179,6 +181,17 @@ public class MyApplication extends Application {
         // 释放数据库
         // SQLiteHelper.release();
         android.os.Process.killProcess(android.os.Process.myPid());
+
+        //TODO 获取此刻精确时间并转换为yyyy-MM-dd HH:mm:ss
+        String nowtime = TimeUtils.f_long_2_str(System.currentTimeMillis());
+        String saved_time = PreferenceUtils.getString(MyApplication.getInstance(), TimeStatisticsActivity.Killed);
+
+        if (!TextUtils.isEmpty(saved_time)){
+            PreferenceUtils.putString(TimeStatisticsActivity.Killed,saved_time + "," + nowtime);
+        }else {
+            PreferenceUtils.putString(TimeStatisticsActivity.Killed,nowtime);
+
+        }
     }
 
     /*********************

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

@@ -547,10 +547,13 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         //执行重新提交之更改单据状态操作
         if ((!TextUtils.isEmpty(resubmit) && resubmit.equals("resubmit") && mkeyValue != 0) ||
                 (!TextUtils.isEmpty(resubmit) && resubmit.equals("unsub_tosub")&& mkeyValue != 0)) {
-            String sb_summary = string2Json(last_change_summary);
-            String sb_plan = string2Json(last_change_plan);
-            String sb_experience = string2Json(last_change_experience);
+//            String sb_summary = string2Json(last_change_summary);
+//            String sb_plan = string2Json(last_change_plan);
+//            String sb_experience = string2Json(last_change_experience);
 
+            String sb_summary = last_change_summary;
+            String sb_plan = last_change_plan;
+            String sb_experience = last_change_experience;
             Map<String, Object> formStoreMap2 = new HashMap<>();
             formStoreMap2.put("wd_empcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
             formStoreMap2.put("wd_comment", sb_summary);
@@ -571,9 +574,9 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
 
         } else {
             // 执行第一次直接提交
-            s1 = string2Json(s1);
-            s2 = string2Json(s2);
-            s3 = string2Json(s3);
+//            s1 = string2Json(s1);
+//            s2 = string2Json(s2);
+//            s3 = string2Json(s3);
             Map<String, Object> formStoreMap = new HashMap<>();
             formStoreMap.put("wd_empcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
             formStoreMap.put("wd_comment", s1);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/TimeStatisticsActivity.java

@@ -31,6 +31,10 @@ public class TimeStatisticsActivity extends BaseActivity {
     private MyListView login_exit_lv;
     @ViewInject(R.id.killed_lv)
     private MyListView killed_lv;
+    @ViewInject(R.id.delete_loogin_in_time)
+    private TextView delete_loogin_in_time;
+    @ViewInject(R.id.delete_loogin_exit_time)
+    private TextView delete_loogin_exit_time;
 
     public static List<String> login_in_times = new ArrayList<>();
     public static List<String> login_exit_times = new ArrayList<>();
@@ -49,6 +53,29 @@ public class TimeStatisticsActivity extends BaseActivity {
         ViewUtils.inject(this);
         initView();
         initData();
+        clickEvent();
+    }
+
+    private void clickEvent() {
+        delete_loogin_in_time.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                PreferenceUtils.putString(TimeStatisticsActivity.Login_In,"");
+                login_in_times.remove(login_in_times);
+                mloginInTimeAdapter.setLogin_in_times(login_in_times);
+                mloginInTimeAdapter.notifyDataSetChanged();
+            }
+        });
+        delete_loogin_exit_time.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                PreferenceUtils.putString(TimeStatisticsActivity.Login_Exit,"");
+                login_exit_times.remove(login_exit_times);
+                mloginExitAdapter.setLogin_exit_times(login_exit_times);
+                mloginExitAdapter.notifyDataSetChanged();
+            }
+        });
+
     }
 
     private void initView() {
@@ -110,6 +137,7 @@ public class TimeStatisticsActivity extends BaseActivity {
 
     }
 
+
     public class LoginInTimeAdapter extends BaseAdapter{
         private List<String> login_in_times;
 

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

@@ -518,7 +518,7 @@
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="7dp"
             android:background="@drawable/selector_me_menu_item_bg"
-            android:visibility="visible">
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="wrap_content"

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

@@ -17,6 +17,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
             <TextView
+                android:id="@+id/delete_loogin_in_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="18sp"
@@ -32,6 +33,7 @@
             </com.xzjmyk.pm.activity.view.MyListView>
 
             <TextView
+                android:id="@+id/delete_loogin_exit_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="18sp"