合并冲突

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PlatDailyAdapter.java

@@ -104,7 +104,7 @@ public class PlatDailyAdapter extends BaseAdapter {
         }else if(!TextUtils.isEmpty(pdata.get(position).getWd_status()) &&
                 pdata.get(position).getWd_status().equals("在录入")){
             viewHolder.WorkDailyStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-            viewHolder.WorkDailyStatus.setText("未提交");
+            viewHolder.WorkDailyStatus.setText("在录入");
             viewHolder.WorkDailyDelete.setVisibility(View.VISIBLE);
         }
         int VERSION_CODES = android.os.Build.VERSION.SDK_INT;

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkDailyAdapter.java

@@ -109,7 +109,7 @@ public class WorkDailyAdapter extends BaseAdapter {
         }else if(!TextUtils.isEmpty(mWorkDailyBeanList.get(position).getWD_STATUS()) &&
                 mWorkDailyBeanList.get(position).getWD_STATUS().equals("在录入")){
             viewHolder.WorkDailyStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-            viewHolder.WorkDailyStatus.setText("未提交");
+            viewHolder.WorkDailyStatus.setText("在录入");
             viewHolder.WorkDailyDelete.setVisibility(View.VISIBLE);
         }
         int VERSION_CODES = android.os.Build.VERSION.SDK_INT;

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

@@ -159,6 +159,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                     }
                     ToastMessage("数据刷新完毕");
                     progressDialog.dismiss();
+                    tv_process_already.setEnabled(true);
                     break;
                 case SUSSCESS_already:
                     itemArray = JSON.parseObject(result).getJSONArray("data");
@@ -214,6 +215,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
+                    tv_process_already.setEnabled(true);
                     break;
                 case 0x16:
                     try {
@@ -245,6 +247,8 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
 
     private void initData() {
         if (CommonUtil.isNetWorkConnected(mContext)) {
+            progressDialog.show();
+            tv_process_already.setEnabled(false);
             loadProcessToDo(page);
         } else {
             mEmptyLayout.setErrorMessage("网络未连接!");
@@ -254,6 +258,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
     }
 
     private void initView() {
+
         mEmptyLayout = new EmptyLayout(this, mList.getRefreshableView());
         mEmptyLayout.setShowEmptyButton(false);
         mEmptyLayout.setShowErrorButton(false);

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

@@ -525,16 +525,22 @@ public class PlatWDdetailyActivity extends BaseActivity {
                     if (msg.getData() != null) {
                         String r_for_s_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("r_for_s_result", r_for_s_result);
-                        ToastMessage("反提交成功");
-                        startActivity(new Intent(activity, WorkDailyAddActivity.class)
-                                .putExtra("caller", mCaller)
-                                .putExtra("id", mkeyValue)
-                                .putExtra("rs_summary", summary)
-                                .putExtra("rs_plan", plan)
-                                .putExtra("rs_experience", experience)
-                                .putExtra("resubmit", "resubmit"));
-                        Log.i("doresubmit_id", mkeyValue + "");
-                        finish();
+                        if (JSON.parseObject(r_for_s_result).containsKey("success") && JSON.parseObject(r_for_s_result).getBoolean("success")){
+                            ToastMessage("反提交成功");
+                            startActivity(new Intent(activity, WorkDailyAddActivity.class)
+                                    .putExtra("caller", mCaller)
+                                    .putExtra("id", mkeyValue)
+                                    .putExtra("rs_summary", summary)
+                                    .putExtra("rs_plan", plan)
+                                    .putExtra("rs_experience", experience)
+                                    .putExtra("resubmit", "resubmit"));
+                            Log.i("doresubmit_id", mkeyValue + "");
+                            finish();
+                        }else {
+                            String error = JSON.parseObject(r_for_s_result).getString("error");
+                            ToastMessage(error == null ? "反提交失败" : error);
+                        }
+
                     }
                     break;
                 case DELETE_OF_DELETEAPPFL:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -587,10 +587,10 @@ public class FormDetailActivity extends BaseActivity {
                         doc_detail_value.add("");
                         doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[0].toString());
                         doc_detail_value.add(array.getJSONObject(i).values().toArray()[0].toString());
-                        doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[2].toString());
-                        doc_detail_value.add(array.getJSONObject(i).values().toArray()[2].toString());
                         doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[1].toString());
                         doc_detail_value.add(array.getJSONObject(i).values().toArray()[1].toString());
+                        doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[2].toString());
+                        doc_detail_value.add(array.getJSONObject(i).values().toArray()[2].toString());
                     }
                 }
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -144,7 +144,10 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
     @ViewInject(R.id.chaosonren_rl)
     private RelativeLayout chaosonren_rl;
     private Context ct;
