Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/build.gradle

@@ -23,7 +23,7 @@ android {
     buildToolsVersion "22.0.1"
     defaultConfig {
         applicationId "com.xzjmyk.pm.activity"
-        minSdkVersion 9
+        minSdkVersion 11
         targetSdkVersion 22
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7

WeiChat/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="83"
+    android:versionCode="84"
     android:versionName="5.7.0">
 
     <uses-sdk
@@ -874,7 +874,7 @@
             android:name=".ui.erp.activity.PlatLeaveAddActivity"
             android:label="请假单"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name=".ui.platform.activity.ChangeDealManActivity" />
+        <activity android:name=".ui.platform.activity.ChangeDealManActivity"
             android:label="导航"/>
         <activity android:name=".ui.platform.task.TaskAddErpActivity"/>
         <activity android:name=".ui.erp.activity.oa.PlatContactAddPeopleActivity"
@@ -888,7 +888,7 @@
             android:label="UU运动"/>
         <activity android:name="com.xzjmyk.pm.newpedo.view.NewStepListActivity"
             android:label="更多历史记录"/>
-        <!-- 计步功能 -->
+        <!-- 计步功能 服务-->
         <service
             android:name="com.xzjmyk.pm.newpedo.service.StepService"
             android:priority="1000"

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

@@ -20,6 +20,7 @@ public class AppConstant {
     public static final String EXTRA_USER_ID = "userId";// userId
     public static final String EXTRA_NICK_NAME = "nickName";// nickName
     public static final String EXTRA_NICK_CODE = "usercode";// nickName
+    public static final String EXTRA_EM_CODE = "usercode";// nickName
     public static final String EXTRA_IS_GROUP_CHAT = "isGroupChat";// 是否是群聊
 
     // BusinessCircleActivity需要的

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SelectBean.java

@@ -11,28 +11,35 @@ public class SelectBean implements Parcelable {
     
     private int id;//数字索引
     private String name;//选项索引
+    private String fields;//联动字段
     private boolean isClick = false;//是否已被选择（默认非选择）
     private String object;//选择的内容详细信息 T
     private String json;//方式时候返回选择的jsonObject
 
-    public String getObject() {
-        return object;
+    public int getId() {
+        return id;
     }
 
-    public void setObject(String object) {
-        this.object = object;
+    public void setId(int id) {
+        this.id = id;
     }
 
-    public String getJson() {
-        return json;
+    public String getName() {
+        return name;
     }
 
-    public void setJson(String json) {
-        this.json = json;
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getFields() {
+        return fields;
+    }
+
+    public void setFields(String fields) {
+        this.fields = fields;
     }
 
-  
-   
     public boolean isClick() {
         return isClick;
     }
@@ -41,20 +48,20 @@ public class SelectBean implements Parcelable {
         this.isClick = isClick;
     }
 
-    public String getName() {
-        return name;
+    public String getObject() {
+        return object;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setObject(String object) {
+        this.object = object;
     }
 
-    public int getId() {
-        return id;
+    public String getJson() {
+        return json;
     }
 
-    public void setId(int id) {
-        this.id = id;
+    public void setJson(String json) {
+        this.json = json;
     }
 
     @Override
@@ -66,6 +73,7 @@ public class SelectBean implements Parcelable {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(this.id);
         dest.writeString(this.name);
+        dest.writeString(this.fields);
         dest.writeByte(this.isClick ? (byte) 1 : (byte) 0);
         dest.writeString(this.object);
         dest.writeString(this.json);
@@ -77,6 +85,7 @@ public class SelectBean implements Parcelable {
     protected SelectBean(Parcel in) {
         this.id = in.readInt();
         this.name = in.readString();
+        this.fields = in.readString();
         this.isClick = in.readByte() != 0;
         this.object = in.readString();
         this.json = in.readString();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java

@@ -221,7 +221,7 @@ public class DataDownloadActivity extends BaseActivity {
         if (circle_msg_download_status == STATUS_FAILED || address_user_download_status == STATUS_FAILED
                 || user_info_download_status == STATUS_FAILED || user_photo_download_status == STATUS_FAILED
                 || room_download_status == STATUS_FAILED || company_download_status == STATUS_FAILED) {
-            mDataLoadView.showFailed();
+            //mDataLoadView.showFailed();
             EnterHome();
         } else {// 所有数据加载完毕,跳转回用户操作界面
             EnterHome();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
@@ -49,6 +50,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     private EditText mPhoneNumberEdit;
     private EditText mPasswordEdit;
 
+    private TextView tv_register;
+
+    private TextView tv_findPwd;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -76,6 +81,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         mPhoneNumberEdit = (EditText) findViewById(R.id.phone_numer_edit);
         mPasswordEdit = (EditText) findViewById(R.id.password_edit);
         mHeader = (CircleImageView) findViewById(R.id.iv_head);
+        tv_findPwd= (TextView) findViewById(R.id.tv_findPwd);
+        tv_register= (TextView) findViewById(R.id.tv_register);
         if (MyApplication.getInstance().mLoginUser.getTelephone() != null && MyApplication.getInstance().mLoginUser.getTelephone().length() > 0) {
             mPhoneNumberEdit.setText(MyApplication.getInstance().mLoginUser.getTelephone());
         }
@@ -84,6 +91,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         }
         //登陆账号
         findViewById(R.id.login_btn).setOnClickListener(this);
+        tv_findPwd.setOnClickListener(this);
+        tv_register.setOnClickListener(this);
         if (!StringUtils.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
             AvatarHelper.getInstance().display(MyApplication.getInstance().mLoginUser.getUserId(), mHeader, true, true);
         }
@@ -95,6 +104,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             case R.id.login_btn:// 登陆
                 login();
                 break;
+            case R.id.tv_register:
+                ViewUtil.webLinks(mContext, "https://account.ubtob.com/sso/register", "新用户注册");
+                break;
+            case R.id.tv_findPwd:
+                ViewUtil.webLinks(mContext, "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F", "密码找回");
+                break;
         }
     }
 
@@ -207,6 +222,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     }
 
    public void onRegister(View view){
-        ViewUtil.webLinks(mContext,"https://account.ubtob.com/sso/register","新用户注册");
+        ViewUtil.webLinks(mContext, "https://account.ubtob.com/sso/register", "新用户注册");
+    }
+    
+    public void onFindPWD(View view){
+        ViewUtil.webLinks(mContext, "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F", "密码找回");
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -128,6 +128,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
     private String userId;
     private String userName;
     private String phone;
+    private String emcode;
     private PopupWindow mMoreWindow;
     private View mMoreMenuView;
     private TextView mRemarkNameTv;
@@ -147,6 +148,8 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
             userId = getIntent().getStringExtra(AppConstant.EXTRA_USER_ID);
             userName = getIntent().getStringExtra(AppConstant.EXTRA_NICK_NAME);
             phone = getIntent().getStringExtra("phone");
+            emcode = getIntent().getStringExtra(AppConstant.EXTRA_EM_CODE);
+            
         }
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         setContentView(R.layout.activity_basic_info);
@@ -453,6 +456,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                     else
                         mIntent = new Intent(BasicInfoActivity.this, TaskAddErpActivity.class);
                     mIntent.putExtra("people", name_tv.getText().toString());
+                    mIntent.putExtra(AppConstant.EXTRA_EM_CODE, emcode);
                     startActivity(mIntent);
                 }
             });

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -40,6 +40,7 @@ import com.xzjmyk.pm.activity.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.CameraUtil;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
@@ -64,7 +65,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
     private static final int REQUEST_CODE_PICK_PHOTO = 2;// 图库
     private static final int SENFSUCCESS = 1228;
-    private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
+    private static  Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
 
     private EditText mTextEdit;
     private View mSelectImgLayout;
@@ -223,9 +224,28 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         builder.show();
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putParcelable("takePhotoUri", mNewPhotoUri);
+  
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        mNewPhotoUri= savedInstanceState.getParcelable("takePhotoUri");
+
+    }
+    
     private void takePhoto() {
-        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, CameraUtil.MEDIA_TYPE_IMAGE);
-        CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(mContext, CameraUtil.MEDIA_TYPE_IMAGE);
+        LogUtil.d("uri:"+mNewPhotoUri);
+        if (mNewPhotoUri!=null) {
+            CameraUtil.captureImage(SendShuoshuoActivity.this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+        }else{
+            ToastUtil.showToast(this,  "uri is null" );
+        }  
     }
 
     private void selectPhoto() {
@@ -240,7 +260,7 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                     mPhotoList.add(mNewPhotoUri.getPath());
                     mAdapter.notifyDataSetInvalidated();
                 } else {
-                    ToastUtil.showToast(this, R.string.c_take_picture_failed);
+                    ToastUtil.showToast(this,  R.string.c_take_picture_failed );
                 }
             }
         } else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 选择一张图片,然后立即调用裁减

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java

@@ -239,7 +239,8 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         mPullToRefreshView.setOnRefreshListener(new PullToRefreshView.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                loadDataInThread();
+                //loadDataInThread();
+                loadFriendsNet();
             }
         });
         //item点击事件处理
@@ -328,6 +329,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
             intent.putExtra(AppConstant.EXTRA_NICK_CODE, friend.getPhone());
             intent.putExtra(AppConstant.EXTRA_USER_ID, friend.getUserId());
             intent.putExtra(AppConstant.EXTRA_NICK_NAME, friend.getNickName());
+            intent.putExtra(AppConstant.EXTRA_EM_CODE ,friend.getEmCode());
             intent.putExtra("friend", friend);
         }
         startActivity(intent);

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

@@ -201,9 +201,18 @@ public class CommonDocDetailsActivity extends BaseActivity {
             }
             if ("SpeAttendance".equals(mCaller)) {
                 getSupportActionBar().setTitle("特殊考勤申请");
+            }if ("Workovertime".equals(mCaller)) {
+                getSupportActionBar().setTitle("加班单");
+            } if ("MaterielApply".equals(mCaller)) {
+                getSupportActionBar().setTitle("物料申请单");
+            } else if ("MainTain".equals(mCaller)) {
+                getSupportActionBar().setTitle("维修申请单");
+            }if ("StandbyApplication".equals(mCaller)) {
+                getSupportActionBar().setTitle("备用机申请单");
+            } else
+            if (!StringUtils.isEmpty(intent.getStringExtra("title"))) {
+                getSupportActionBar().setTitle(intent.getStringExtra("title"));
             }
-
-
             //请求获取单据提交内容数据
             progressDialog.show();
             String docmsg_url = Constants.getAppBaseUrl(getApplicationContext()) + "mobile/common/getformandgriddata.action";
@@ -238,16 +247,17 @@ public class CommonDocDetailsActivity extends BaseActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-//        getMenuInflater().inflate(R.menu.menu_work_home, menu);
+       getMenuInflater().inflate(R.menu.menu_add_icon, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-//        if (item.getItemId() == R.id.work_home) {
-//            startActivity(new Intent(activity, MainActivity.class));
-//            finish();
-//        }
+        if (item.getItemId() == R.id.add_item) {
+            startActivity(new Intent(activity, DataFormDetailActivity.class)
+            .putExtra("caller",mCaller));
+            finish();
+        }
         if (item.getItemId() == android.R.id.home) {
             if (ActivityUtils.isExsitMianActivity(mContext, FormListSelectActivity.class)) {
                 LogUtil.d("正常返回...");

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

@@ -55,7 +55,7 @@ import java.util.Map;
 
 /**
  * Created by FANGlh on 2017/3/22.
- * function:
+ * function:独立版本请假单
  */
 public class PlatLeaveAddActivity extends BaseActivity implements RecognizerDialogListener,View.OnClickListener{
     private static final int DOC_FIRST_SAVE = 0x322;

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

@@ -198,8 +198,15 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         }
         if ("Workovertime".equals(caller)) {
             getSupportActionBar().setTitle("加班单");
+        } if ("MaterielApply".equals(caller)) {
+            getSupportActionBar().setTitle("物料申请单");
+        } else if ("MainTain".equals(caller)) {
+            getSupportActionBar().setTitle("维修申请单");
+        }
+
+        if (!StringUtils.isEmpty(intent.getStringExtra("title"))) {
+            getSupportActionBar().setTitle(intent.getStringExtra("title"));
         }
-        
         String user = CommonUtil.getSharedPreferences(FormListSelectActivity.this,
                 "username");
         String master = CommonUtil.getSharedPreferences(
@@ -357,7 +364,18 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 } else if ("FeePlease!CCSQ".equals(caller)) {
 
                     statusKey="fp_status";
+                 
 
+                } else if("StandbyApplication".equals(caller)) {
+                    statusKey= "sa_status";
+                 
+                }
+                else if("MaterielApply".equals(caller)) {
+                    statusKey= "ama_status";
+                }
+                else if("MainTain".equals(caller)) {
+                    statusKey= "mt_status";
+                    getSupportActionBar().setTitle("维修申请单");
                 }
                 //防错处理
                 if (StringUtils.isEmpty(pfField)) {
@@ -415,12 +433,14 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                     startActivity(new Intent(mContext,
                             DataFormDetailActivity.class)
                             .putExtra("caller", caller)
+                            .putExtra("title",getSupportActionBar().getTitle().toString())
                             .putExtra("status", status)
                             .putExtra("id", keyId));
-                }else{
+                } else {
                     startActivity(new Intent(mContext,
                             CommonDocDetailsActivity.class)
                             .putExtra("caller", caller)
+                            .putExtra("title", getSupportActionBar().getTitle().toString())
                             .putExtra("keyValue", keyId)
                             .putExtra("status", status));
                 }
@@ -559,11 +579,9 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         }else{
             params.put("caller", caller);
         }
-      
         if (where == null) {
             where = "1=1";
         }
-        LogUtil.d(where+" pages:"+cur);
         params.put("condition", where);
         params.put("sessionId", sessionId);
         String result = null;
@@ -571,6 +589,7 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
             result = client.sendPostRequest(Constants.getAppBaseUrl(this)
                     + "mobile/common/list.action", params);
             LogUtil.d(result);
+            LogUtil.d(JSON.toJSONString(params));
             if (result != null&&rMap!=null) {
                 Map<String, Object> tMap =  new HashMap<String, Object>();
                 tMap = FlexJsonUtil.fromJson(result);

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

@@ -165,6 +165,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
     private Set<Integer> meInt;     //我的任务
     private Set<Integer> otherInt;  //我的下属的任务
     private int posItem;           //当前为滑动到的哪个Viewpager
+    List<Map<String, Object>>  menusMap=new ArrayList<>();//菜单动态数据
+    
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -202,6 +204,22 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                             chaneTAG(true);
                         }
                         break;
+                    case 0x13:
+                       array = JSON.parseObject(message).getJSONArray("listdata");//获取到数据
+                        if (array!=null){
+                           
+                            for (int i=0;i<array.size();i++){
+                                JSONObject object=array.getJSONObject(i);
+                                String MM_CALLER= object.getString("MM_CALLER");
+                                String MM_NAME= object.getString("MM_NAME");
+                                Map<String,Object> temp=new LinkedHashMap<>();
+                                temp.put("item_name",MM_NAME);
+                                temp.put("item_caller",MM_CALLER);
+                                menusMap.add(temp);
+                            }
+                            
+                        }
+                        break;
                     default:
                         if (mPullToRefreshScrollView.isRefreshing()) {
                             loadSuccess();
@@ -477,9 +495,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         getSupportActionBar().setTitle(title);
 
         setDateTag(new Date());
-        if (!isB2b)
+        if (!isB2b) {
             getDataByNet();
-        else {
+            getMenuData();
+        } else {
             //没有下属
         }
         loadNetData(String.valueOf(TimeUtils.ym_long_2_str(System.currentTimeMillis())));
@@ -560,6 +579,16 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         ViewUtil.LoginERPTask(ct, handler, 0x16);
     }
 
+    private void getMenuData(){
+        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/oa/getmenuconfig.action";
+        final Map<String, Object> param = new HashMap<>();
+        param.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x13, null, null, "get");
+    }
+    
     private void getDataByNet() {
         progressDialog.show();
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/crm/getstaffmsg.action";
@@ -634,7 +663,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             LayoutInflater layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             view = layoutInflater.inflate(R.layout.pop_crm_list, null);
             ListView plist = (ListView) view.findViewById(R.id.mList);
-            SimpleAdapter adapter = new SimpleAdapter(ct, getPopData(), R.layout.item_pop_list, new String[]{"item_name"}, new int[]{R.id.tv_item_name});
+            SimpleAdapter adapter = new SimpleAdapter(ct, getPopData(),
+                    R.layout.item_pop_list, new String[]{"item_name"}, new int[]{R.id.tv_item_name});
             plist.setAdapter(adapter);
             plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 @Override
@@ -659,6 +689,15 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                         case 2:
                             intent = new Intent(ct, VisitReportAddActivity.class);
                             break;
+                        default:
+                            String caller=   (String)menusMap.get(position).get("item_caller");
+                            String name=(String)menusMap.get(position).get("item_name");
+                            LogUtil.d("caller:"+caller);
+                            intent=new Intent(ct,DataFormDetailActivity.class)
+                                    .putExtra("caller",caller)
+                            .putExtra("title",name);
+                            
+                            break;
 
                     }
                     if (intent != null)
@@ -686,8 +725,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
     }
 
     private List<Map<String, Object>> getPopData() {
-        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-        Map<String, Object> map = new HashMap<String, Object>();
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
         if (getIntent() == null || getIntent().getIntExtra("type", 0) != 1) {
             map.put("item_name", "创建任务");
             list.add(map);
@@ -696,11 +735,16 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             list.add(map);
             map = new HashMap<>();
         }
-//        map.put("item_name", "新增拜访计划");
-//        list.add(map);
-//        map = new HashMap<>();
         map.put("item_name", "新增拜访报告");
         list.add(map);
+        if (menusMap!=null) {
+            if (menusMap.size() != 0) {
+                for (int i = 0; i < menusMap.size(); i++) {
+                    list.add(menusMap.get(i));
+                }
+            }
+        }
+        menusMap=list;
         return list;
     }
 
@@ -862,7 +906,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
     }
 
     public void setDateToListener(Set<Integer> in) {
-        LogUtil.i("in+==" + in);
         if (listenerMap.containsKey(TimeUtils.ym_format.format(curDate)) && listenerMap.get(TimeUtils.ym_format.format(curDate)) != null)
             listenerMap.get(TimeUtils.ym_format.format(curDate)).onChange(in);
     }

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

@@ -32,7 +32,7 @@ import java.util.Map;
 
 /**
  * Created by FANGlh on 2017/4/12.
- * function:
+ * function: 独立版新增人员
  */
 public class PlatContactAddPeopleActivity  extends BaseActivity implements View.OnClickListener{
     private static final int SAVE_REQUEST = 0x41301;

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

@@ -67,6 +67,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
     private static final int COMMON_DOC_DETAILY = 0x319;
     private static final int AGREE_OR_DISAGREE = 0x320;
     private static final int CHANGE_DEAL_MAN = 0x322;
+    private static final int DOC_EM_DATA = 0x418;
     @ViewInject(R.id.work_daily_detail_time_tv)
     private TextView wdd_date;
     @ViewInject(R.id.work_daily_detail_summary_tv)
@@ -195,6 +196,18 @@ public class PlatWDdetailyActivity extends BaseActivity {
         }
     }
 
+    private void initSureStatue(int mkeyValue) {
+        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_doc_detaily_url;
+        Map<String, Object> param = new HashMap<>();
+        param.put("id", mkeyValue);
+        param.put("whichpage", 4);
+        param.put("enuu", Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu")).longValue());
+        param.put("emcode", Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu")).longValue());
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, DOC_EM_DATA, null, null, "get");
+    }
+
     private void loadeapData(int mkeyValue) {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_doc_detaily_url;
         Map<String, Object> param = new HashMap<>();
@@ -241,6 +254,8 @@ public class PlatWDdetailyActivity extends BaseActivity {
             wdd_status.setText("待审批");
             resanddel_ll.setVisibility(View.VISIBLE);
         }
+
+        initSureStatue(mkeyValue); // TODO 仅仅获取单据真正状态
 //        else if (wd_status.equals("在录入")){
 //            wdd_status.setTextColor(mContext.getResources().getColor(R.color.done_approval));
 //            wdd_status.setText("未提交");
@@ -285,18 +300,25 @@ public class PlatWDdetailyActivity extends BaseActivity {
         resubmit_ll.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                new AlertDialog
-                        .Builder(mContext)
-                        .setTitle("温馨提示")
-                        .setMessage("\t\t确认反提交该条单据？")
-                        .setNegativeButton("取消", null)
-                        .setPositiveButton("确认", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                String retype = "reforsub";
-                                doresubmit(retype);
-                            }
-                        }).show();
+                Log.i("wd_status",wd_status);
+                if ("已提交".equals(wd_status) || "待审批".equals(wd_status)) {
+                    new AlertDialog
+                            .Builder(mContext)
+                            .setTitle("温馨提示")
+                            .setMessage("\t\t确认反提交该条单据？")
+                            .setNegativeButton("取消", null)
+                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    String retype = "reforsub";
+                                    doresubmit(retype);
+                                }
+                            }).show();
+                } else {
+                    doJumpToAdd(mkeyValue);
+                    finish();
+                }
+
 
             }
         });
