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

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

@@ -94,12 +94,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         tv_register= (TextView) findViewById(R.id.tv_register);
         if (CommonUtil.getSharedPreferences(this,"user_phone") != null &&CommonUtil.getSharedPreferences(this, "user_phone").length() > 0) {
             mPhoneNumberEdit.setText(CommonUtil.getSharedPreferences(this, "user_phone"));
-            mPhoneNumberEdit.setFocusable(false);
+      
         
         }
         if (PreferenceUtils.getString(this, PASS_WORDS) != null && PreferenceUtils.getString(this, PASS_WORDS).length() > 0) {
             mPasswordEdit.setText(PreferenceUtils.getString(this, PASS_WORDS));
-            mPasswordEdit.setFocusable(false);
+           
         }
         //登陆账号
         findViewById(R.id.login_btn).setOnClickListener(this);

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

@@ -216,13 +216,13 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
 
     @Override
     public void updateDate(String date,boolean isUpdate) {
-        if (isUpdate) {
-            date_tv.setVisibility(View.GONE);
-            calender_select_ll.setVisibility(View.VISIBLE);
-            click_btn.setText("更新");
-        }else {
+//        if (isUpdate) {
+//            date_tv.setVisibility(View.GONE);
+//            calender_select_ll.setVisibility(View.VISIBLE);
+//            click_btn.setText("更新");
+//        }else {
             date_tv.setText(StringUtils.isEmpty(date) ? "" : date);
-        }
+//        }
     }
 
     @Override
@@ -305,12 +305,12 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
             Crouton.showToast(ct, "考勤时间不能为空", R.color.load_warning);
             return false;
         }
