提交类型 bug修改

提交内容   地图查询时候出现没有当前定位的情况下回闪退问题

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Apr 04 18:00:37 CST 2018
-debugName=283
+#Wed Apr 11 10:19:28 CST 2018
+debugName=296
 versionName=627
-debugCode=283
+debugCode=296
 versionCode=167

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.35:8080/ERP/";
+//            baseUrl="http://192.168.253.41:8080/ERP/";
 //        }
 //        baseUrl = "http://192.168.253.29:8080/ERP/";
 

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

@@ -173,6 +173,7 @@ public class DeviceMatchActivity extends BaseNetActivity implements View.OnClick
                 object = array.getJSONObject(i);
                 matche = new DeviceMatch();
                 matche.setCode(JSONUtil.getText(object, "DM_CODE"));
+                matche.setSpec(JSONUtil.getText(object, "DE_SPEC"));
                 matche.setName(JSONUtil.getText(object, "DE_NAME"));
                 matche.setExistqty(JSONUtil.getText(object, "EXISTQTY"));
                 matche.setLackqty(JSONUtil.getText(object, "LACKQTY"));
@@ -215,7 +216,7 @@ public class DeviceMatchActivity extends BaseNetActivity implements View.OnClick
         @Override
         public void onBindViewHolder(ViewHolder holder, int position) {
             DeviceMatch match = matches.get(position);
-            holder.codeTv.setText(match.getCode());
+            holder.specTv.setText(match.getSpec());
             holder.nameTv.setText(match.getName());
             holder.existqtyTv.setText(match.getExistqty());
             holder.lackqtyTv.setText(match.getLackqty());
@@ -228,14 +229,14 @@ public class DeviceMatchActivity extends BaseNetActivity implements View.OnClick
 
 
         class ViewHolder extends RecyclerView.ViewHolder {
-            private TextView codeTv;
+            private TextView specTv;
             private TextView nameTv;
             private TextView existqtyTv;
             private TextView lackqtyTv;
 
             public ViewHolder(View itemView) {
                 super(itemView);
-                codeTv = itemView.findViewById(R.id.codeTv);
+                specTv = itemView.findViewById(R.id.specTv);
                 nameTv = itemView.findViewById(R.id.nameTv);
                 existqtyTv = itemView.findViewById(R.id.existqtyTv);
                 lackqtyTv = itemView.findViewById(R.id.lackqtyTv);

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

@@ -31,6 +31,7 @@ import com.core.net.utils.NetUtils;
 import com.core.utils.CommonUtil;
 import com.core.utils.IntentUtils;
 import com.core.utils.ToastUtil;
+import com.iflytek.cloud.thirdparty.B;
 import com.iflytek.cloud.thirdparty.V;
 import com.me.network.app.http.Method;
 import com.modular.apputils.activity.BaseNetActivity;
@@ -78,14 +79,13 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
         loadData();
     }
 
-    private boolean isHasMenu;
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (isLead && !isHasMenu) {
-            isHasMenu = true;
-            getMenuInflater().inflate(R.menu.menu_add_travel, menu);
-        }
+//        if (isLead && !isHasMenu) {
+//            isHasMenu = true;
+//            getMenuInflater().inflate(R.menu.menu_add_travel, menu);
+//        }
         return super.onPrepareOptionsMenu(menu);
     }
 
@@ -119,10 +119,10 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
                     if (remain.toString().equals(getString(R.string.click_to))) {
                         Intent intent = new Intent("com.modular.form.TravelDataFormDetailActivity");
                         String travelCaller = CommonUtil.getSharedPreferences(ct, Constants.WORK_TRAVEL_CALLER_CACHE);
-                        intent.putExtra("caller", TextUtils.isEmpty(travelCaller)?"FeePlease!CCSQ!new":travelCaller);
+                        intent.putExtra("caller", TextUtils.isEmpty(travelCaller) ? "FeePlease!CCSQ!new" : travelCaller);
                         startActivity(intent);
                     } else {
-                        SystemUtil.phoneAction(BusinessTravelActivity.this,remain.toString());
+                        SystemUtil.phoneAction(BusinessTravelActivity.this, remain.toString());
 
                     }
                 }
