Bitliker:合并发布版本代码

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

@@ -67,6 +67,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import static com.xzjmyk.pm.activity.R.id.me_nickname_tv;
+import static com.xzjmyk.pm.activity.R.id.tv_name_value;
 
 /**
  * 个人资料页面
@@ -83,7 +84,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
     private TextView tv_birthday;
     @ViewInject(R.id.me_address_tv)
     private TextView tv_address;
-    @ViewInject(R.id.tv_name_value)
+    @ViewInject(tv_name_value)
     private TextView tv_name;
     @ViewInject(R.id.tv_tel_value)
     private TextView tv_tel;
@@ -171,23 +172,17 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
         }
         tv_birthday.setText(TimeUtils.sk_time_s_long_2_str(mTempData.getBirthday()));
         //查询数据库
-        DBManager dbManager = new DBManager(this);
+        DBManager dbManager = new DBManager();
         String userId = mUser.getUserId();
-        String whichsys = CommonUtil.getSharedPreferences(this, "erp_master");
+        String whichsys = CommonUtil.getMaster();
         List<EmployeesEntity> entities = dbManager.select_getEmployee(new String[]{userId, whichsys}, "em_imid=? and whichsys=?");
+        dbManager.closeDB();
         if (ListUtils.isEmpty(entities)) {
-//            tv_nickname.setText(mTempData.getNickName());
             mNickname = mTempData.getNickName();
         } else {
-//            tv_nickname.setText(entities.get(0).getEM_NAME());
-            tv_name.setText(entities.get(0).getEM_NAME());
-            tv_tel.setText(mTempData.getTelephone());
-            tv_depart.setText(entities.get(0).getEM_DEFAULTORNAME());
-            tv_position.setText(entities.get(0).getEM_POSITION());
             mNickname = entities.get(0).getEM_NAME();
         }
-        // mNameEdit.setText(mTempData.getNickName());
-
+        initEmployee(entities);
         if (!StringUtils.isEmpty(Area.getCityAreaString(0, mTempData.getAreaId()))) {
             tv_address.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId())
                     + "-" + Area.getCityAreaString(0, mTempData.getAreaId()));
@@ -200,6 +195,46 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
         AvatarHelper.getInstance().displayAvatar(mTempData.getUserId(), iv_headImage, true);
     }
 
+    private void initEmployee(List<EmployeesEntity> entities) {
+        String name = "";
+        String phone = "";
+        String depart = "";
+        String position = "";
+        if (!ListUtils.isEmpty(entities)) {
+            EmployeesEntity employeesEntity = entities.get(0);
+            if (employeesEntity != null) {
+                name = employeesEntity.getEM_NAME();
+                phone = employeesEntity.getEM_MOBILE();
+                depart = employeesEntity.getEM_DEPART();
+                position = employeesEntity.getEM_POSITION();
+            }
+        }
+        if (isNull(name))
+            name = CommonUtil.getName();
+        if (isNull(phone))
+            phone = CommonUtil.getSharedPreferences(ct, "user_phone");
+        tv_name.setText(getNotNull(name));
+        tv_tel.setText(getNotNull(phone));
+        tv_depart.setText(getNotNull(depart));
+        tv_position.setText(getNotNull(position));
+    }
+
+    private boolean isNull(String str) {
+        if (StringUtils.isEmpty(str))
+            return true;
+        if ("未填写".equals(str.trim()))
+            return true;
+        return false;
+    }
+
+    private String getNotNull(String str) {
+        if (StringUtils.isEmpty(str))
+            return "未填写";
+        return str;
+
+
+    }
+
     @Override
     public void onClick(View v) {
         int id = v.getId();

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

@@ -94,40 +94,18 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        LogUtil.i("requestCode == " + requestCode);
-        LogUtil.i("resultCode == " + resultCode);
-        if (requestCode == 0x322) {
-            loadProcesstoAlreadyDo(1);
-            return;
-        } else if (requestCode == 0x321) {
-            loadProcessToDo(1);
-        }
         if (data == null) {
             LogUtil.i("data == null");
             return;
         }
-        String delete_succeed = data.getStringExtra("delete_succeed");
-        LogUtil.i("delete_succeed == " + delete_succeed);
-        if (!StringUtils.isEmpty(delete_succeed) && delete_succeed.equals("delete_succeed")) {
-            LogUtil.i("requestCode == " + requestCode);
-            LogUtil.i("resultCode == " + resultCode);
-            if (requestCode == 0x322 && resultCode == PlatWDdetailyActivity.DELETE_SUCCEED) {
-                LogUtil.i("进来第一个");
-                try {
+        boolean isRemove = data.getBooleanExtra("isRemove", false);
+        if (isRemove) {
+            if (requestCode == 0x322 || requestCode == 0x321) {
+                if (!ListUtils.isEmpty(arrayUn)&&arrayUn.size()>mPosition){
                     arrayUn.remove(mPosition);
+                    mAdapter.jsonArray=arrayUn;
                     mAdapter.notifyDataSetChanged();
-                } catch (Exception e) {
-                    loadProcessToDo(page);
-                }
-            } else if (requestCode == 0x321 && resultCode == 0x328) {
-                LogUtil.i("进来第二个");
-                try {
-                    arrayRe.remove(mPosition);
-                    mAdapter.notifyDataSetChanged();
-                } catch (Exception e) {
-                    loadProcesstoAlreadyDo(pageDone);
                 }
-
             }
         }
     }
@@ -144,11 +122,11 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                     if (page == 1) arrayUn.clear();
                     arrayUn.addAll(itemArray);
 //                    array = CommonUtil.sortJsonArray(array);//排序
-
                     if (mAdapter == null) {
                         mAdapter = new ProcessAdapter(ct, arrayUn);
                         mList.setAdapter(mAdapter);
                     } else {
+                        mAdapter.setJsonArray(arrayUn);
                         mAdapter.notifyDataSetChanged();
                     }
                     if (arrayUn.size() == 0) {
@@ -170,6 +148,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                         mAdapter = new ProcessAdapter(ct, arrayRe);
                         mList.setAdapter(mAdapter);
                     } else {
+                        mAdapter.setJsonArray(arrayRe);
                         mAdapter.notifyDataSetChanged();
                     }
                     if (arrayRe.size() == 0) {
@@ -556,6 +535,10 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
             this.inflater = LayoutInflater.from(ct);
         }
 
+        public void setJsonArray(JSONArray jsonArray) {
+            this.jsonArray = jsonArray;
+        }
+
         @Override
         public int getCount() {
             return jsonArray == null ? 0 : jsonArray.size();

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

@@ -31,6 +31,9 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -224,7 +227,7 @@ public class ChangeMobileActivity extends BaseActivity {
                     isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
                     if (type == 2) {
                         if (isB2b)
-                            suppleSigninByB2b(message);
+                            suppleB2bSignin(message);
                         else
                             suppleSignin(message);
                     } else
@@ -269,6 +272,24 @@ public class ChangeMobileActivity extends BaseActivity {
         startActivityForResult(intent, 0x22);
     }
 
+
+    private void suppleB2bSignin(String message) {
+        progressDialog.show();
+        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().saveSignApp;
+        Map<String, Object> formStore = new HashMap<>();
+        formStore.put("emuu", CommonUtil.getEmcode());
+        formStore.put("remark", message);
+        formStore.put("mobile", MyApplication.getInstance().mLoginUser.getTelephone());
+        formStore.put("signtime", getTime(tag));
+        formStore.put("address", MyApplication.getInstance().getBdLocationHelper().getAddress());
+        formStore.put("uu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
+        Map<String, Object> param = new HashMap<>();
+        param.put("formStore", StringUtils.mapToJson(formStore));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x13, null, null, "post");
+    }
+
     /*申请申诉*/
     private void suppleSignin(String message) {
         progressDialog.show();
@@ -291,9 +312,27 @@ public class ChangeMobileActivity extends BaseActivity {
         params.put("ms_signtime", getTime(tag));//申诉时间
         String formStore = StringUtils.mapToJson(params);
         param.put("formStore", formStore);
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x13, null, null, "post");
+        Request request = new Request.Bulider()
+                .setWhat(0x13)
+                .setMode(Request.Mode.POST)
+                .setParam(param)
+                .setUrl(url)
+                .bulid();
+
+        OAHttpHelper.getInstance().requestHttp(request, new OnHttpResultListener() {
+            @Override
+            public void result(int what, boolean isJSON, String message, Bundle bundle) {
+                endActivity();
+            }
+
+            @Override
+            public void error(int what, String message, Bundle bundle) {
+                if (!StringUtils.isEmpty(message))
+                    Crouton.showToast(ct, message, R.color.load_error);
+            }
+        });
+
+
     }
 
     private void suppleSigninByB2b(String message) {

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

@@ -26,6 +26,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.OnGetRoutePlanResult;
@@ -169,10 +170,11 @@ public class NavigationActivity extends BaseActivity {
         String title = "导航";
         url = "www.baidu.com";
         LogUtil.i(url);
-        Intent intent = new Intent(ct, NavigationWebActivity.class);
-        intent.putExtra("title", title)
-                .putExtra("url", url);
-        startActivity(intent);
+        ViewUtil.webLinks(ct, url, title);
+//        Intent intent = new Intent(ct, NavigationWebActivity.class);
+//        intent.putExtra("title", title)
+//                .putExtra("url", url);
+//        startActivity(intent);
     }
 
     private void toBaiduWebMap() {

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

@@ -98,6 +98,8 @@ public abstract class ApiBase {
     public String second_msg_detaily; // 消息第二层红点
     public String back_ids;
     public String add_people;
+    public String saveSignApp;//提交申述
+
     public String getCommon_delete_approval_flow_url() {
         return common_delete_approval_flow_url;
     }

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

@@ -96,6 +96,7 @@ public class ApiPlatform extends ApiBase implements ApiModel {
         super.releaseCount = mBaseUrl + "mobile/release/count";
         super.countBack = mBaseUrl + "mobile/release/count/back";
         super.add_people = mBaseUrl + "mobile/adduser/user";
+        super.saveSignApp = mBaseUrl + "mobile/signapp/saveSignApp";
 
 
         /*strat by Bitliker*/ //外勤

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

@@ -1,95 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/top"
     android:layout_width="match_parent"
-    android:background="@color/antionbarcolor"
     android:layout_height="?attr/actionBarSize"
-    android:orientation="horizontal"
-    android:gravity="center"
-    >
-    <RelativeLayout
-        android:id="@+id/top"
+    android:background="@color/antionbarcolor">
+
+    <ImageView
+        android:id="@+id/back"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:src="@drawable/back" />
+
+    <LinearLayout
+        android:id="@+id/ll_top_state"
         android:layout_width="match_parent"
-        android:background="@color/antionbarcolor"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="40dp"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="13dp"
+        android:layout_marginLeft="50dp"
+        android:layout_marginRight="50dp"
+        android:layout_marginTop="13dp"
+        android:background="@drawable/shape_process_linear"
         android:orientation="horizontal"
-        android:gravity="center"
-        >
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:src="@drawable/back"
-            />
-        <LinearLayout
-
-            android:gravity="center_vertical"
-            android:id="@+id/ll_top_state"
-            android:layout_width="match_parent"
-            android:layout_centerInParent="true"
-            android:layout_marginLeft="60dp"
-            android:layout_marginRight="60dp"
-            android:layout_marginBottom="13dp"
-            android:layout_marginTop="13dp"
-            android:layout_height="40dp"
-            android:padding="1dp"
-            android:background="@drawable/shape_process_linear"
-            android:orientation="horizontal"
-            android:weightSum="3">
+        android:padding="1dp"
+        android:weightSum="3">
 
-            <TextView
-                android:id="@+id/wait_tv"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:gravity="center"
-                android:background="@drawable/shape_process_item"
-                android:layout_weight="1"
-                android:text="待处理"
-                android:textColor="@color/selector_schedule_text"
-                />
+        <TextView
+            android:id="@+id/wait_tv"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:background="@drawable/shape_process_item"
+            android:gravity="center"
+            android:text="待处理"
+            android:textColor="@color/selector_schedule_text" />
 
-            <TextView
-                android:id="@+id/done_tv"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:background="@drawable/shape_process_item"
-                android:textColor="@color/selector_schedule_text"
-                android:gravity="center"
-                android:text="已处理"
-                />
+        <TextView
+            android:id="@+id/done_tv"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="5dp"
+            android:layout_weight="1"
+            android:background="@drawable/shape_process_item"
+            android:gravity="center"
+            android:paddingLeft="10dp"
+            android:text="已处理"
+            android:textColor="@color/selector_schedule_text" />
 
-            <TextView
-                android:id="@+id/isend_tv"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:background="@drawable/shape_process_item"
-                android:textColor="@color/selector_schedule_text"
-                android:gravity="center"
-                android:text="我发起的"
-                />
+        <TextView
+            android:id="@+id/isend_tv"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:background="@drawable/shape_process_item"
+            android:gravity="center"
+            android:text="我发起的"
+            android:textColor="@color/selector_schedule_text" />
 
-        </LinearLayout>
+    </LinearLayout>
 
 
-        <!--<TextView-->
-        <!--android:id="@+id/title"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_centerInParent="true"-->
-        <!--android:drawableRight="@drawable/down"-->
-        <!--android:textColor="@color/white"-->
-        <!--android:textSize="@dimen/text_main" />-->
+    <!--<TextView-->
+    <!--android:id="@+id/title"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_centerInParent="true"-->
+    <!--android:drawableRight="@drawable/down"-->
+    <!--android:textColor="@color/white"-->
+    <!--android:textSize="@dimen/text_main" />-->
 
-        <!--  <ImageView
-              android:id="@+id/seting"
-              android:layout_width="40dp"
-              android:layout_height="match_parent"
-              android:layout_alignParentRight="true"
-              android:padding="8dp"
-              android:src="@drawable/setting" />-->
-    </RelativeLayout>
-</LinearLayout>
+    <!--  <ImageView
+          android:id="@+id/seting"
+          android:layout_width="40dp"
+          android:layout_height="match_parent"
+          android:layout_alignParentRight="true"
+          android:padding="8dp"
+          android:src="@drawable/setting" />-->
+</RelativeLayout>