-        if (!"更新".equals(click_btn.getText().toString())){
+//        if (!"更新".equals(click_btn.getText().toString())){
             if (StringUtils.isEmpty(date_tv.getText().toString())) {
                 Crouton.showToast(ct, "考勤日期不能为空", R.color.load_warning);
                 return false;
             }
-        }
+//        }
         if (!ListUtils.isEmpty(mans) || !ListUtils.isEmpty(defaultirs)) {
             showDeleteDialog();
             return false;

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

@@ -442,6 +442,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 calendarView = pagerAdapter.getmViews().get(position);
                 setCalenderOnClicklistener();
                 posItem = position;
+                if (day <= 0) return;  // update:2017-4-21-11:06 这里day未获取到闪退了 已做判空处理
                 calendarView.setDownIndex(day);
                 curDate = calendarView.getDownDate();
                 setDateTag(curDate);

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

@@ -184,8 +184,8 @@ public class PlatContactAddPeopleActivity  extends BaseActivity implements View.
     }
     private void saveJudge() {
         if (user_name_tv.testValidity() && user_sex_tv.testValidity()
-                && user_department_tv.testValidity() && user_job_tv.testValidity()
-                && user_email_tv.testValidity() && user_tel_tv.testValidity()
+                && user_department_tv.testValidity() && user_job_tv.testValidity() &&
+                user_tel_tv.testValidity()&& user_email_tv.testValidity()
                 ){
 
             if (user_email_tv.getText().toString().contains("@")){

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

@@ -34,6 +34,8 @@ import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -137,6 +139,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
     private int detail_id;
     private int deal_type = -1;
     private Boolean change = false;
+    private DBManager manager = new DBManager(this);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -695,13 +698,40 @@ public class PlatWDdetailyActivity extends BaseActivity {
        try{
            JSONObject object = JSON.parseObject(doc_em_data);
            JSONObject dataObject = object.getJSONObject("data");
-           Long em_code = dataObject.getLongValue("emcode");
+           String em_code = dataObject.getLongValue("emcode")+"";
            String em_name = dataObject.getString("wd_emp");
-
-           name_tv.setText(em_name);
-           String imageUri = "drawable://" + R.drawable.common_header_boy;
-           AvatarHelper.getInstance().display(imageUri, photo_im, true);
-
+           name_tv.setText(em_name+"");
+           if (!StringUtils.isEmpty((em_code))){
+               String whichsys = CommonUtil.getMaster();
+               String[] selectionArgs = {em_code == null ? "" : em_code, whichsys};
+               String selection = "em_code=? and whichsys=? ";
+               try {
+                   //获取数据库数据
+                   EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                   if (bean != null) {
+                       LogUtil.prinlnLongMsg("bean",JSON.toJSONString(bean));
+                       String imId = String.valueOf(bean.getEm_IMID());
+                       String imName = String.valueOf(bean.getEM_NAME());
+                       String imDepartment = String.valueOf(bean.getEM_DEFAULTORNAME());
+                       String imPosition = String.valueOf(bean.getEM_POSITION());
+
+                       name_tv.setText(imName);
+                       if (!StringUtils.isEmpty(imId)) {
+                           AvatarHelper.getInstance().display(imId, photo_im, true, false);
+                       } else {
+                           String imageUri = "drawable://" + R.drawable.common_header_boy;
+                           AvatarHelper.getInstance().display(imageUri, photo_im, true);
+                       }//显示圆角图片
+                       section_tv.setText(imDepartment + ">" + imPosition);
+
+                       Log.i("aptodo", "imId=" + imId + "imName" + imName + "imDepartment" + imDepartment + "imPosition" + imPosition);
+                   } else {
+                       ToastMessage("单据申请人数据获取异常");
+                   }
+               } catch (Exception e) {
+                   e.printStackTrace();
+               }
+           }
            Log.i("em_name,em_code",em_name + "," + em_code);
        }catch (Exception e){
            e.printStackTrace();

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

@@ -93,9 +93,17 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         goods_find.setOnClickListener(this);
         if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_oa)){
             tv_menu_oa.setVisibility(View.GONE);
+            tv_desc_business.setVisibility(View.GONE);
+            iv_business_desc.setVisibility(View.GONE);
+            tv_oa_desc.setVisibility(View.GONE);
+            iv_desc_oa.setVisibility(View.GONE);
         }
         if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_business)){
             tv_business_num.setVisibility(View.GONE);
+            tv_desc_business.setVisibility(View.GONE);
+            iv_business_desc.setVisibility(View.GONE);
+            tv_oa_desc.setVisibility(View.GONE);
+            iv_desc_oa.setVisibility(View.GONE);
         }
         
         tv_menu_oa.setOnClickListener(new View.OnClickListener() {

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

@@ -123,14 +123,14 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
             iAddFlihtsView.showToast("请填写考勤时间", R.color.load_error);
             return;
         }
-        if (!isUpdate){
+//        if (!isUpdate){
             if (!StringUtils.isEmpty(model.getDay())) {
                 formStore.put("wd_day", model.getDay());
             } else {
                 iAddFlihtsView.showToast("请填写考勤日期", R.color.load_error);
                 return;
             }
-        }
+//        }
 
         //start 人员数据
         EmployeesModel employeesModel = model.getEmployeesModel();

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

@@ -43,6 +43,8 @@ import com.xzjmyk.pm.activity.ui.erp.activity.PlatLeaveAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -111,6 +113,8 @@ public class FormDetailActivity extends BaseActivity {
     private TextView doc_em_name_tv;
     @ViewInject(R.id.common_docui_photo_img)
     private ImageView photo_im;
+    @ViewInject(R.id.common_docui_Section_tv)
+    private TextView section_tv;
     List<LinkedHashMap<String, String>> datas = new ArrayList<>();
     List<LinkedHashMap<String, String>> details = new ArrayList<>();
     private int mkeyValue = -1;
@@ -138,7 +142,7 @@ public class FormDetailActivity extends BaseActivity {
     private int fpd_id;
     private int wod_id;
     private Boolean change = false;
-
+    private DBManager manager = new DBManager(this);
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -918,7 +922,7 @@ public class FormDetailActivity extends BaseActivity {
 
         }
     }
-
+    private String em_code;
     private void doShowDocEmData(String doc_em_data) {
         JSONObject Object = JSON.parseObject(doc_em_data);
         JSONObject dataObject = Object.getJSONObject("data");
@@ -939,11 +943,44 @@ public class FormDetailActivity extends BaseActivity {
                     wod_id = dataObject.getJSONArray("workovertimedet").getJSONObject(0).getInteger("wod_id");
                     break;
             }
-
+            em_code = dataObject.getLongValue("emcode")+"";
+            getapplypeomsg(em_code);
             doStatusShow(status, doc_em_name);
         }
     }
 
+    private void getapplypeomsg(String em_code) {
+        if (!StringUtils.isEmpty((em_code))){
+            String whichsys = CommonUtil.getMaster();
+            String[] selectionArgs = {em_code == null ? "" : em_code, whichsys};
+            String selection = "em_code=? and whichsys=? ";
+            try {
+                //获取数据库数据
+                EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                if (bean != null) {
+                    String imId = String.valueOf(bean.getEm_IMID());
+                    String imName = String.valueOf(bean.getEM_NAME());
+                    String imDepartment = String.valueOf(bean.getEM_DEFAULTORNAME());
+                    String imPosition = String.valueOf(bean.getEM_POSITION());
+
+                    if (!StringUtils.isEmpty(imId)) {
+                        AvatarHelper.getInstance().display(imId, photo_im, true, false);
+                    } else {
+                        String imageUri = "drawable://" + R.drawable.common_header_boy;
+                        AvatarHelper.getInstance().display(imageUri, photo_im, true);
+                    }//显示圆角图片
+                    section_tv.setText(imDepartment + ">" + imPosition);
+
+                    Log.i("aptodo", "imId=" + imId + "imName" + imName + "imDepartment" + imDepartment + "imPosition" + imPosition);
+                } else {
+                    ToastMessage("单据申请人数据获取异常");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     private void doShowDocDetails(String com_doc_details) {
         JSONObject Object = JSON.parseObject(com_doc_details);
         JSONObject dataObject = Object.getJSONObject("data");
@@ -1039,6 +1076,9 @@ public class FormDetailActivity extends BaseActivity {
             }
             LogUtil.prinlnLongMsg("doc_key,doc_value,mkeyValue,detail_id", doc_key + "," + doc_value + "," + mkeyValue + "," + detail_id);
             LogUtil.prinlnLongMsg("doc_detail_key,doc_detail_value", doc_detail_key + ":" + doc_detail_value);
+
+            em_code = dataObject.getLongValue("emcode") + "";
+            getapplypeomsg(em_code);
         } else {
             a_and_disa_ll.setVisibility(View.GONE);
             hide_above_af.setVisibility(View.GONE);

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

@@ -6,9 +6,9 @@ package com.xzjmyk.pm.activity.wxapi;
  * 在ApiModel中定义公共逻辑方法
  */
 public class ApiPlatform extends ApiBase implements ApiModel {
-//
-      //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://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
 

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

@@ -76,6 +76,7 @@ public class NewStepListActivity extends BaseActivity {
             muuStepNumAdapter.setStepEntityList(stepEntityList);
             step_num_lv.setAdapter(muuStepNumAdapter);
         }
+//        stepDataDao.startThread();
     }
     public class UuStepNumAdapter extends BaseAdapter {
         private List<StepEntity> stepEntityList;

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

@@ -1,23 +1,25 @@
 <!--登录界面-->
-<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:focusable="true"
+        android:focusableInTouchMode="true">
+
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/iv_head"
             android:layout_width="80dp"
-            android:layout_height="80dp" 
+            android:layout_height="80dp"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="50dp"
             android:layout_marginBottom="20dp"
-            android:src="@drawable/login_header"/>
+            android:layout_marginTop="50dp"
+            android:src="@drawable/login_header" />
+
         <LinearLayout
             android:id="@+id/ll_content"
             android:layout_width="match_parent"
@@ -25,53 +27,59 @@
             android:layout_below="@+id/iv_head"
             android:layout_marginBottom="10dp"
             android:orientation="vertical">
-          <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="match_parent"
-                  android:gravity="center"
-                  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>
-         
+
+            <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="match_parent"
+                    android:background="@color/white"
+                    android:gravity="center"
+                    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:background="@color/white"
+                    android:hint="@string/please_input_phone_number"
+                    android:inputType="phone"
+
+                    android:paddingBottom="0dp"
+                    android:paddingTop="0dp" />
+            </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="match_parent"
-                android:gravity="center"
-                android:paddingLeft="10dp"
-                android:text="密码    |"/>
-            <!--    android:drawableLeft="@drawable/loginpw"-->
-            <com.xzjmyk.pm.activity.view.ClearEditText
-                android:id="@+id/password_edit"
-                style="@style/IMLineEditPass"
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:background="@color/white"
-            
-                android:hint="@string/please_input_password" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:gravity="center"
+                    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:hint="@string/please_input_password" />
             </LinearLayout>
-            
+
 
             <Button
                 android:id="@+id/login_btn"
@@ -82,30 +90,31 @@
                 android:layout_marginTop="10dp"
                 android:background="@drawable/bg_bule_btn"
                 android:text="登  录"
-                android:textSize="@dimen/text_main"
-                android:textColor="@color/white" />
-            
-          
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+
+
         </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:textColor="@color/titleBlue"
-            android:text="忘记密码"/>
-        
+
+            android:text="忘记密码"
+            android:textColor="@color/titleBlue" />
+
         <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:text="新用户注册"/>
+
+            android:text="新用户注册"
+            android:textColor="@color/titleBlue" />
     </RelativeLayout>
 </ScrollView>