@@ -206,12 +206,14 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
         appkey = JSONUtil.getText(object, "appKey");
         appSceret = JSONUtil.getText(object, "appSceret");
         //表示可以预定
-        this.isLead = isLead > 0&&!TextUtils.isEmpty(appkey);
-        if (this.isLead && !isHasMenu) {
-            supportInvalidateOptionsMenu();
-        }
+        this.isLead = isLead > 0 && !TextUtils.isEmpty(appkey);
         JSONArray listdata = JSONUtil.getJSONArray(object, "listdata");
         List<BusinessTravel> models = new ArrayList<>();
+        if (this.isLead) {
+            BusinessTravel model=new BusinessTravel();
+            model.setType(BusinessTravel.LEADER);
+            models.add(model);
+        }
         String cttpid = JSONUtil.getText(object, "em_iccode");
         for (int i = 0; i < listdata.size(); i++) {
             JSONObject data = listdata.getJSONObject(i);
@@ -242,8 +244,8 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
             mRefreshLayout.setVisibility(View.VISIBLE);
             setAdapter(models);
         }
-        if (BaseConfig.isDebug()){
-            LogUtil.i("message="+message);
+        if (BaseConfig.isDebug()) {
+            LogUtil.i("message=" + message);
         }
     }
 
@@ -259,7 +261,6 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
         }
         if (ListUtils.isEmpty(models)) {
             if (!isLead) {
-                //TODO 非领导没有单号
                 remainRl.setVisibility(View.VISIBLE);
                 mRefreshLayout.setVisibility(View.GONE);
                 remainTag.setText("请先录入出差单");
@@ -268,9 +269,6 @@ public class BusinessTravelActivity extends BaseNetActivity implements OnSmartHt
                 remainRl.setVisibility(View.GONE);
                 mRefreshLayout.setVisibility(View.VISIBLE);
             }
-            if (isLead && isHasMenu) {
-                showPop();
-            }
         }
     }
 

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

@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -91,6 +92,8 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                 return new AirViewHolder(parent);
             case BusinessTravel.HOTEL:
                 return new HotelViewHolder(parent);
+            case BusinessTravel.LEADER:
+                return new LeaderViewHolder(parent);
             default:
                 return new TitleViewHolder(parent);
         }
@@ -109,11 +112,20 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                 } else if (holder instanceof HotelViewHolder) {
                     bindHotelView((HotelViewHolder) holder, model);
                 }
+            } else if (holder instanceof LeaderViewHolder) {
+                bindLeaderHolder((LeaderViewHolder) holder);
             }
 
         }
     }
 
+    private void bindLeaderHolder(LeaderViewHolder holder) {
+        holder.clickAir.setOnClickListener(this);
+        holder.clickHotel.setOnClickListener(this);
+        holder.clickTrain.setOnClickListener(this);
+
+    }
+
     private void bindTitleView(TitleViewHolder holder, BusinessTravel model, int position) {
         holder.codeTv.setText(model.getCode());
         holder.addMoreTv.setTag(R.id.tag_key, model);
@@ -245,6 +257,25 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         }
     }
 
