提交类型 处理bug

提交内容 1.抢商机的闪退bug，起因是在itemClick里面没有判断，数组越界
2.审批界面，恢复原有的配置，由于后台的要求，修改参数，最后发现是错误的
3.一元捐多项修改
4.补卡申述时候在出错了时候系统返回的是200导致无法获取异常信息的问题

冲突：无

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

@@ -19,7 +19,7 @@
                 android:id="@+id/name_img"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-                android:background="@drawable/round_bg"
+                android:background="@drawable/radian_white_bg"
                 android:gravity="center"
                 android:scaleType="fitXY"
                 android:textColor="@color/white"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Dec 12 16:48:16 CST 2017
-debugName=134
+#Wed Dec 13 15:18:55 CST 2017
+debugName=143
 versionName=618
-debugCode=134
+debugCode=143
 versionCode=157

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

@@ -16,7 +16,7 @@ public class Constants {
     public static String IM_BASE_URL() {
         String url = "";
         if (BaseConfig.isDebug()) {
-            url = IM_BASE_URL_TEST;
+            url = IM_BASE_URL;
         } else {
             url = IM_BASE_URL;
         }

app_modular/apputils/src/main/res/drawable/radian_bottom_white_bg.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- solid 设置stroke设置的边框以内的颜色 -->
+    <solid android:color="@color/white" />
+    <!-- stroke主要设置组件的边框。width为边框宽度，color为边框颜色 -->
+    <stroke
+        android:width="0.3dp"
+        android:color="@color/base_bg" />
+    <!-- corners 设置边框四角弧度 -->
+    <corners android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp"/>
+    <padding
+        android:bottom="@dimen/padding"
+        android:left="@dimen/padding"
+        android:right="@dimen/padding"
+        android:top="@dimen/padding" />
+
+</shape>

app_modular/apputils/src/main/res/drawable/radian_top_cui_bg.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- solid 设置stroke设置的边框以内的颜色 -->
+    <solid android:color="@color/cui" />
+    <!-- stroke主要设置组件的边框。width为边框宽度，color为边框颜色 -->
+    <stroke
+        android:width="0.3dp"
+        android:color="@color/base_bg" />
+    <!-- corners 设置边框四角弧度 -->
+    <corners android:topRightRadius="10dp" android:topLeftRadius="10dp"/>
+    <padding
+        android:bottom="@dimen/padding"
+        android:left="@dimen/padding"
+        android:right="@dimen/padding"
+        android:top="@dimen/padding" />
+
+</shape>

app_modular/apputils/src/main/res/drawable/round_bg.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <!-- solid 设置stroke设置的边框以内的颜色 -->
-    <solid android:color="#ffffff"/>
-    <!-- stroke主要设置组件的边框。width为边框宽度，color为边框颜色 -->
-    <stroke android:width="3dp" android:color="#ffffff" />
-    <!-- corners 设置边框四角弧度 -->
-    <corners android:radius="10dp"/>
-
-</shape>

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

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
@@ -133,9 +134,9 @@ public class ChangeMobileActivity extends BaseActivity {
                     Crouton.makeText(ct, showMessage);
                     break;
                 default:
-                if (progressDialog!=null){
-                    progressDialog.dismiss();
-                }
+                    if (progressDialog != null) {
+                        progressDialog.dismiss();
+                    }
                     break;
             }
             submiting = false;
@@ -177,7 +178,7 @@ public class ChangeMobileActivity extends BaseActivity {
 
     private boolean submiting = false;
 
-    private void initView(){
+    private void initView() {
 
         mac_tv = (TextView) findViewById(R.id.mac_tv);
         title_tv = (TextView) findViewById(R.id.title_tv);
@@ -318,15 +319,25 @@ public class ChangeMobileActivity extends BaseActivity {
             @Override
             public void result(int what, boolean isJSON, String message, Bundle bundle) {
 //                endActivity();
-                int ms_id = JSON.parseObject(message).getInteger("ms_id");
-                Log.d("hims_id", ms_id + "");
-                judgeApprovers(ms_id);
+                if (isJSON) {
+                    int ms_id = JSONUtil.getInt(message, "ms_id");
+                    Log.d("hims_id", ms_id + "");
+                    if (ms_id > 0) {
+                        judgeApprovers(ms_id);
+                    } else {
+                        String exceptionInfo = JSONUtil.getText(message, "exceptionInfo");
+                        if (!StringUtil.isEmpty(exceptionInfo)) {
+                            ToastUtil.showToast(ct, exceptionInfo);
+                        }
+                    }
+                }
                 submiting = false;
                 progressDialog.dismiss();
             }
 
             @Override
             public void error(int what, String message, Bundle bundle) {
+                LogUtil.i("审批流触发失败");
                 progressDialog.dismiss();
                 if (!StringUtil.isEmpty(message))
                     Crouton.showToast(ct, message, R.color.load_error);

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

@@ -76,7 +76,6 @@ public class BusinessTravelActivity extends BaseActivity {
                         LogUtil.i("e=" + e.getMessage());
                         ToastUtil.showToast(ct, e.getMessage());
                     }
-
                 }
                 mRefreshLayout.stopRefresh();
                 progressDialog.dismiss();

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

@@ -90,8 +90,9 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         holder.statusTv.setText(model.getStatus());
         holder.levelTv.setText(model.getLevel());
         holder.businessNameTv.setText(model.getBusinessName());
-        holder.whenLongTv.setText("共1天");
-        holder.numberTv.setText("1人");
+        String whenLongTv="入住"+DateFormatUtil.long2Str(model.getStartTime(),"MM:dd")+"      离店"+DateFormatUtil.long2Str(model.getStartTime(),"MM:dd")+"    共2晚";
+        holder.whenLongTv.setText(whenLongTv);
+        holder.numberTv.setText(model.getNumber()+"人");
         holder.nameTv.setText("龚鹏明");
         holder.idTypeTv.setText("二代身份证");
         holder.idCardTv.setText("450122xxxxxxxxxx");
@@ -116,7 +117,8 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
         holder.statusTv.setText(model.getStatus());
         holder.levelTv.setText(model.getLevel());
         holder.businessNameTv.setText(model.getBusinessName());
-        holder.whenLongTv.setText("共1天");
+        String whenLongTv="入住"+DateFormatUtil.long2Str(model.getStartTime(),"MM:dd")+"      离店"+DateFormatUtil.long2Str(model.getStartTime(),"MM:dd")+"    共2晚";
+        holder.whenLongTv.setText(whenLongTv);
         holder.numberTv.setText("1人");
         holder.nameTv.setText("龚鹏明");
         holder.idTypeTv.setText("二代身份证");
@@ -171,23 +173,23 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             subRl = itemView.findViewById(R.id.subRl);
             codeTv = itemView.findViewById(R.id.codeTv);
             statusTv = itemView.findViewById(R.id.statusTv);
-            levelTv = itemView.findViewById(R.id.statusTv);
-            businessNameTv = itemView.findViewById(R.id.statusTv);
-            whenLongTv = itemView.findViewById(R.id.statusTv);
-            numberTv = itemView.findViewById(R.id.statusTv);
-            nameTv = itemView.findViewById(R.id.statusTv);
-            idTypeTv = itemView.findViewById(R.id.statusTv);
-            idCardTv = itemView.findViewById(R.id.statusTv);
-            roomsTv = itemView.findViewById(R.id.statusTv);
-            seatTv = itemView.findViewById(R.id.statusTv);
-            realFeeTv = itemView.findViewById(R.id.statusTv);
-            payTypeTv = itemView.findViewById(R.id.statusTv);
-            doneTv = itemView.findViewById(R.id.statusTv);
-            expandTv = itemView.findViewById(R.id.statusTv);
-            addressTv = itemView.findViewById(R.id.statusTv);
-            dateTv = itemView.findViewById(R.id.statusTv);
-            numberSubTv = itemView.findViewById(R.id.statusTv);
-            expecteFeeTv = itemView.findViewById(R.id.statusTv);
+            levelTv = itemView.findViewById(R.id.levelTv);
+            businessNameTv = itemView.findViewById(R.id.businessNameTv);
+            whenLongTv = itemView.findViewById(R.id.whenLongTv);
+            numberTv = itemView.findViewById(R.id.numberTv);
+            nameTv = itemView.findViewById(R.id.nameTv);
+            idTypeTv = itemView.findViewById(R.id.idTypeTv);
+            idCardTv = itemView.findViewById(R.id.idCardTv);
+            roomsTv = itemView.findViewById(R.id.roomsTv);
+            seatTv = itemView.findViewById(R.id.seatTv);
+            realFeeTv = itemView.findViewById(R.id.realFeeTv);
+            payTypeTv = itemView.findViewById(R.id.payTypeTv);
+            doneTv = itemView.findViewById(R.id.doneTv);
+            expandTv = itemView.findViewById(R.id.expandTv);
+            addressTv = itemView.findViewById(R.id.addressTv);
+            dateTv = itemView.findViewById(R.id.dateTv);
+            numberSubTv = itemView.findViewById(R.id.numberSubTv);
+            expecteFeeTv = itemView.findViewById(R.id.expecteFeeTv);
         }
     }
 
@@ -205,23 +207,23 @@ public class BusinessTravelAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             subRl = itemView.findViewById(R.id.subRl);
             codeTv = itemView.findViewById(R.id.codeTv);
             statusTv = itemView.findViewById(R.id.statusTv);
-            levelTv = itemView.findViewById(R.id.statusTv);
-            businessNameTv = itemView.findViewById(R.id.statusTv);
-            whenLongTv = itemView.findViewById(R.id.statusTv);
-            numberTv = itemView.findViewById(R.id.statusTv);
-            nameTv = itemView.findViewById(R.id.statusTv);
-            idTypeTv = itemView.findViewById(R.id.statusTv);
-            idCardTv = itemView.findViewById(R.id.statusTv);
-            roomsTv = itemView.findViewById(R.id.statusTv);
-            seatTv = itemView.findViewById(R.id.statusTv);
-            realFeeTv = itemView.findViewById(R.id.statusTv);
-            payTypeTv = itemView.findViewById(R.id.statusTv);
-            doneTv = itemView.findViewById(R.id.statusTv);
-            expandTv = itemView.findViewById(R.id.statusTv);
-            addressTv = itemView.findViewById(R.id.statusTv);
-            dateTv = itemView.findViewById(R.id.statusTv);
-            numberSubTv = itemView.findViewById(R.id.statusTv);
-            expecteFeeTv = itemView.findViewById(R.id.statusTv);
+            levelTv = itemView.findViewById(R.id.levelTv);
+            businessNameTv = itemView.findViewById(R.id.businessNameTv);
+            whenLongTv = itemView.findViewById(R.id.whenLongTv);
+            numberTv = itemView.findViewById(R.id.numberTv);
+            nameTv = itemView.findViewById(R.id.nameTv);
+            idTypeTv = itemView.findViewById(R.id.idTypeTv);
+            idCardTv = itemView.findViewById(R.id.idCardTv);
+            roomsTv = itemView.findViewById(R.id.roomsTv);
+            seatTv = itemView.findViewById(R.id.seatTv);
+            realFeeTv = itemView.findViewById(R.id.realFeeTv);
+            payTypeTv = itemView.findViewById(R.id.payTypeTv);
+            doneTv = itemView.findViewById(R.id.doneTv);
+            expandTv = itemView.findViewById(R.id.expandTv);
+            addressTv = itemView.findViewById(R.id.addressTv);
+            dateTv = itemView.findViewById(R.id.dateTv);
+            numberSubTv = itemView.findViewById(R.id.numberSubTv);
+            expecteFeeTv = itemView.findViewById(R.id.expecteFeeTv);
         }
     }
 

app_modular/appworks/src/main/res/drawable/radian_white_bg.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- solid 设置stroke设置的边框以内的颜色 -->
+    <solid android:color="#ffffff" />
+    <!-- stroke主要设置组件的边框。width为边框宽度，color为边框颜色 -->
+    <stroke
+        android:width="10dp"
+        android:color="@color/base_bg" />
+    <!-- corners 设置边框四角弧度 -->
+    <corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp"/>
+    <padding
+        android:bottom="@dimen/padding"
+        android:left="@dimen/padding"
+        android:right="@dimen/padding"
+        android:top="@dimen/padding" />
+
+</shape>

app_modular/appworks/src/main/res/drawable/text_frame_radian_hint_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:radius="10dp" />
+            <stroke android:width="@dimen/line" android:color="@color/text_hine" />
+            <padding android:bottom="2dp" android:left="2dp" android:right="2dp" android:top="2dp" />
+        </shape>
+    </item>
+</selector>

app_modular/appworks/src/main/res/drawable/text_frame_radian_red_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:radius="10dp" />
+            <stroke android:width="@dimen/line" android:color="@color/indianred" />
+            <padding android:bottom="2dp" android:left="2dp" android:right="2dp" android:top="2dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -2,15 +2,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/padding"
-    android:background="@drawable/round_bg"
+    android:layout_marginLeft="@dimen/padding"
+    android:layout_marginRight="@dimen/padding"
+    android:background="@color/base_bg"
     android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/cui"
-        android:padding="@dimen/padding">
+        android:background="@drawable/radian_top_cui_bg"
+        android:padding="6dp">
 
         <TextView
             android:id="@+id/codeTv"
@@ -18,8 +19,6 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:paddingBottom="5dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
             android:paddingTop="5dp"
             android:text="住宿"
             android:textColor="@color/white"
@@ -42,6 +41,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:layout_below="@id/codeTv"
             android:background="@color/white" />
 
         <TextView
@@ -50,6 +50,7 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/codeTv"
             android:layout_below="@id/codeTv"
+            android:layout_marginTop="@dimen/padding"
             android:textColor="@color/white"
             android:textSize="@dimen/textXXL" />
 
@@ -87,7 +88,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/white"
-        android:padding="@dimen/padding">
+        android:padding="6dp">
 
         <TextView
             android:id="@+id/nameTv"
@@ -185,12 +186,17 @@
 
     </RelativeLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line" />
 
     <RelativeLayout
         android:id="@+id/subRl"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/white">
+        android:background="@drawable/radian_bottom_white_bg"
+        android:padding="6dp">
 
         <TextView
             android:id="@+id/addressTag"
@@ -206,7 +212,6 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/padding"
             android:layout_toRightOf="@id/addressTag"
-            android:drawableRight="@drawable/icon_more_down"
             android:ellipsize="end"
             android:lines="1" />
 
@@ -227,7 +232,6 @@
             android:layout_alignTop="@id/dateTag"
             android:layout_marginLeft="@dimen/padding"
             android:layout_toRightOf="@id/dateTag"
-            android:drawableRight="@drawable/icon_more_down"
             android:ellipsize="end"
             android:lines="1" />
 
@@ -248,7 +252,6 @@
             android:layout_alignTop="@id/numberTag"
             android:layout_marginLeft="@dimen/padding"
             android:layout_toRightOf="@id/numberTag"
-            android:drawableRight="@drawable/icon_more_down"
             android:ellipsize="end"
             android:lines="1" />
 
@@ -270,7 +273,6 @@
             android:layout_alignTop="@id/expecteFeeTag"
             android:layout_marginLeft="@dimen/padding"
             android:layout_toRightOf="@id/expecteFeeTag"
-            android:drawableRight="@drawable/icon_more_down"
             android:ellipsize="end"
             android:lines="1" />
     </RelativeLayout>