-
+    private int year;
+    private int month;
+    private String[] tagValues;
+    private int save = 0;
     private Handler mhandler = new Handler() {
         public void handleMessage(Message msg) {
             switch (msg.what) {
@@ -165,6 +168,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                     } else {
                         ViewUtil.ShowMessageTitle(ct, "保存失败！");
                     }
+                    progressDialog.dismiss();
                     break;
                 case RECORD_NO://停止录音
 
@@ -225,9 +229,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
             }
         }
     };
-    private int year;
-    private int month;
-    private String[] tagValues;
+
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -242,7 +244,9 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 onBackPressed();
                 break;
             case R.id.save:
-                saveTask("");
+                if (save == 0 && MyApplication.getInstance().isNetworkActive()){
+                    saveTask("");
+                }
                 break;
         }
         return true;
@@ -544,6 +548,8 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
      * @功能:添加任务
      */
     public void sendDataToServer(String formStore) {
+        save = 1;
+        progressDialog.show();
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().task_save;
         Log.i(TAG, url);
         Log.i(TAG, formStore);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -21,7 +21,6 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
-import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
@@ -57,6 +56,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
     private TextView et_endtime;
 
     private String[] tagValues;
+    private  int save = 0;
     private String selectCode = null;
 
     @Override
@@ -170,12 +170,13 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
                 onBackPressed();
                 break;
             case R.id.save:
-                dosaveJudge();
+                if (save == 0 && MyApplication.getInstance().isNetworkActive()){
+                    dosaveJudge();
+                }
                 break;
         }
         return true;
     }
-
     private void dosaveJudge() {
         if (StringUtils.isEmpty(et_title.getText().toString())) {
             ToastMessage("任务标题为必填项");
@@ -225,6 +226,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
     }
 
     private void doHttpSave(String resourcename) {
+        save = 1;
         progressDialog.show();
         Map<String, Object> formStoreMap = new HashMap<>();
         formStoreMap.put("taskorschedule", "Task");
@@ -232,7 +234,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         formStoreMap.put("enddate", et_endtime.getText().toString());
         formStoreMap.put("name", et_title.getText().toString());
         formStoreMap.put("description", et_task_detail.getText().toString());
-        formStoreMap.put("resourcename", selectNames);
+        formStoreMap.put("resourcename", resourcename);
 
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "/plm/task/addbilltask.action";
         HashMap<String, Object> params = new HashMap<>();

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepActivity.java

@@ -13,6 +13,8 @@ import android.os.Messenger;
 import android.os.RemoteException;
 import android.util.Log;
 import android.view.Display;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
@@ -22,6 +24,7 @@ import com.baidu.android.pushservice.PushManager;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.me.SettingActivity;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.newpedo.bean.StepEntity;
 import com.xzjmyk.pm.newpedo.calendar.BeforeOrAfterCalendarView;
@@ -282,4 +285,23 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         //记得解绑Service，不然多次绑定Service会异常
         if (isBind) this.unbindService(conn);
     }
+
+    @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(getApplicationContext(), SettingActivity.class));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        startActivity(new Intent(getApplicationContext(), SettingActivity.class));
+        super.onBackPressed();
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/view/NewStepListActivity.java

@@ -1,11 +1,13 @@
 package com.xzjmyk.pm.newpedo.view;
 
+import android.support.v7.app.AlertDialog;
 import android.graphics.Paint;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
@@ -28,6 +30,7 @@ public class NewStepListActivity extends BaseActivity {
     private List<StepEntity> stepEntityList;
     private MyListView step_num_lv;
     private TextView steps_history_tv;
+    private LinearLayout step_ll;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -35,13 +38,32 @@ public class NewStepListActivity extends BaseActivity {
         setContentView(R.layout.newstep_data);
         initView();
         initData();
+        showNotice();
     }
+
+    private void showNotice() {
+        new AlertDialog.Builder(mContext)
+                .setTitle("小UU友情提示")
+                .setMessage("\t\t\t如果想要我和微信一样准确的记录您的运动步数,请保持我和微信一样一直在后台运行哦,主人,>O_O< !")
+                .setPositiveButton("我知道了",null)
+                .show();
+    }
+
     private void initView() {
         muuStepNumAdapter = new UuStepNumAdapter();
         stepEntityList = new ArrayList<>();
         step_num_lv = (MyListView) findViewById(R.id.step_num_lv);
         steps_history_tv = (TextView) findViewById(R.id.steps_history_tv);
         steps_history_tv.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
+        step_ll = (LinearLayout) findViewById(R.id.steps_history_ll);
+
+        step_ll.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showNotice();
+            }
+        });
+
     }
     private void initData() {
         //获取数据库