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

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/AutoErpService.java

@@ -82,7 +82,9 @@ public class AutoErpService extends Service {
 	private boolean canWork = false;
 	private boolean canMission = false;
 	private boolean canDNotice = false;
-	private boolean isWorkRuning;
+	private boolean isWorkRuning = false;
+
+	private long updateTime;
 
 	private final String[] flags = {
 			AppConstant.CHANGE_WORK_TASK,//
@@ -269,6 +271,8 @@ public class AutoErpService extends Service {
 	}
 
 	private void signinWork(final WorkModel model) {
+		if (isWorkRuning) return;
+		isWorkRuning = true;
 		LogUtil.i("符合打卡时间");
 		MyApplication.getInstance().getBdLocationHelper().requestLocation();
 		OAHttpHelper.getInstance().postDelayed(new Runnable() {
@@ -285,6 +289,7 @@ public class AutoErpService extends Service {
 							getReckonAutoUtil().nextNotSigninTime(model);
 						}
 					});
+					isWorkRuning = false;
 				}
 			}
 		}, 1500);
@@ -296,6 +301,10 @@ public class AutoErpService extends Service {
 	 * @throws Exception
 	 */
 	private void reckonWork() {
+		if (System.currentTimeMillis() - updateTime < 30000) {
+			return;
+		}
+		updateTime = System.currentTimeMillis();
 		LogUtil.i("reckonWork");
 		ThreadUtil.getInstance().addTask(new Runnable() {
 			@Override

app_core/common/src/main/res/layout/bsetting_activity.xml

@@ -93,7 +93,9 @@
             android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name" />
     </RelativeLayout>
+
     <RelativeLayout
+        android:id="@+id/batchplace_rl"
         style="@style/IMTbleLine"
         android:background="@drawable/selector_me_menu_item_bg">
         <View
@@ -106,7 +108,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:gravity="center"
-            android:text="员工休息日设置"
+            android:text="设置服务/场地/房间"
             android:textColor="@color/black"
             android:textSize="14sp" />
         <ImageView
@@ -117,31 +119,41 @@
             android:background="@drawable/oa_next"
             android:contentDescription="@string/app_name" />
 
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/batchplace_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
+        <RelativeLayout
+            style="@style/IMTbleLine"
             android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="批量设置服务/场地/房间"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
+            android:layout_marginBottom="118dp"
+            android:layout_marginEnd="11dp"
+            android:layout_marginRight="11dp"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:visibility="gone">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:layout_alignParentBottom="true"
+                android:background="@color/item_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="员工休息日设置"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/oa_next"
+                android:contentDescription="@string/app_name" />
+
+        </RelativeLayout>
 
     </RelativeLayout>
 
@@ -159,7 +171,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:gravity="center"
-            android:text="批量设置员工休息日"
+            android:text="设置员工休息日"
             android:textColor="@color/black"
             android:textSize="14sp" />
         <ImageView
@@ -186,7 +198,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:gravity="center"
-            android:text="批量设置企业休息日"
+            android:text="设置企业休息日"
             android:textColor="@color/black"
             android:textSize="14sp" />
         <ImageView

app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -121,7 +121,7 @@ public class HttpClient {
         public Builder() {
             this.method = Method.GET;
             this.params.put("client","Android Client");
-//            this.headers.put("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+            this.headers.put("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
         }
 
         public Builder(String url) {

app_modular/appme/src/main/AndroidManifest.xml

@@ -55,10 +55,11 @@
         <activity android:name=".settings.activity.PersonSettingListActivity"
             android:label="@string/more"/>
         <activity android:name=".settings.activity.BComSetEmployeeRestActivity"
-            android:label="批量设置员工休息日"/>
+            android:label="设置员工休息日"/>
         <activity android:name=".settings.activity.BComSetCompanyRestActivity"
-            android:label="批量设置企业休息日"/>
+            android:label="设置企业休息日"/>
         <activity android:name=".settings.activity.BSettingLocationActivity"
+            android:label="设置服务/场地/房间"/>
             android:label="批量设置服务/场地/房间"/>
         <activity android:name=".settings.activity.BRestActivity"
             android:label="@string/more"/>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetEmployeeRestActivity.java

@@ -1,10 +1,18 @@
 package com.uas.appme.settings.activity;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.BaseAdapter;
+import android.widget.EditText;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -14,12 +22,16 @@ import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
+import com.common.data.StringUtil;
+import com.common.system.DisplayUtil;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.model.SelectBean;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.time.wheel.OASigninPicker;
 import com.core.widget.MyListView;
+import com.core.widget.view.Activity.SelectActivity;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
@@ -41,9 +53,10 @@ import java.util.List;
 public class BComSetEmployeeRestActivity extends BaseActivity implements View.OnClickListener{
     private MyListView mComList;
     private List<ComRestBean> mList;  //进行保存的员工休息数据列表
-    private PersonSetingBean mServicePersonList;  //获取商家服务人员
     private ComRestAdapter myAdapter;
     private String current_date;
+    private List<String> serviceMans;
+    private int click_positon;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -60,7 +73,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
                 .add("companyid", 201)
-                .add("serviceid", MyApplication.getInstance().mLoginUser.getUserId())
+                .add("serviceid", 10002)
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
@@ -69,7 +82,8 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("appStoreman", o.toString()+"");
                 try {
-                    mServicePersonList = JSON.parseObject(o.toString(),PersonSetingBean.class);
+                    PersonSetingBean  mServicePersonList = JSON.parseObject(o.toString(),PersonSetingBean.class);
+                    handleServerMan(mServicePersonList);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -77,16 +91,23 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         }));
     }
 
+    private void handleServerMan(PersonSetingBean mServicePersonList) {
+        if (mServicePersonList == null || ListUtils.isEmpty(mServicePersonList.getResult())) return;
+        for (int i=0; i<mServicePersonList.getResult().size();i++)
+            serviceMans.add(mServicePersonList.getResult().get(i).getSm_username());
+
+    }
+
 
     private void initView() {
         mList = new ArrayList<>();
-        mServicePersonList = new PersonSetingBean();
         mComList = (MyListView) findViewById(R.id.com_list);
         findViewById(R.id.add_new_rl).setOnClickListener(this);
         myAdapter = new ComRestAdapter(this);
         myAdapter.setModelList(mList);
         mComList.setAdapter(myAdapter);
         findViewById(R.id.save_bt).setOnClickListener(this);
+        serviceMans = new ArrayList<>();
 
         //初始化今天日期
         String CURRENT_DATE = TimeUtil.getCurrentDate();
@@ -98,7 +119,7 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         if (v.getId() == R.id.add_new_rl){
             ComRestBean model = new ComRestBean();
             model.setSf_companyid("201");
-            model.setSf_username("f方");
+            model.setSf_username("");
             model.setSf_companyname(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_commpany"));
             model.setSf_userid(MyApplication.getInstance().mLoginUser.getUserId());
             model.setSf_date("");
@@ -181,7 +202,24 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
             viewHolder.name_tv.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-
+                    if (ListUtils.isEmpty(serviceMans)) {
+                        doInputName(position);
+                    }
+                    else{
+                        ArrayList<SelectBean> beans = new ArrayList<>();
+                        SelectBean bean = null;
+                        for (String e : serviceMans) {
+                            bean = new SelectBean();
+                            bean.setName(e);
+                            bean.setClick(false);
+                            beans.add(bean);
+                        }
+                        Intent intent = new Intent(ct, SelectActivity.class);
+                        intent.putExtra("type", 2);
+                        intent.putParcelableArrayListExtra("data", beans);
+                        intent.putExtra("title", "人员选择");
+                        startActivityForResult(intent, 0x01);
+                    }
                 }
             });
 
@@ -200,6 +238,96 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
         }
     }
 
+    private PopupWindow popupWindow = null;
+    private void doInputName(final int position) {
+        // 一个自定义的布局，作为显示的内容
+        View contentView = LayoutInflater.from(ct).inflate(
+                R.layout.item_edit_location_pop, null);
+
+        // 设置按钮的点击事件
+        TextView title_tv = (TextView) contentView.findViewById(R.id.title_tv);
+        final EditText editname_et = (EditText) contentView.findViewById(R.id.editname_et);
+        TextView cancel_tv = (TextView) contentView.findViewById(R.id.cancel_tv);
+        TextView sure_tv = (TextView) contentView.findViewById(R.id.sure_tv);
+        title_tv.setText("请输入人员名称");
+
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        int w_screen = dm.widthPixels;
+        int h_screen = dm.heightPixels;
+        w_screen = DisplayUtil.dip2px(this, 300);
+        h_screen = DisplayUtil.dip2px(this, 145);
+
+        contentView.findViewById(R.id.cancel_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                popupWindow.dismiss();
+            }
+        });
+        contentView.findViewById(R.id.sure_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (StringUtil.isEmpty(editname_et.getText().toString())){
+                    ToastMessage("请输入人员名称");
+                    return;
+                }else {
+                    mList.get(position).setSf_username(editname_et.getText().toString());
+                    myAdapter.notifyDataSetChanged();
+                }
+                popupWindow.dismiss();
+            }
+        });
+        popupWindow = new PopupWindow(contentView, w_screen, h_screen, true);
+        popupWindow.setTouchable(true);
+        popupWindow.setOutsideTouchable(false);
+        // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
+        popupWindow.setBackgroundDrawable(getResources().getDrawable(com.uas.appworks.R.drawable.pop_round_bg));
+        // 设置好参数之后再show
+        popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
+        setbg(0.4f);
+    }
+    private void setbg(float alpha) {
+        setBackgroundAlpha(this, alpha);
+        if (popupWindow == null) return;
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                setBackgroundAlpha(BComSetEmployeeRestActivity.this, 1f);
+            }
+        });
+    }
+
+    /**
+     * 设置页面的透明度
+     * 兼容华为手机（在个别华为手机上 设置透明度会不成功）
+     *
+     * @param bgAlpha 透明度   1表示不透明
+     */
+    public void setBackgroundAlpha(Activity activity, float bgAlpha) {
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.alpha = bgAlpha;
+        if (bgAlpha == 1) {
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//不移除该Flag的话,在有视频的页面上的视频会出现黑屏的bug
+        } else {
+            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//此行代码主要是解决在华为手机上半透明效果无效的bug
+        }
+        activity.getWindow().setAttributes(lp);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (data == null) return;
+        if (resultCode == 0x20) {
+            SelectBean b = data.getParcelableExtra("data");
+            if (b == null) return;
+            String name = StringUtil.isEmpty(b.getName()) ? "" : b.getName();
+            if (requestCode == 0x01) {
+              mList.get(click_positon).setSf_username(name);
+              myAdapter.notifyDataSetChanged();
+            }
+        }
+    }
+
     private void doSelectEndDate(final int pos) {
         OASigninPicker picker = new OASigninPicker(this);
         picker.setRange(CalendarUtil.getYear()+1, CalendarUtil.getMonth(), CalendarUtil.getDay());

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSetComRestListActivity.java

@@ -77,8 +77,9 @@ public class BSetComRestListActivity extends BaseActivity {
 						LogUtil.prinlnLongMsg("updateData", JSON.toJSONString(mListc.getResult().get(position)));
 						break;
 					case "place":
-						startActivity(new Intent(ct, BSettingLocationActivity.class)
-								.putExtra("updateData", JSON.toJSONString(mListp.getResult().get(position))));
+						startActivityForResult(new Intent(ct, BSettingLocationActivity.class)
+								.putExtra("updateData", JSON.toJSONString(mListp.getResult().get(position)))
+						,20);
 						LogUtil.prinlnLongMsg("updateData", JSON.toJSONString(mListp.getResult().get(position)));
 						break;
 				}
@@ -121,7 +122,7 @@ public class BSetComRestListActivity extends BaseActivity {
 	}
 
 	private void initData() {
-
+		LogUtil.prinlnLongMsg("initData()","initData()");
 		String url = null;
 
 		switch (type) {
@@ -167,7 +168,9 @@ public class BSetComRestListActivity extends BaseActivity {
 							break;
 
 					}
-					if (mListe == null || ListUtils.isEmpty(mListe.getResult()) || mListc == null || ListUtils.isEmpty(mListc.getResult()))
+					if (mListe == null || ListUtils.isEmpty(mListe.getResult())
+							|| mListc == null || ListUtils.isEmpty(mListc.getResult())
+							|| mListp == null || ListUtils.isEmpty(mListp.getResult()))
 						mEmptyLayout.showEmpty();
 				} catch (Exception e) {
 					e.printStackTrace();

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -142,6 +142,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                 LogUtil.prinlnLongMsg("appServiceSet", o.toString()+"");
                 if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
                     Toast.makeText(ct,getString(R.string.update_success),Toast.LENGTH_LONG).show();
+                    setResult(20);
                     finish();
                 }
             }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingActivity.java

@@ -14,6 +14,7 @@ import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
+import com.common.hmac.Md5Util;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
@@ -108,8 +109,10 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
             mUserDepartmentTv.setText(model.getResult().get(position).getSm_stname());
             mUserJobTv.setText(model.getResult().get(position).getSm_level());
             mUserTelTv.setText(model.getResult().get(position).getSm_telephone());
-            mUserEmailTv.setText("");
+            mUserEmailTv.setText(model.getResult().get(position).getSm_email());
+            mUserSexTv.setText("1".equals(model.getResult().get(position).getSm_sex()) ? getString(R.string.user_body) : getString(R.string.user_girl));
             sm_id = model.getResult().get(position).getSm_id();
+            mBtnSave.setText(getString(R.string.common_update_button));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -161,7 +164,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
     private void saveJudge() {
         if (mUserNameTv.testValidity() && mUserSexTv.testValidity()
-                && mUserDepartmentTv.testValidity() && mUserJobTv.testValidity() &&
+                && mUserJobTv.testValidity() &&
                 mUserTelTv.testValidity()&& mUserEmailTv.testValidity()
                 ){
             if (mUserEmailTv.getText().toString().contains("@")){
@@ -188,14 +191,18 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
         params.put("sm_companyname", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_commpany"));
         params.put("sm_level",mUserJobTv.getText().toString());
         params.put("sm_telephone",mUserTelTv.getText().toString());
-        params.put("sm_email",mUserEmailTv.getText().toString());
-        params.put("sm_sex",sm_sex);
 
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appPersonSet")
                 .add("map", JSONUtil.map2JSON(params))
                 .add("token",MyApplication.getInstance().mAccessToken)
+                .add("telephone",mUserTelTv.getText().toString())
+                .add("password", Md5Util.toMD5(111111+""))
+                .add("nickname",mUserNameTv.getText().toString())
+                .add("description","UU互联")
+                .add("sex",sm_sex)
+                .add("birthday",94665600)
                 .method(Method.POST)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
@@ -204,6 +211,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                 LogUtil.prinlnLongMsg("appPersonSet", o.toString()+"");
                 if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")) {
                     Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
+                    setResult(20);
                     finish();
                 }
             }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingListActivity.java

@@ -62,6 +62,8 @@ public class PersonSettingListActivity extends BaseActivity {
         mEmptyLayout.setShowLoadingButton(false);
     }
     private void initData() {
+        LogUtil.prinlnLongMsg("initData()","initData()");
+
         //接收商家类型
         sc_industry = getIntent().getStringExtra("sc_industry");
         sc_industrycode = getIntent().getStringExtra("sc_industrycode");
@@ -70,7 +72,7 @@ public class PersonSettingListActivity extends BaseActivity {
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appStoreman")
                 .add("companyid", 201)
-                .add("serviceid",sc_industrycode)
+                .add("serviceid",0)
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
@@ -98,11 +100,10 @@ public class PersonSettingListActivity extends BaseActivity {
         psetting_list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                Intent intent = new Intent(ct,PersonSettingActivity.class);
-                intent.putExtra("mdoel",JSON.toJSONString(mList));
-                intent.putExtra("position",position);
+                startActivityForResult(new Intent(ct,PersonSettingActivity.class)
+                .putExtra("mdoel",JSON.toJSONString(mList))
+                .putExtra("position",position),20);
                 LogUtil.prinlnLongMsg("intentmodel",JSON.toJSONString(mList.getResult().get(position)));
-                startActivity(intent);
             }
         });
     }
@@ -122,4 +123,14 @@ public class PersonSettingListActivity extends BaseActivity {
         }
         return super.onOptionsItemSelected(item);
     }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 20 && resultCode == 20) {
+            //TODO 重更新
+            initData();
+        }
+    }
 }