+
+    private class LeaderViewHolder extends RecyclerView.ViewHolder {
+        private LinearLayout clickTrain;
+        private LinearLayout clickAir;
+        private LinearLayout clickHotel;
+
+
+        public LeaderViewHolder(ViewGroup viewGroup) {
+            this(getInflater().inflate(R.layout.item_bus_travel_leader, viewGroup, false));
+        }
+
+        public LeaderViewHolder(View itemView) {
+            super(itemView);
+            clickTrain = itemView.findViewById(R.id.clickTrain);
+            clickAir = itemView.findViewById(R.id.clickAir);
+            clickHotel = itemView.findViewById(R.id.clickHotel);
+        }
+    }
+
     private class HotelViewHolder extends BaseViewHlder {
         TextView
                 businessNameTv,
@@ -344,15 +375,28 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 
     @Override
     public void onClick(View v) {
-        BusinessTravel model = (BusinessTravel) v.getTag(R.id.tag_key);
-        int position = (int) v.getTag(R.id.tag_key2);
         int id = v.getId();
         if (id == R.id.expandTv) {
+            int position = (int) v.getTag(R.id.tag_key2);
+            BusinessTravel model = (BusinessTravel) v.getTag(R.id.tag_key);
             model.setExpand(!model.isExpand());
             notifyItemChanged(position);
         } else if (R.id.doneTv == id || R.id.subRl == id || R.id.addMoreTv == id) {
+            BusinessTravel model = (BusinessTravel) v.getTag(R.id.tag_key);
             TravelUtils.reserve(ct, appkey, appSceret, model);
+        } else if (R.id.clickAir == id) {
+            TravelUtils.reserve(ct, appkey, appSceret, getLeaderModel(BusinessTravel.AIR));
+        } else if (R.id.clickHotel == id) {
+            TravelUtils.reserve(ct, appkey, appSceret, getLeaderModel(BusinessTravel.HOTEL));
+        } else if (R.id.clickTrain == id) {
+            TravelUtils.reserve(ct, appkey, appSceret, getLeaderModel(BusinessTravel.TRAIN));
         }
     }
 
+    private BusinessTravel getLeaderModel(int type) {
+        BusinessTravel model = new BusinessTravel();
+        model.setType(type);
+        return model;
+    }
+
 }

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

