提交内容 新代码上传,修复bug

提交内容   修复设备管理新需求,修复商旅一些bug,修复实时看板的横屏问题

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

@@ -144,9 +144,10 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
             getSupportActionBar().setTitle(msg_title);
         }
         String StartApp = intent.getStringExtra("isStartApp");//参数账套
-        if (intent.getBooleanExtra("orientation",false)){
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-        }
+//        if (intent.getBooleanExtra("orientation",false)){
+//            LogUtil.i("jinlai sssss");
+//            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+//        }
         mSubsAct = intent.getStringExtra("subsact");
         mPosition = intent.getIntExtra("position", -1);
         mSubscriptionMessages = (ArrayList<SubMessage>) intent.getSerializableExtra("subsdata");

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Mar 23 15:27:00 CST 2018
-debugName=325
+#Tue Mar 27 08:40:21 CST 2018
+debugName=349
 versionName=624
-debugCode=325
+debugCode=349
 versionCode=163

app_core/common/src/main/java/com/core/app/ActionBackActivity.java

@@ -67,7 +67,6 @@ public class ActionBackActivity extends StackActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayShowHomeEnabled(true);

app_core/common/src/main/java/com/core/base/BaseActivity.java

@@ -91,7 +91,11 @@ public abstract class BaseActivity extends ActionBackActivity {
         activity = this;
         setNotTouchEvent(true);
         mFastVolley = MyApplication.getInstance().getFastVolley();
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
+        Intent intent=getIntent();
+        if (intent==null||intent.getBooleanExtra("ORIENTATION_PORTRAIT",true)){
+           LogUtil.i("ORIENTATION_PORTRAIT");
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
+        }
         progressDialog = CustomProgressDialog.createDialog(this);
 
         //重启之后恢复到之前的语言

app_core/common/src/main/java/com/core/base/StackActivity.java

@@ -11,7 +11,6 @@ public class StackActivity extends DefaultResourceActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
 		ActivityStack.getInstance().push(this);
 	}
 

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
+import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -1065,7 +1066,9 @@ public class ViewUtil {
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
         url = url + "mobile/login.action";
-//        url = CommonUtil.getAppBaseUrl(MyApplication.getInstance()) + "mobile/login.action";
+//        if (BaseConfig.isDebug()){
+//            url = CommonUtil.getAppBaseUrl(MyApplication.getInstance()) + "mobile/login.action";
+//        }
         Map<String, String> params = new HashMap<String, String>();
         params.put("username", username);
         params.put("password", password);

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -106,7 +106,7 @@ public class CommonUtil {
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
 //        if (BaseConfig.isDebug()){
-//            baseUrl="http://192.168.253.203:8090/ERP/";
+//            baseUrl="http://192.168.253.35:8080/ERP/";
 //        }
 //        baseUrl = "http://192.168.253.29:8080/ERP/";
 

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/RealTimeFormActivity.java

@@ -60,7 +60,7 @@ public class RealTimeFormActivity extends BaseActivity {
                 Intent intent = new Intent("com.modular.main.WebViewCommActivity");
                 intent.putExtra("url", url);
                 intent.putExtra("title", title);
-                intent.putExtra("orientation", true);
+                intent.putExtra("ORIENTATION_PORTRAIT", false);
                 intent.putExtra("cookie", true);
                 startActivity(intent);
             }

app_modular/apputils/src/main/java/com/modular/apputils/utils/TravelUtils.java

@@ -1,5 +1,9 @@
 package com.modular.apputils.utils;
 
+import android.text.TextUtils;
+
+import com.common.data.TextUtil;
+
 /**
  * Created by Bitlike on 2018/3/23.
  */
@@ -7,10 +11,15 @@ package com.modular.apputils.utils;
 public class TravelUtils {
 
     //TODO 差旅卡号
-    public static String getTraveCode(String master) {
-        switch (master) {
-            default:
-                return master;
+    public static String getTraveCode(String cusCode, String master) {
+        if (TextUtils.isEmpty(cusCode)) {
+            switch (master) {
+                default:
+                    return master;
+            }
+        } else {
+            return cusCode;
         }
+
     }
 }

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceCycleCountDetailsActivity.java

@@ -128,12 +128,13 @@ public class DeviceCycleCountDetailsActivity extends BaseActivity {
             String field = JSONUtil.getText(item, "dataIndex", "field", "dg_field");
             String caption = JSONUtil.getText(item, "caption", "dg_caption");
             int width = JSONUtil.getInt(item, "width", "dg_appwidth");
-            String  type = JSONUtil.getText(item, "dg_type", "type");
-            String values =null;
-            if (type.equals("datefield")){
-                values = DateFormatUtil.long2Str(JSONUtil.getLong(data, field.toUpperCase()),"yyyy-MM-dd");
-            }else{
-                  values = JSONUtil.getText(data, field.toUpperCase());
+            String type = JSONUtil.getText(item, "dg_type", "type");
+            String values = null;
+
+            if (type.equals("datefield")) {
+                values = DateFormatUtil.long2Str(JSONUtil.getLong(data, field.toUpperCase()), "yyyy-MM-dd");
+            } else {
+                values = JSONUtil.getText(data, field.toUpperCase());
             }
 
             CycleCount.Data o = new CycleCount.Data(caption, values);
@@ -155,7 +156,13 @@ public class DeviceCycleCountDetailsActivity extends BaseActivity {
 //                i++;
 //            }
             if (width > 0) {
-                cycleCount.addData(o);
+                if (caption.equals("设备编号")) {
+                    cycleCount.addData(0, o);
+                } else if (caption.equals("设备名称") && ListUtils.getSize(cycleCount.getDatas()) > 1) {
+                    cycleCount.addData(1, o);
+                } else {
+                    cycleCount.addData(o);
+                }
             }
         }
         return cycleCount;
@@ -177,7 +184,7 @@ public class DeviceCycleCountDetailsActivity extends BaseActivity {
         } else {
             mAdapter.setModels(models);
         }
-        if (ListUtils.isEmpty(models)){
+        if (ListUtils.isEmpty(models)) {
             mEmptyLayout.showEmpty();
         }
     }

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/model/CycleCount.java

@@ -1,5 +1,7 @@
 package com.uas.appworks.CRM.erp.model;
 
+import com.common.data.ListUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -57,10 +59,29 @@ public class CycleCount {
             lowDatas.add(data);
         } else if (lowDatas.size() < 3) {
             lowDatas.add(data);
+            if (ListUtils.getSize(lowDatas) > 3) {
+                lowDatas.remove(lowDatas.size() - 1);
+            }
         }
         this.datas.add(data);
     }
 
+    public void addData(int i, Data data) {
+        if (this.datas == null) {
+            this.datas = new ArrayList<>();
+        }
+        if (lowDatas == null) {
+            lowDatas = new ArrayList<>();
+            lowDatas.add(data);
+        } else {
+            lowDatas.add(i, data);
+            if (ListUtils.getSize(lowDatas) > 3) {
+                lowDatas.remove(lowDatas.size() - 1);
+            }
+        }
+        this.datas.add(i, data);
+    }
+
     public static class Data {
         private boolean hasTwo;
         private String caption;

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

@@ -49,6 +49,7 @@ import com.core.widget.SquareCenterImageView;
 import com.core.widget.view.MyGridView;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appworks.CRM.erp.activity.DeviceDataFormAddActivity;
+import com.uas.appworks.CRM.erp.activity.TravelBusinessActivity;
 import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
 import com.uas.appworks.OA.erp.activity.form.FormListSelectActivity;
 import com.uas.appworks.OA.erp.adapter.ComDocGriddataOutAdapter;
@@ -57,6 +58,7 @@ import com.uas.appworks.OA.erp.model.CommonApprovalFlowBean;
 import com.uas.appworks.OA.erp.model.CommonDocAMBean;
 import com.uas.appworks.OA.erp.utils.approvautils.ApprovaNodeUtil;
 import com.uas.appworks.OA.erp.utils.approvautils.NodeAdapter;
+import com.uas.appworks.OA.platform.activity.BusinessTravelActivity;
 import com.uas.appworks.R;
 import com.uas.appworks.activity.DeviceQueryActivity;
 
@@ -309,7 +311,16 @@ public class CommonDocDetailsActivity extends BaseActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (!"FeePlease!FYBX".equals(mCaller) && !device) {
-            getMenuInflater().inflate(R.menu.menu_add_icon, menu);
+            getMenuInflater().inflate(R.menu.menu_common_docdetails, menu);
+            MenuItem item = menu.getItem(0);
+            String title = null;
+            if (getSupportActionBar() != null && getSupportActionBar().getTitle() != null) {
+                title = getSupportActionBar().getTitle().toString();
+            }
+            if (real_status==null||!(real_status.equals("已提交")||real_status.equals("已审核"))
+            ||title == null || !"出差单详情".equals(title)) {
+                item.setVisible(false);
+            }
         }
         return super.onCreateOptionsMenu(menu);
     }
@@ -321,6 +332,9 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     .putExtra("caller", mCaller).putExtra("title", mTitle)
             );
             finish();
+        }else if (R.id.toTravel==item.getItemId()){
+            startActivity(new Intent(ct, BusinessTravelActivity.class));
+            finish();
         }
         if (item.getItemId() == android.R.id.home) {
             if (message) {

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/BusinessTravelActivity.java

@@ -8,7 +8,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.PopupWindow;
-import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -18,9 +17,7 @@ import com.common.config.BaseConfig;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
-import com.common.data.StringUtil;
 import com.common.hmac.Md5Util;
-import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
 import com.core.net.utils.NetUtils;
 import com.core.utils.CommonUtil;
@@ -50,7 +47,8 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
     private BaseRefreshLayout mRefreshLayout;
     private EmptyRecyclerView mRecyclerView;
     private BusinessTravelAdapter mAdapter;
-    private boolean isLeve = true;
+    private boolean isLead = false;
+    private String cusCode;
 
     @Override
     protected int getLayoutId() {
@@ -64,16 +62,18 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_add_travel, menu);
-        return super.onCreateOptionsMenu(menu);
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        LogUtil.i("onPrepareOptionsMenu=" + isLead);
+        if (isLead) {
+            getMenuInflater().inflate(R.menu.menu_add_travel, menu);
+        }
+        return super.onPrepareOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (R.id.addTravel == item.getItemId()) {
             reserve();
-
         }
         return super.onOptionsItemSelected(item);
     }
@@ -152,7 +152,6 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
 
     @Override
     public void onFailure(int what, String message, Tags tags) throws Exception {
-
         mRefreshLayout.stopRefresh();
         dismissProgress();
     }
@@ -161,6 +160,13 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
     private void handlerData(String message) throws Exception {
         LogUtil.i("handlerData");
         JSONObject object = JSON.parseObject(message);
+        int isLead = JSONUtil.getInt(object, "isLead");
+        cusCode = JSONUtil.getText(object, "travelCard");
+        //表示可以预定
+        this.isLead = isLead > 0;
+        if (this.isLead) {
+            supportInvalidateOptionsMenu();
+        }
         JSONArray listdata = JSONUtil.getJSONArray(object, "listdata");
         List<BusinessTravel> models = new ArrayList<>();
         String cttpid = JSONUtil.getText(object, "em_iccode");
@@ -177,7 +183,7 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
                 }
             }
             if (!ListUtils.isEmpty(gridModels)) {
-                models.add(new BusinessTravel(JSONUtil.getText(data, "FP_ID")));
+                models.add(new BusinessTravel(JSONUtil.getText(data, "FP_CODEDoc")));
                 models.addAll(gridModels);
             }
         }
@@ -187,15 +193,14 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
 
     private void setAdapter(List<BusinessTravel> models) {
         if (mAdapter == null) {
-            mAdapter = new BusinessTravelAdapter(ct, models);
+            mAdapter = new BusinessTravelAdapter(ct, cusCode, models);
             mRecyclerView.addItemDecoration(new SpaceItemDecoration(30));
             mRecyclerView.setLayoutManager(new LinearLayoutManager(ct));
             mRecyclerView.setAdapter(mAdapter);
         } else {
             mAdapter.setModels(models);
         }
-
-        if (ListUtils.isEmpty(models) && isLeve) {
+        if (ListUtils.isEmpty(models) && isLead) {
             showPop();
         }
     }
@@ -234,7 +239,7 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
         Map<String, String> custinfoMap = new HashMap<>();
         custinfoMap.put("backUrl", CommonUtil.getAppBaseUrl(ct));
         custinfoMap.put("isNeedPush", "1");
-        custinfoMap.put("cusCode", TravelUtils.getTraveCode(CommonUtil.getMaster()));//TODO 差旅卡号
+        custinfoMap.put("cusCode", TravelUtils.getTraveCode(cusCode, CommonUtil.getMaster()));//TODO 差旅卡号
         custinfoMap.put("emCode", CommonUtil.getEmcode());
         custinfoMap.put("outOrderno", String.valueOf(-1));
         map.put("custinfo", custinfoMap);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/adapter/BusinessTravelAdapter.java

@@ -2,6 +2,7 @@ package com.uas.appworks.OA.platform.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -41,9 +42,11 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
     private Context ct;
     private List<BusinessTravel> models;
     private String currentName;
+    private String cusCode;
 
-    public BusinessTravelAdapter(Context ct, List<BusinessTravel> models) {
+    public BusinessTravelAdapter(Context ct,String cusCode, List<BusinessTravel> models) {
         this.ct = ct;
+        this.cusCode = cusCode;
         this.models = models;
         this.currentName = CommonUtil.getName();
     }
@@ -152,7 +155,12 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         holder.toDateTv.setText(DateFormatUtil.long2Str(model.getEndTime(), "yyyy-MM-dd"));
         holder.toTimeTv.setText(DateFormatUtil.long2Str(model.getEndTime(), "HH:mm"));
         //行程
-        holder.tripTv.setText(fromCity + "-" + toCity);
+
+        if (TextUtils.isEmpty(fromCity)||TextUtils.isEmpty(toCity)){
+            holder.tripTv.setText(fromCity + "" + toCity);
+        }else{
+            holder.tripTv.setText(fromCity + "-" + toCity);
+        }
         holder.mTravelDirectionView.setData(model.getFlightCode(), model.getAllTime());
         //改签
         if (StringUtil.getText(holder.doneTv).equals(DONE_CANCEL) && 1 == 2) {
@@ -290,7 +298,6 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             toTimeTv = (TextView) itemView.findViewById(R.id.toTimeTv);
             orderTypeTv = (TextView) itemView.findViewById(R.id.orderTypeTv);
             tripTv = (TextView) itemView.findViewById(R.id.tripTv);
-
         }
     }
 
@@ -355,7 +362,7 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         routeMap.put("arrivecode", arrivecode);
         routeMap.put("startdate", DateFormatUtil.long2Str(model.getStartTime(), DateFormatUtil.YMD));
         routeMap.put("arrivedate", DateFormatUtil.long2Str(model.getEndTime(), DateFormatUtil.YMD));
-        routeMap.put("isCanModify", "0");
+        routeMap.put("isCanModify", "1");
         map.put("route", routeMap);
 
         //个人中心
@@ -381,7 +388,7 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         map.put("fpd_id", model.getId());
         map.put("master", CommonUtil.getMaster());
         map.put("baseUrl", CommonUtil.getAppBaseUrl(ct));
-        map.put("emCode",  TravelUtils.getTraveCode(CommonUtil.getMaster()));
+        map.put("emCode",  TravelUtils.getTraveCode(cusCode,CommonUtil.getMaster()));
         String p = JSONUtil.map2JSON(map);
         turn2Web(p);
     }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/model/BusinessTravel.java

@@ -151,11 +151,11 @@ public class BusinessTravel {
     }
 
     public String getDate() {
-        return type == AIR ? (DateFormatUtil.long2Str(endTime, "yyyy-MM-dd")) : (DateFormatUtil.long2Str(startTime, "yyyy-MM-dd") + "  " + DateFormatUtil.long2Str(endTime, "yyyy-MM-dd"));
+        return type == AIR ? (DateFormatUtil.long2Str(startTime, "yyyy-MM-dd")) : (DateFormatUtil.long2Str(startTime, "yyyy-MM-dd"));
     }
 
     public String getTitleAndCode() {
-        return title + "   " + (StringUtil.isEmpty(code) ? "未订票" : code);
+        return title + "   " + (StringUtil.isEmpty(code) ? "" : code);
     }
 
     private String longTime2Time(long time) {
@@ -202,7 +202,7 @@ public class BusinessTravel {
     }
 
     public String getStatus() {
-        return status;
+        return status == null ? "未购票" : status;
     }
 
     public String getOrderType() {

app_modular/appworks/src/main/res/layout/item_bus_travel_air.xml

@@ -298,7 +298,7 @@
             android:layout_below="@id/addressTag"
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
-            android:text="往返时间:"
+            android:text="出发时间"
             android:textColor="@color/hintColor" />
 
         <TextView
@@ -320,7 +320,7 @@
             android:layout_below="@id/dateTag"
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
-            android:text="席别:"
+            android:text="席别"
             android:textColor="@color/hintColor" />
 
         <TextView
@@ -343,7 +343,7 @@
             android:layout_below="@id/numberTag"
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
-            android:text="预计费用:"
+            android:text="预计费用"
             android:textColor="@color/hintColor" />
 
         <TextView

app_modular/appworks/src/main/res/layout/item_bus_travel_hotel.xml

@@ -234,7 +234,7 @@
             android:layout_below="@id/addressTag"
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
-            android:text="入住日期:"
+            android:text="入住日期"
             android:textColor="@color/hintColor" />
 
         <TextView
@@ -256,7 +256,7 @@
             android:layout_below="@id/dateTag"
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
-            android:text="人数:"
+            android:text="人数"
             android:textColor="@color/hintColor" />
 
         <TextView
@@ -279,7 +279,7 @@
             android:layout_below="@id/numberTag"
             android:layout_marginRight="@dimen/padding"
             android:layout_marginTop="@dimen/padding"
-            android:text="预计费用:"
+            android:text="预计费用"
             android:textColor="@color/hintColor" />
 
         <TextView

app_modular/appworks/src/main/res/menu/menu_common_docdetails.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/toTravel"
+        android:title="转差旅"
+
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/add_item"
+        android:icon="@drawable/more"
+        android:title="@string/new_add"
+        app:showAsAction="ifRoom"/>
+
+</menu>