app_modular/appme/src/main/java/com/uas/appme/settings/model/PersonSetingBean.java

@@ -23,42 +23,28 @@ public class PersonSetingBean   {
         /**
          * sm_companyid : 201
          * sm_companyname : 北大医院
-         * sm_id : 10001
+         * sm_email : 587@163.om
+         * sm_id : 10002
          * sm_level : 医师
-         * sm_stid : 10001
-         * sm_stname : 骨科
-         * sm_telephone : 13910000001
-         * sm_userid : 1
-         * sm_username : 张三
+         * sm_sex : 1
+         * sm_stid : 10002
+         * sm_stname : 眼科
+         * sm_telephone : 13910000002
+         * sm_userid : 2
+         * sm_username : 张四
          */
 
         private String sm_companyid;
         private String sm_companyname;
+        private String sm_email;
         private String sm_id;
         private String sm_level;
+        private String sm_sex;
         private String sm_stid;
         private String sm_stname;
         private String sm_telephone;
         private String sm_userid;
         private String sm_username;
-        private String sm_sex;
-        private String sm_email;
-
-        public String getSm_sex() {
-            return sm_sex;
-        }
-
-        public void setSm_sex(String sm_sex) {
-            this.sm_sex = sm_sex;
-        }
-
-        public String getSm_email() {
-            return sm_email;
-        }
-
-        public void setSm_email(String sm_email) {
-            this.sm_email = sm_email;
-        }
 
         public String getSm_companyid() {
             return sm_companyid;
@@ -76,6 +62,14 @@ public class PersonSetingBean   {
             this.sm_companyname = sm_companyname;
         }
 
+        public String getSm_email() {
+            return sm_email;
+        }
+
+        public void setSm_email(String sm_email) {
+            this.sm_email = sm_email;
+        }
+
         public String getSm_id() {
             return sm_id;
         }
@@ -92,6 +86,14 @@ public class PersonSetingBean   {
             this.sm_level = sm_level;
         }
 
+        public String getSm_sex() {
+            return sm_sex;
+        }
+
+        public void setSm_sex(String sm_sex) {
+            this.sm_sex = sm_sex;
+        }
+
         public String getSm_stid() {
             return sm_stid;
         }

app_modular/appme/src/main/res/layout/person_setting_list_activity.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_main"
+    android:background="@color/base_bg"
     >
 
     <com.core.widget.CustomerScrollView
@@ -22,7 +22,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:scrollbars="none"
-                android:background="@color/white">
+                android:layout_marginLeft="25dp"
+                android:layout_marginRight="25dp"
+                android:paddingBottom="20dp">
             </com.core.widget.MyListView>
         </LinearLayout>
     </com.core.widget.CustomerScrollView>

app_modular/appme/src/main/res/layout/psetting_item.xml

@@ -16,7 +16,6 @@
         android:layout_marginTop="15dp"
         android:background="@drawable/text_hint_bg"
         android:text="张三"
-        android:textColor="@color/green"
         android:textSize="16sp"
         />
 
@@ -35,7 +34,6 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="5dp"
                 android:text="北大医院"
-                android:textColor="@color/green"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentLeft="true"
                 android:layout_marginLeft="20dp"
@@ -47,7 +45,6 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="10dp"
                 android:text="骨科"
-                android:textColor="@color/green"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="20dp"/>
             <TextView
@@ -57,7 +54,6 @@
                 android:paddingBottom="5dp"
                 android:paddingTop="10dp"
                 android:text="医师"
-                android:textColor="@color/green"
                 android:layout_below="@+id/department_tv"
                 android:layout_marginRight="20dp"
                 android:layout_alignParentRight="true"
@@ -91,7 +87,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="18122222222"
-                android:textColor="@color/green"
                 android:layout_toRightOf="@+id/champion_im"
                 android:layout_marginLeft="15dp"
                 android:layout_centerVertical="true"/>

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MeetingActivity.java

@@ -29,7 +29,6 @@ import com.core.widget.VoiceSearchView;
 import com.core.widget.listener.EditChangeListener;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.uas.appworks.OA.erp.activity.MeetDetailsActivity;
 import com.uas.appworks.OA.erp.model.MeetEntity;
 import com.uas.appworks.R;
 
@@ -275,7 +274,7 @@ public class MeetingActivity extends BaseActivity  {
             // 状态更新为已结束，否则即使超过会议结束时间状态也是进行中
             String str = entities.get(i).getMa_stage();
             if (str == null || str.trim().length() <= 0) {
-                if (TimeUtils.f_str_2_long(entities.get(i).getMa_starttime()) > System.currentTimeMillis())
+                if (TimeUtils.f_str_2_long(entities.get(i).getMa_starttime())<= System.currentTimeMillis())
                     str = getResources().getString(R.string.doing);
                 else
                     str = getResources().getString(R.string.not_bigan);