@@ -346,6 +368,17 @@ public class PlatWDdetailyActivity extends BaseActivity {
 
     }
 
+    private void doJumpToAdd(int mkeyValue) {
+        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 + "");
+    }
+
     private PopupWindow popupWindow = null;
 
     private void doDealDescribe(final int agree_type, final int deal_id) {
@@ -519,6 +552,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
                     if (msg.getData() != null) {
                         String app_flow_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("app_flow_result", app_flow_result);
+
                         doPlatComAfShow(app_flow_result);
                         progressDialog.dismiss();
                     }
@@ -528,7 +562,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
                         String r_for_s_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("r_for_s_result", r_for_s_result);
                         if (JSON.parseObject(r_for_s_result).containsKey("success") && JSON.parseObject(r_for_s_result).getBoolean("success")){
-                            ToastMessage("反提交成功");
+//                            ToastMessage("反提交成功");
                             startActivity(new Intent(activity, WorkDailyAddActivity.class)
                                     .putExtra("caller", mCaller)
                                     .putExtra("id", mkeyValue)
@@ -549,7 +583,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
                     if (msg.getData() != null) {
                         String r_for_d_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("r_for_d_result", r_for_d_result);
-                        ToastMessage("反提交成功");
+//                        ToastMessage("反提交成功");
                         doPlatDeleteByid(mkeyValue);
                     }
                     break;
@@ -627,6 +661,16 @@ public class PlatWDdetailyActivity extends BaseActivity {
                         LogUtil.prinlnLongMsg("change_deal_man_result", change_deal_man_result);
                     }
                     break;
+
+                case DOC_EM_DATA:
+                    if (msg.getData() != null) {
+                        String doc_em_data = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("doc_em_data", doc_em_data);
+                        if (!StringUtils.isEmpty(doc_em_data)) {
+                            getDailyStatue(doc_em_data);
+                        }
+                    }
+                    break;
                 default:
                     if (msg.getData() != null) {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
@@ -639,6 +683,31 @@ public class PlatWDdetailyActivity extends BaseActivity {
         }
     };
 
+    private void getDailyStatue(String doc_em_data) {
+        JSONObject Object = JSON.parseObject(doc_em_data);
+        JSONObject dataObject = Object.getJSONObject("data");
+
+        if (dataObject != null){
+            if (!StringUtils.isEmpty(dataObject.getString("wd_status"))){
+                wd_status = dataObject.getString("wd_status");
+                if ("已审核".equals(wd_status) || "已审批".equals(wd_status)) {
+                    wdd_status.setTextColor(mContext.getResources().getColor(R.color.approval));
+                    wdd_status.setText("已审批");
+                    resanddel_ll.setVisibility(View.GONE);
+                } else if ("已提交".equals(wd_status)) {
+                    wdd_status.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+                    wdd_status.setText("待审批");
+                    resanddel_ll.setVisibility(View.VISIBLE);
+                }else if ("在录入".equals(wd_status)){
+                    wdd_status.setTextColor(mContext.getResources().getColor(R.color.done_approval));
+                    wdd_status.setText("在录入");
+                    resanddel_ll.setVisibility(View.VISIBLE);
+                }
+            }
+        }
+
+    }
+
     private void dodetailsShow(String date, String summary, String plan, String experience, String wd_status) {
         csv_hide.setVisibility(View.VISIBLE);
         resanddel_ll.setVisibility(View.GONE);
@@ -665,6 +734,9 @@ public class PlatWDdetailyActivity extends BaseActivity {
             hide_above_af.setVisibility(View.GONE);
         } else {
             mPlatComAfBean = JSON.parseObject(resultJsonObject.toString(), PlatComAfBean.class);
+            if (!mPlatComAfBean.isSuccess()) {
+                return;
+            }
             //TODO 获取数据审批人姓名，头像,审批状态
             if (!ListUtils.isEmpty(mPlatComAfBean.getData()) || !ListUtils.isEmpty(mPlatComAfBean.getNodes())) {
                 int datas_size = mPlatComAfBean.getData().size();

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

@@ -247,36 +247,87 @@ public class SelectActivity extends BaseActivity {
         }
     }
 
+    /**
+      * @desc:下拉联动接口
+      * @author：Arison on 2017/4/10
+      */
     private void dispalayMuliSelect(String message) {
         String dataStr = JSON.parseObject(message).getString("data");
         JSONArray datas = JSON.parseArray(dataStr);//values
-//                    System.out.println(datas.getJSONObject(0).getString("em_name"));
+        if (datas!=null){
+            if (datas.size()==0){
+                return;
+            }
+        }
         JSONArray dbfinds = JSON.parseObject(message).getJSONArray("dbfinds");
         String fieldkey = "";
+        ArrayList<String> fieldKeys=new ArrayList<>();//联动数据
         for (int i = 0; i < dbfinds.size(); i++) {
             JSONObject item = dbfinds.getJSONObject(i);
             String key = item.getString("field");
             if (key.equals(showKey)) {
-//                            System.out.println(item.getString("dbGridField"));
                 fieldkey = item.getString("dbGridField");
             }
+            
+           if (fields!=null){//联动选择
+               for (int j=0;j<fields.length;j++){
+                   if (key.equals(fields[j])){
+                       fieldKeys.add(item.getString("dbGridField"));
+                       
+                   }
+               }
+           }
         }
         if (formBeaan == null) formBeaan = new ArrayList<>();
         else formBeaan.clear();
         SelectBean bean = null;
-        for (int i = 0; i < datas.size(); i++) {
-            System.out.println("value" + i + ":" + datas.getJSONObject(i).getString(fieldkey));
-            bean = new SelectBean();
-            bean.setId(id);
-            if (StringUtils.isEmpty(datas.getJSONObject(i).getString(fieldkey))){
-                bean.setName(datas.getJSONObject(i).getString(showKey));
-            }else{
-                bean.setName(datas.getJSONObject(i).getString(fieldkey));
-            }
-            bean.setObject(JSON.toJSONString(datas.get(i)));
-            bean.setJson(JSON.toJSONString(datas.get(i)));
-            formBeaan.add(bean);
+        if (fields!=null){
+            ArrayList<String> values=new ArrayList<>();
+               for (int i = 0; i < datas.size(); i++) {
+                   JSONObject item=  datas.getJSONObject(i);
+                   bean = new SelectBean();
+                   bean.setId(id);
+                   String value2 = "";
+                   for (int j=0;j<fieldKeys.size();j++) {
+                       if (j== fieldKeys.size()-1){
+                           value2=value2+ item.getString(fieldKeys.get(j));
+                       }else{
+                           value2=value2+ item.getString(fieldKeys.get(j))+"/";
+                       }
+                       values.add(item.getString(fieldKeys.get(j)));
+                   }
+                   
+                   if (StringUtils.isEmpty(item.getString(fieldkey))){
+                       bean.setName(item.getString(showKey));
+                   }else{
+                       if (StringUtils.isEmpty(value2)){
+                           bean.setName(item.getString(fieldkey));
+                       }else{
+                           bean.setName(item.getString(fieldkey)+"("+value2+")");
+                       }
+                   }
+                   bean.setFields(JSON.toJSONString(values));
+                   bean.setJson(JSON.toJSONString(datas.get(i)));
+                   formBeaan.add(bean);
+               
+           }
+        }else{
+            for (int i = 0; i < datas.size(); i++) {
+                System.out.println("value" + i + ":" + datas.getJSONObject(i).getString(fieldkey));
+                JSONObject item=  datas.getJSONObject(i);
+                bean = new SelectBean();
+                bean.setId(id);
+                if (StringUtils.isEmpty(item.getString(fieldkey))){
+                    bean.setName(item.getString(showKey));
+                }else{
+                    bean.setName(item.getString(fieldkey));
+                }
+                bean.setObject(JSON.toJSONString(datas.get(i)));
+                bean.setJson(JSON.toJSONString(datas.get(i)));
+                formBeaan.add(bean);
+            } 
         }
+        
     }
 
     
@@ -422,12 +473,14 @@ public class SelectActivity extends BaseActivity {
                 if (isSingle) {
                     putDownInput();
                     SelectBean bean = formBeaan.get(i);
+                    String names[]=bean.getName().split("\\(");
+                    bean.setName(names[0]);
                     bean.setId(id);
                     //TODO 出错 先删除  如果要修改  bean.setJson 的返回  联系负责人 Bitliker
                     //bean.setJson(JSON.toJSONString(object));
                     bean.setObject(JSON.toJSONString(object));
                     Intent intent = new Intent();
-                    LogUtil.d("ben"+ JSON.toJSONString(bean));
+                    LogUtil.d("ben" + JSON.toJSONString(bean));
                     intent.putExtra("data", bean);
                     setResult(0x20, intent);
                     finish();
@@ -448,6 +501,8 @@ public class SelectActivity extends BaseActivity {
 
 
     }
+    
+    String[] fields;
 
     private void initIntent() {
         Intent intent = getIntent();
@@ -457,6 +512,7 @@ public class SelectActivity extends BaseActivity {
         title = intent.getStringExtra("title");
         id = intent.getIntExtra("id", 0);
         object = intent.getParcelableExtra("object");
+        fields=intent.getStringArrayExtra("fields");
         LogUtil.d(JSON.toJSONString(object));
         isSingle = intent.getBooleanExtra("isSingle", true);
         int reid = intent.getIntExtra("reid", -1);

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

@@ -294,10 +294,17 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         if (StringUtils.isEmpty(text)) return;
         Pattern pattern = Pattern.compile("(?<=\\()(.+?)(?=\\))");
         Matcher matcher = pattern.matcher(text);
-        while (matcher.find()) {
+        if (matcher.find()) {
             String name = matcher.group();
-            if (!StringUtils.isEmpty(name))
+            if (!StringUtils.isEmpty(name)){
                 selectApprovers(name);
+            }else {
+                progressDialog.dismiss();
+                jumptododetail(mkeyValue);
+            }
+        }else {
+            progressDialog.dismiss();
+            jumptododetail(mkeyValue);
         }
     }
 

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

@@ -18,6 +18,8 @@ import org.apache.http.client.CookieStore;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.params.CoreConnectionPNames;
@@ -79,8 +81,8 @@ public class HttpClient {
         if (!TextUtils.isEmpty(MyApplication.getInstance().getJSESSION_B2B())) {
             httpGet.addHeader("Cookie", "JSESSIONID=" + MyApplication.getInstance().getJSESSION_B2B());
         }
-        httpclient.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 5000);
-        httpclient.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT, 5000);
+        httpclient.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 15000);
+        httpclient.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT, 15000);
         HttpResponse response = httpclient.execute(httpGet);
         if (response.getStatusLine().getStatusCode() == 200) {
             String temp = EntityUtils.toString(response.getEntity());
@@ -99,6 +101,7 @@ public class HttpClient {
 
     public String sendPostRequest(String url, Map<String, String> params)
             throws IOException {
+        SSLSocketFactory.getSocketFactory().setHostnameVerifier(new AllowAllHostnameVerifier());
         Log.i("HTTP", "post url=" + url);
         String result = null;
         HttpResponse response = null;
@@ -130,7 +133,7 @@ public class HttpClient {
         } catch (IOException e) {
             e.printStackTrace();
         }
-
+       
         if (response.getStatusLine().getStatusCode() == 200
                 || response.getStatusLine().getStatusCode() == 207) {
             String temp = EntityUtils.toString(response.getEntity());

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

@@ -451,8 +451,8 @@ public class ViewUtil {
         params.put("appId", "b2b");
         params.put("username", phone);
         params.put("password", password);
-//        params.put("spaceId", String.valueOf(spaceId));
-        params.put("spaceId", "76035");
+        params.put("spaceId", String.valueOf(spaceId));
+       // params.put("spaceId", "76035");
         startNetThread(url, params, handler, Constants.SUCCESS_B2B, null, null, "post");
     }
 

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

@@ -246,9 +246,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         if (ApiUtils.getApiModel() instanceof ApiUAS) {
             company_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
             master_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_master"));
+            rl_master_change.setVisibility(View.VISIBLE);
         } else {
             company_tv.setText(CommonUtil.getSharedPreferences(ct, "companyName"));
             master_tv.setText(CommonUtil.getSharedPreferences(ct, "spaceId"));
+            rl_master_change.setVisibility(View.GONE);
         }
 
 

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

@@ -61,7 +61,7 @@ import java.util.Map;
 
 /**
  * Created by FANGlh on 2017/1/16.
- * function: 办公地址设置
+ * function: 打卡2.0办公地址设置
  */
 public class OfficeAddressSettingsActivity extends BaseActivity {
     private static final int SIGN_RANGE_REQUESTCODE = 0x117;
@@ -161,7 +161,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
                             String result = msg.getData().getString("result");
                             Log.i("plat_sign_office", result);
-                            ToastMessage("平台地址接口请求已成功");
+                            ToastMessage("请求成功");
                             doShowPlatSignAddress(result);
                         }
                     }
@@ -173,7 +173,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
                             LogUtil.prinlnLongMsg("save_address_result", result);
                             if (saved_num == address_names.size() - 1) {// 有待优化
                                 progressDialog.dismiss();
-                                Toast.makeText(ct, "平台办公地址保存成功", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(ct, "保存成功", Toast.LENGTH_SHORT).show();
                                 save_btn.setEnabled(true);
                                 finish();
                             }

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

@@ -40,7 +40,7 @@ import java.util.Map;
 
 /**
  * Created by FANGlh on 2017/1/16.
- * function:高级设置
+ * function:打卡2.0高级设置
  */
 public class SignSeniorSettingActivity extends BaseActivity implements View.OnClickListener, SwitchView.OnCheckedChangeListener {
     private static final int LATE_TIME_CODE = 11701;

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

@@ -238,6 +238,7 @@ public class FormDetailActivity extends BaseActivity {
         resubmit_ll.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                Log.i("status",status);
                 if ("已提交".equals(status) || "待审批".equals(status)) {  // 已提交状态
                     new AlertDialog
                             .Builder(mContext)
@@ -770,7 +771,7 @@ public class FormDetailActivity 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("重新提交之反提交成功");
+                        ToastMessage("反提交成功");
                         Log.i("doresubmit_id", mkeyValue + "");
                         // TODO 跳转至录入界面操作
                         doJumpToAdd(mkeyValue);
@@ -781,7 +782,7 @@ public class FormDetailActivity extends BaseActivity {
                     if (msg.getData() != null) {
                         String r_for_d_result = msg.getData().getString("result");
                         LogUtil.prinlnLongMsg("r_for_d_result", r_for_d_result);
-                        ToastMessage("删除之反提交成功");
+                        ToastMessage("反提交成功");
                         doPlatDeleteByid(mkeyValue);
                     }
                     break;

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

@@ -400,18 +400,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
             ToastMessage("任务详情为必填项");
             return;
         }
-        if (StringUtils.isEmpty(et_startime.getText().toString())) {
-            ToastMessage("开始时间为必填项");
-            return;
-        }
-        if (StringUtils.isEmpty(et_task_startime.getText().toString())) {
-            ToastMessage("结束时间为必填项");
-            return;
-        }
-        if (et_startime.getText().toString().compareTo(et_task_startime.getText().toString()) >= 0) {
-            ToastMessage("开始时间必须小于截止时间");
-            return;
-        }
+
         String resourcename = "";
         if (tagValues != null && tagValues.length > 0) {
             try {
@@ -424,6 +413,19 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
             ToastMessage("执行人为必填项");
             return;
         }
+        if (StringUtils.isEmpty(et_startime.getText().toString())) {
+            ToastMessage("开始时间为必填项");
+            return;
+        }
+        if (StringUtils.isEmpty(et_task_startime.getText().toString())) {
+            ToastMessage("结束时间为必填项");
+            return;
+        }
+        if (et_startime.getText().toString().compareTo(et_task_startime.getText().toString()) >= 0) {
+            ToastMessage("开始时间必须小于截止时间");
+            return;
+        }
+
         String formStore = "{\n" +
                 "\"detail\":\"" + et_task_remark.getText().toString() + "\",\n" +
                 "\"recordercode\":\"" + CommonUtil.getSharedPreferences(MyApplication.getInstance(), "b2b_uu") + "\",\n" +

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

@@ -138,6 +138,8 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
                     selectCode = "";
                     et_task_people.setVisibility(View.GONE);
                     return;
+                }else{
+                    et_task_people.setVisibility(View.VISIBLE);
                 }
                 StringBuilder select = new StringBuilder();
                 StringBuilder selectCode = new StringBuilder();
@@ -184,11 +186,14 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
             ToastMessage("任务标题为必填项");
             return;
         }
-
         if (StringUtils.isEmpty(et_task_detail.getText().toString())) {
             ToastMessage("任务详情为必填项");
             return;
         }
+        if (StringUtils.isEmpty(selectNames)){
+            ToastMessage("执行人为必选项");
+            return;
+        }
         if (StringUtils.isEmpty(et_startime.getText().toString())) {
             ToastMessage("开始时间为必选项");
             return;
@@ -202,6 +207,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
             return;
         }
 
+        doHttpSave(selectNames);
         /*String[] people = et_task_people.getTags();
         people = tagValues;
         String resourcename = "";
@@ -218,12 +224,6 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
             return;
         }*/
 
-        if (!StringUtils.isEmpty(selectNames)) {
-            doHttpSave(selectNames);
-        } else {
-            ToastMessage("执行人为必选项");
-            return;
-        }
 
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -6,13 +6,14 @@ package com.xzjmyk.pm.activity.wxapi;
  * 在ApiModel中定义公共逻辑方法
  */
 public class ApiPlatform extends ApiBase implements ApiModel {
-
-    private final String mBaseUrl = "http://218.17.158.219:9090/platform-b2b/"; //测试ip
+//
+      private final String mBaseUrl="http://uas.ubtob.com/";
+   // private final String mBaseUrl = "http://218.17.158.219:9090/platform-b2b/"; //测试ip
 //    private final String mBaseUrl = "http://192.168.253.102:8090/platform-b2b/"; //董必伟本地ip
 //    private final String mBaseUrl = "http://192.168.253.192:8088/platform-b2b/"; //何本地ip
 
-
-    private String url_login_test = "http://113.105.74.135:8001/sso/login";
+    private String url_login_test="https://uas.ubtob.com/sso/login";
+    //private String url_login_test = "http://113.105.74.135:8001/sso/login";
     private String url_login_formal = "https://account.ubtob.com/sso/login";
 
     private String OBTAIN_ANNOUNCE_URL = mBaseUrl + "/bulletinCenter/getAllbulletins?pageNumber=1&pageSize=10&enuu=10030994";

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

@@ -1,51 +1,75 @@
 <!--登录界面-->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#EBE9E9"
     android:fillViewport="true">
-
+    
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
+        android:layout_height="match_parent"
+        >
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/iv_head"
             android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_above="@+id/ll_content"
+            android:layout_height="80dp" 
             android:layout_centerHorizontal="true"
+            android:layout_marginTop="50dp"
             android:layout_marginBottom="20dp"
-            android:src="@drawable/login_header" />
-
+            android:src="@drawable/login_header"/>
         <LinearLayout
             android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+            android:layout_below="@+id/iv_head"
             android:layout_marginBottom="10dp"
             android:orientation="vertical">
-
-            <com.xzjmyk.pm.activity.view.ClearEditText
-                android:id="@+id/phone_numer_edit"
-                style="@style/IMLineEditText"
-                android:background="@color/white"
-                android:drawableLeft="@drawable/login_user_name"
-                android:hint="@string/please_input_phone_number"
-                android:inputType="phone"
-                android:paddingBottom="0dp"
-                android:paddingTop="0dp" />
+          <LinearLayout
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="@color/white"
+              android:orientation="horizontal">
+              <TextView
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content" 
+                  android:paddingLeft="10dp"
+                  android:text="账户 |"/>
+              <!--   android:drawableLeft="@drawable/login_user_name"-->
+              <com.xzjmyk.pm.activity.view.ClearEditText
+                  android:id="@+id/phone_numer_edit"
+                  style="@style/IMLineEditText"
+                  android:paddingTop="0dp"
+                  android:paddingBottom="0dp"
+                  android:background="@color/white"
+               
+                  android:hint="@string/please_input_phone_number"
+                  android:inputType="phone" />
+          </LinearLayout>
+         
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp" />
-
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="10dp"
+                android:text="密码 |"/>
+            <!--    android:drawableLeft="@drawable/loginpw"-->
             <com.xzjmyk.pm.activity.view.ClearEditText
                 android:id="@+id/password_edit"
                 style="@style/IMLineEditPass"
                 android:background="@color/white"
-                android:drawableLeft="@drawable/loginpw"
+            
                 android:hint="@string/please_input_password" />
+            </LinearLayout>
+            
 
             <Button
                 android:id="@+id/login_btn"
@@ -56,28 +80,30 @@
                 android:layout_marginTop="10dp"
                 android:background="@drawable/bg_bule_btn"
                 android:text="登  录"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
-
-
+                android:textSize="@dimen/text_main"
+                android:textColor="@color/white" />
+            
+          
         </LinearLayout>
-
         <TextView
+            android:id="@+id/tv_findPwd"
+            android:layout_below="@+id/ll_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/ll_content"
             android:layout_marginLeft="20dp"
-            android:text="忘记密码"
-            android:textColor="@color/titleBlue" />
-
+          
+            android:textColor="@color/titleBlue"
+            android:text="忘记密码"/>
+        
         <TextView
+            android:id="@+id/tv_register"
+            android:layout_below="@+id/ll_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textColor="@color/titleBlue"
             android:layout_alignParentRight="true"
-            android:layout_below="@+id/ll_content"
+         
             android:layout_marginRight="20dp"
-            android:onClick="onRegister"
-            android:text="新用户注册"
-            android:textColor="@color/titleBlue" />
+            android:text="新用户注册"/>
     </RelativeLayout>
 </ScrollView>