给测试合并

WeiChat/src/main/java/basepedo/service/StepDcretor.java

@@ -174,7 +174,7 @@ public class StepDcretor implements SensorEventListener {
 
         Log.v(TAG, "oldValue:" + oldValue);
         if (!isDirectionUp && lastStatus
-                && (continueUpFormerCount >= 1 && (oldValue >= minValue && oldValue < maxValue))) {
+                && (continueUpFormerCount >= 2 && (oldValue >= minValue && oldValue < maxValue))) {
             peakOfWave = oldValue;
             return true;
         } else if (!lastStatus && isDirectionUp) {

WeiChat/src/main/java/basepedo/service/StepService.java

@@ -270,7 +270,7 @@ public class StepService extends Service implements SensorEventListener {
     @Override
     public void onSensorChanged(SensorEvent event) {
         i++;
-        StepDcretor.CURRENT_SETP++;
+        StepDcretor.CURRENT_SETP++; //TODO 这里取消屏蔽功能，动一次计步叠加一次
 //        updateNotification("今日步数：" + StepDcretor.CURRENT_SETP + "," + i + " 步");
         updateNotification("今日步数：" + StepDcretor.CURRENT_SETP + " 步");
     }

WeiChat/src/main/java/basepedo/ui/MyPedometerActivity.java

@@ -17,6 +17,7 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.me.SettingActivity;
 
 import basepedo.config.Constant;
 import basepedo.service.StepService;
@@ -120,15 +121,18 @@ public class MyPedometerActivity extends BaseActivity implements Handler.Callbac
             if (isServiceRunning(uustep_service_name)){
                 unbindService(conn);
             }
+            startActivity(new Intent(mContext, SettingActivity.class));
         }
         return super.onOptionsItemSelected(item);
     }
 
     @Override
     public void onBackPressed() {
+
         if (isServiceRunning(uustep_service_name)){
             unbindService(conn);
         }
+        startActivity(new Intent(mContext, SettingActivity.class));
         super.onBackPressed();
     }
     private boolean isServiceRunning(String servicename) { //判断UU运动服务是否已经运行

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

@@ -100,6 +100,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private String type_emcode;
     private String real_status;
     private String emCode;
+    private View hide_above_af;
 
 
     @Override
@@ -133,6 +134,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         agree_ll = (LinearLayout) findViewById(R.id.common_docui_agree_ll);
         disagree_ll = (LinearLayout) findViewById(R.id.common_docui_disagree_ll);
         change_deal_man_ll = (LinearLayout) findViewById(R.id.common_docui_change_dealman_ll);
+        hide_above_af = findViewById(R.id.hide_above_af);
 
         mEmptyLayput_applymsg = new EmptyLayout(this, main_msg_lv);
         mEmptyLayput_applymsg.setShowEmptyButton(false);
@@ -207,6 +209,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
 
         } else {
             mEmptyLayput_approvalflow.showEmpty();
+            hide_above_af.setVisibility(View.GONE);
         }
     }
 