@@ -19,6 +19,7 @@ public class BusinessTravel {
     public static final int AIR = 2;
     public static final int TRAIN = 3;
     public static final int HOTEL = 4;
+    public static final int LEADER = 5;
     private boolean expand;
     private String fpId;//主表id
     private int id;//明细id
@@ -197,7 +198,7 @@ public class BusinessTravel {
     }
 
     public long getStartTime() {
-        return startTime<=0?System.currentTimeMillis():startTime;
+        return startTime <= 0 ? System.currentTimeMillis() : startTime;
     }
 
     public long getEndTime() {
@@ -257,7 +258,7 @@ public class BusinessTravel {
     }
 
     public String getAirStarting() {
-        return airStarting;
+        return  airStarting;
     }
 
     public String getAirStartingCode() {
@@ -266,7 +267,7 @@ public class BusinessTravel {
 
 
     public String getAirDestination() {
-        return airDestination;
+        return   airDestination;
     }
 
     public String getAirDestinationCode() {
@@ -274,7 +275,7 @@ public class BusinessTravel {
     }
 
     public String getTrainStarting() {
-        return trainStarting;
+        return   trainStarting;
     }
 
     public String getTrainStartingCode() {
@@ -282,7 +283,7 @@ public class BusinessTravel {
     }
 
     public String getTrainDestination() {
-        return trainDestination;
+        return   trainDestination;
     }
 
     public String getTrainDestinationCode() {
@@ -291,7 +292,7 @@ public class BusinessTravel {
 
 
     public String getHotelCity() {
-        return hotelCity;
+        return   hotelCity;
     }
 
     public String getHotelCityCode() {

app_modular/appworks/src/main/java/com/uas/appworks/activity/DeviceQueryActivity.java

@@ -382,6 +382,11 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
             mConditionBeans.add(schemeConditionBean);
             mfuzzyConditionBeans.add(schemeConditionBean);
 
+            schemeConditionBean = initCondition("设备规格", "de_spec", "S");
+            mConditionBeans.add(schemeConditionBean);
+            mfuzzyConditionBeans.add(schemeConditionBean);
+
+
             schemeConditionBean = initCondition("设备种类", "de_kind", "S");
             mConditionBeans.add(schemeConditionBean);
             mfuzzyConditionBeans.add(schemeConditionBean);

app_modular/appworks/src/main/java/com/uas/appworks/model/DeviceMatch.java

@@ -6,12 +6,20 @@ package com.uas.appworks.model;
 
 public class DeviceMatch {
     //机型、机型设备列表名称、现有匹配设备数量、欠缺设备数量
-    private String code, name, existqty, lackqty;
+    private String code, name, existqty, lackqty,spec;
+
+    public String getSpec() {
+        return spec==null?"":spec;
+    }
 
     public String getCode() {
         return code == null ? "" : code;
     }
 
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
     public void setCode(String code) {
         this.code = code;
     }

app_modular/appworks/src/main/java/com/uas/appworks/utils/TravelUtils.java

@@ -2,6 +2,7 @@ package com.uas.appworks.utils;
 
 import android.app.Activity;
 import android.content.Context;
+import android.os.Debug;
 import android.text.TextUtils;
 import android.view.View;
 
@@ -68,6 +69,13 @@ public class TravelUtils {
                 fromcode = model.getHotelCityCode();
                 break;
         }
+        if (TextUtils.isEmpty(fromcode)) {
+            from = "";
+        }
+        if (TextUtils.isEmpty(arrivecode)) {
+            arrive = "";
+        }
+
         Map<String, String> routeMap = new HashMap<>();
         routeMap.put("from", from);
         routeMap.put("fromcode", fromcode);
@@ -92,12 +100,12 @@ public class TravelUtils {
         String p = JSONUtil.map2JSON(map);
         LogUtil.i("p=" + p);
         if (NetUtils.isNetWorkConnected(ct)) {
-            String baseUrl = "http://124.254.45.234:8082/oa/caslogin/";
-//            if (BaseConfig.isDebug()) {
-//                appkey = "y8gd87dsdkencgzk394k7s5c78io35c";
-//                appSceret = "e212e142a5c9e0590eefb7d9f1bc91d7";
-//                baseUrl = "http://124.254.45.234:8082/oa/caslogin/";
-//            } else {
+            String baseUrl = null;
+            if (BaseConfig.isDebug()) {
+                appkey = "y8gd87dsdkencgzk394k7s5c78io35c";
+                appSceret = "e212e142a5c9e0590eefb7d9f1bc91d7";
+                baseUrl = "http://124.254.45.234:8082/oa/caslogin/";
+            } else {
                 baseUrl = "http://h5.auvgo.com/oa/caslogin/";
                 if (TextUtils.isEmpty(appkey)) {
                     appkey = "fjdsfnvg6523fsgjkff879fidsf";
@@ -105,7 +113,7 @@ public class TravelUtils {
                 if (TextUtils.isEmpty(appSceret)) {
                     appSceret = "9891ca5330271eba81ec1332e740c210";
                 }
-//            }
+            }
             String username = CommonUtil.getEmcode();
             String data = appkey + username.toUpperCase() + appSceret;
             String key = Md5Util.toMD5(appSceret).toUpperCase();

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

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="70dp"
+    android:background="@color/white"
+    android:gravity="center_vertical"
+    android:paddingTop="@dimen/padding"
+    android:paddingBottom="@dimen/padding"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:id="@+id/clickTrain"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:src="@drawable/icon_travel_train" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main"
+            android:text="订火车" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:id="@+id/clickAir"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:src="@drawable/icon_travel_air" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main"
+            android:text="订飞机" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:id="@+id/clickHotel"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:src="@drawable/icon_travel_hotel" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="@color/text_main"
+            android:textSize="@dimen/text_main"
+            android:text="订酒店" />
+
+    </LinearLayout>
+</LinearLayout>

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

@@ -4,33 +4,10 @@
     android:layout_height="wrap_content">
 
 
-    <TextView
-        android:id="@+id/codeTag"
-        android:layout_width="90dp"
-        android:layout_height="36dp"
-        android:layout_gravity="left"
-        android:layout_marginRight="10dp"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:maxLines="2"
-        android:paddingLeft="@dimen/paddingMin"
-        android:text="机型"
-        android:textSize="14sp" />
-
-    <TextView
-        android:id="@+id/codeTv"
-        android:layout_width="match_parent"
-        android:layout_height="36dp"
-        android:layout_toRightOf="@id/codeTag"
-        android:gravity="center_vertical"
-        android:paddingLeft="10dp"
-        android:textSize="14sp" />
-
     <TextView
         android:id="@+id/nameTag"
-        android:layout_width="90dp"
+        android:layout_width="wrap_content"
         android:layout_height="36dp"
-        android:layout_below="@id/codeTag"
         android:layout_gravity="left"
         android:layout_marginRight="10dp"
         android:ellipsize="end"
@@ -51,8 +28,8 @@
         android:textSize="14sp" />
 
     <TextView
-        android:id="@+id/existqtyTag"
-        android:layout_width="90dp"
+        android:id="@+id/specTag"
+        android:layout_width="wrap_content"
         android:layout_height="36dp"
         android:layout_below="@id/nameTag"
         android:layout_gravity="left"
@@ -61,40 +38,76 @@
         android:gravity="center_vertical"
         android:maxLines="2"
         android:paddingLeft="@dimen/paddingMin"
-        android:text="匹配设备数量"
+        android:text="设备规格"
         android:textSize="14sp" />
 
     <TextView
-        android:id="@+id/existqtyTv"
+        android:id="@+id/specTv"
         android:layout_width="match_parent"
         android:layout_height="36dp"
-        android:layout_alignTop="@id/existqtyTag"
-        android:layout_toRightOf="@id/existqtyTag"
+        android:layout_toRightOf="@id/specTag"
+        android:layout_alignTop="@id/specTag"
         android:gravity="center_vertical"
         android:paddingLeft="10dp"
         android:textSize="14sp" />
 
-    <TextView
-        android:id="@+id/lackqtyTag"
-        android:layout_width="90dp"
-        android:layout_height="36dp"
-        android:layout_below="@id/existqtyTag"
-        android:layout_gravity="left"
-        android:layout_marginRight="10dp"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:maxLines="2"
-        android:paddingLeft="@dimen/paddingMin"
-        android:text="欠缺设备数量"
-        android:textSize="14sp" />
 
-    <TextView
-        android:id="@+id/lackqtyTv"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="36dp"
-        android:layout_alignTop="@id/lackqtyTag"
-        android:layout_toRightOf="@id/lackqtyTag"
-        android:gravity="center_vertical"
-        android:paddingLeft="10dp"
-        android:textSize="14sp" />
+        android:layout_height="wrap_content"
+        android:layout_below="@id/specTag"
+        android:orientation="horizontal">
+
+
+        <TextView
+            android:id="@+id/existqtyTag"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_gravity="left"
+            android:layout_marginRight="10dp"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:maxLines="2"
+            android:paddingLeft="@dimen/paddingMin"
+            android:text="匹配数量"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/existqtyTv"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_alignTop="@id/existqtyTag"
+            android:layout_marginRight="@dimen/padding"
+            android:layout_toRightOf="@id/existqtyTag"
+            android:layout_weight="3"
+            android:gravity="center_vertical"
+            android:paddingLeft="10dp"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/lackqtyTag"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_below="@id/existqtyTag"
+            android:layout_gravity="left"
+            android:layout_marginRight="10dp"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:maxLines="2"
+            android:paddingLeft="@dimen/paddingMin"
+            android:text="欠缺数量"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/lackqtyTv"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:layout_alignTop="@id/lackqtyTag"
+            android:layout_toRightOf="@id/lackqtyTag"
+            android:layout_weight="3"
+            android:gravity="center_vertical"
+            android:paddingLeft="10dp"
+            android:textSize="14sp" />
+    </LinearLayout>
+
 </RelativeLayout>