@@ -458,6 +461,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
             //JSONArray dailynodeArray = resultJsonObject.getJSONArray("nodes");
             if(resultJsonObject == null){
                 mEmptyLayput_approvalflow.showEmpty();
+
             }else{
                 mCommonApprovalFlowBean = JSON.parseObject(resultJsonObject.toString(), CommonApprovalFlowBean.class);
                 LogUtil.prinlnLongMsg("mCommonApprovalFlowBean", mCommonApprovalFlowBean.toString());
@@ -630,6 +634,10 @@ public class CommonDocDetailsActivity extends BaseActivity {
                 // 设置数据之前先通过数据库获取到所有的imid保存到内存中
                 mCommonDocApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
                 appflow_lv.setAdapter(mCommonDocApprovalFlowAdapter);
+
+                if(ListUtils.isEmpty(mCommonApprovalFlowBean.getData()) && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())){
+                    hide_above_af.setVisibility(View.GONE);
+                }
             }
         }catch (JSONException e){
             e.printStackTrace();

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

@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v7.app.AlertDialog;
-import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -22,14 +21,11 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.DailyDetailsApprovalFlowAdapter;
-import com.xzjmyk.pm.activity.adapter.DailyDetailsWorkTaskAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
-import com.xzjmyk.pm.activity.bean.oa.WorkTaskBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ArrayUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
@@ -185,6 +181,7 @@ public class DailydetailsActivity extends BaseActivity {
     private WebView undotask_wv;
     private String undotask;
     private WebSettings undo_settings;
+    private View hide_above_af;
 
 
     /**
@@ -197,12 +194,13 @@ public class DailydetailsActivity extends BaseActivity {
             //JSONArray dailynodeArray = resultJsonObject.getJSONArray("nodes");
             if(resultJsonObject == null){
                 mEmptyLayput_approvalflow.showEmpty();
+                hide_above_af.setVisibility(View.GONE);
             }else{
                 mCommonApprovalFlowBean = JSON.parseObject(resultJsonObject.toString(), CommonApprovalFlowBean.class);
                 LogUtil.prinlnLongMsg("mCommonApprovalFlowBean", mCommonApprovalFlowBean.toString());
                 em_code = new String();
                 if (manager == null) manager = new DBManager(mContext);
-                if("已审核".equals(wd_status)){  // TODO 已审核直接从node里面取数据
+                if("已审核".equals(wd_status) && mCommonApprovalFlowBean.getData().size() == mCommonApprovalFlowBean.getNodes().size()){  // TODO 已审核直接从node里面取数据
                     for (int i = 0; i <mCommonApprovalFlowBean.getNodes().size(); i++) {
                         //取名字
                         if (!TextUtils.isEmpty(mCommonApprovalFlowBean.getNodes().get(i).getJn_dealManName())){
@@ -369,6 +367,10 @@ public class DailydetailsActivity extends BaseActivity {
                 // 设置数据之前先通过数据库获取到所有的imid保存到内存中
                 mDailyDetailsApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
                 approval_flowlv.setAdapter(mDailyDetailsApprovalFlowAdapter);
+
+                if(ListUtils.isEmpty(mCommonApprovalFlowBean.getData()) && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())){
+                    hide_above_af.setVisibility(View.GONE);
+                }
             }
         }catch (JSONException e){
             e.printStackTrace();
@@ -403,6 +405,7 @@ public class DailydetailsActivity extends BaseActivity {
         donetask_wv = (WebView) findViewById(R.id.donetask_wv);
         undo_task_ll = (LinearLayout) findViewById(R.id.work_daily_detail_undotask_ll);
         undotask_wv = (WebView) findViewById(R.id.undotask_wv);
+        hide_above_af = findViewById(R.id.hide_above_af);
 
         done_settings = donetask_wv.getSettings();
         done_settings.setSupportZoom(true);
@@ -594,6 +597,7 @@ public class DailydetailsActivity extends BaseActivity {
             ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, APPROVAL_FLOW_NODE, null, null, "post");
         }else{
             mEmptyLayput_approvalflow.showEmpty();
+            hide_above_af.setVisibility(View.GONE);
         }
 
     }

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

@@ -12,6 +12,8 @@ import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -182,6 +184,25 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         }
         return false;
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            startActivity(new Intent(mContext,MainActivity.class));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        startActivity(new Intent(mContext,MainActivity.class));
+        super.onBackPressed();
+    }
     private void showExitDialog() {
         new AlertDialog.Builder(mContext).setTitle(R.string.app_name).setMessage(R.string.exit_tips).setNegativeButton(R.string.cancel, null)
                 .setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {

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

@@ -104,6 +104,7 @@
 
             </LinearLayout>
             <View
+                android:id="@+id/hide_above_af"
                 android:layout_width="match_parent"
                 android:layout_height="10dp"
                 android:background="@color/item_line"

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

@@ -31,7 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:text="屏蔽功能：屏蔽细微移动或者驾车时震动所带来的干扰，停止运动超过5秒，便重新开启屏蔽功能"
+            android:text="屏蔽功能：屏蔽细微移动或者驾车时震动所带来的干扰，停止运动超过3秒，便重新开启屏蔽功能(目前版本又去掉了，具体要否再协商)"
             />
         <TextView
             android:layout_width="wrap_content"

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

@@ -213,6 +213,7 @@
                         />
                 </LinearLayout>
                     <View
+                        android:id="@+id/hide_above_af"
                         android:layout_width="match_parent"
                         android:layout_height="10dp"
                         android:background="@color/black_gray"

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

@@ -71,7 +71,7 @@
         android:id="@+id/item_activity_workdaily_summary_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="0dp"
+        android:paddingTop="5dp"
         android:layout_toRightOf="@id/avatar_img"
         android:maxLines="3"
         android:ellipsize="end"