产城服务备份

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

@@ -111,6 +111,7 @@ public class PDFDownloadActivity extends BaseActivity implements View.OnClickLis
                     break;
                 case com.core.app.Constants.APP_SOCKETIMEOUTEXCEPTION:
                     result = msg.getData().getString("response");
+                    Log.d("pdfresult", result);
                     String exception = "系统错误";
                     if (JSONUtil.validate(result)) {
                         if (JSON.parse(result) instanceof com.alibaba.fastjson.JSONObject) {

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

@@ -140,6 +140,37 @@
                     android:layout_marginRight="11dp"
                     android:layout_marginEnd="11dp" />
             </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/common_docui_files_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/item_line"
+                    android:visibility="visible" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:text="附件" />
+
+                <com.core.widget.MyListView
+                    android:id="@+id/common_docui_files_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:focusableInTouchMode="false" />
+            </LinearLayout>
+
             <View
                 android:id="@+id/hide_above_af"
                 android:layout_width="match_parent"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Nov 20 19:22:27 CST 2017
+#Thu Nov 23 13:46:14 CST 2017
 debugName=1
 versionName=618
-debugCode=49
+debugCode=92
 versionCode=118

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

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

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

@@ -1034,8 +1034,8 @@ public class ViewUtil {
     public static void LoginERPTask(String url, String master, String username,
                                     String password) {
         mdProcessDialog.setContent(MyApplication.getInstance().getString(R.string.login_progress_erp));
-        //url = url + "mobile/login.action";
-        url ="https://218.17.158.219:9443/cc/mobile/login.action";
+        url = url + "mobile/login.action";
+//        url ="https://218.17.158.219:9443/cc/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

@@ -94,9 +94,9 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-        //return baseUrl;
-      //  return "http://192.168.253.29:8080/ERP/";
-        return "https://218.17.158.219:9443/cc/";
+        return baseUrl;
+//        return "http://192.168.253.29:8080/ERP/";
+//        return "https://218.17.158.219:9443/cc/";
     }
 
     /**

app_core/common/src/main/res/layout/activity_common_docui.xml

@@ -1,10 +1,10 @@
 <?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="match_parent"
-    android:background="@color/bg_main"
-    android:orientation="vertical"
-    android:focusableInTouchMode="true">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@color/bg_main"
+              android:focusableInTouchMode="true"
+              android:orientation="vertical">
 
     <com.core.widget.CustomerScrollView
         android:id="@+id/common_docui_sv"
@@ -12,9 +12,9 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:fillViewport="true"
+        android:focusableInTouchMode="true"
         android:scrollbars="none"
-        android:visibility="visible"
-        android:focusableInTouchMode="true">
+        android:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -24,65 +24,69 @@
             android:orientation="vertical"
             >
 
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            >
-
-            <ImageView
-                android:id="@+id/common_docui_photo_img"
-                android:layout_width="45dp"
-                android:layout_height="45dp"
-                android:contentDescription="@string/app_name"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp" />
-
-            <TextView
-                android:id="@+id/common_docui_name_tv"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_toRightOf="@+id/common_docui_photo_img"
-                android:textColor="#575757"
-                android:textSize="@dimen/text_hine"
-                android:layout_marginTop="10dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:padding="5dp"
+                >
+
+                <ImageView
+                    android:id="@+id/common_docui_photo_img"
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginTop="5dp"
+                    android:contentDescription="@string/app_name" />
+
+                <TextView
+                    android:id="@+id/common_docui_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_toRightOf="@+id/common_docui_photo_img"
+                    android:textColor="#575757"
+                    android:textSize="@dimen/text_hine"
+
+                    />
+
+                <TextView
+                    android:id="@+id/common_docui_Section_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/common_docui_name_tv"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_toRightOf="@+id/common_docui_photo_img"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_hine" />
+
+                <TextView
+                    android:id="@+id/common_docui_status_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginBottom="0dp"
+                    android:layout_marginTop="5dp"
+                    android:textSize="@dimen/text_hine" />
+            </RelativeLayout>
 
-                />
-            <TextView
-                android:id="@+id/common_docui_Section_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_toRightOf="@+id/common_docui_photo_img"
-                android:layout_below="@id/common_docui_name_tv"
-                android:textColor="@color/text_main"
-                android:textSize="@dimen/text_hine"
-                android:layout_marginTop="4dp"/>
-            <TextView
-                android:id="@+id/common_docui_status_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="0dp"
-                android:textSize="@dimen/text_hine"/>
-        </RelativeLayout>
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="@color/item_line"
                 android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"/>
+                android:layout_marginRight="10dp"
+                android:background="@color/item_line" />
+
             <com.core.widget.MyListView
                 android:id="@+id/common_docui_main_msg_lv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="5dp"
                 android:layout_marginRight="10dp"
+                android:layout_marginTop="5dp"
                 android:focusableInTouchMode="false">
             </com.core.widget.MyListView>
 
@@ -90,9 +94,9 @@
                 android:id="@+id/common_docui_secondmsg_ll"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp">
+                android:layout_marginRight="10dp"
+                android:orientation="vertical">
 
                 <com.core.widget.MyListView
                     android:id="@+id/common_docui_second_msg_lv"
@@ -103,59 +107,93 @@
                 </com.core.widget.MyListView>
 
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ex_invoice_ll"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
+                android:orientation="vertical"
                 android:padding="10dp"
-                android:visibility="gone"
-                android:orientation="vertical">
+                android:visibility="gone">
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
                     android:background="@color/item_line" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/invoice"
-                    android:textColor="@color/red"
+                    android:paddingBottom="5dp"
                     android:paddingTop="5dp"
-                    android:paddingBottom="5dp"/>
+                    android:text="@string/invoice"
+                    android:textColor="@color/red" />
 
                 <com.core.widget.view.MyGridView
                     android:id="@+id/grid_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginEnd="11dp"
+                    android:layout_marginRight="11dp"
                     android:gravity="center"
                     android:horizontalSpacing="3dp"
                     android:listSelector="#00000000"
                     android:numColumns="3"
                     android:stretchMode="columnWidth"
-                    android:verticalSpacing="3dp"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginRight="11dp"
-                    android:layout_marginEnd="11dp" />
+                    android:verticalSpacing="3dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/common_docui_files_ll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/item_line"
+                    android:visibility="visible" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:text="附件" />
+
+                <com.core.widget.MyListView
+                    android:id="@+id/common_docui_files_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:focusableInTouchMode="false" />
             </LinearLayout>
+
             <View
                 android:id="@+id/hide_above_af"
                 android:layout_width="match_parent"
                 android:layout_height="10dp"
-                android:background="@color/item_line"
                 android:layout_marginTop="5dp"
-                android:visibility="visible"/>
+                android:background="@color/item_line"
+                android:visibility="visible" />
+
             <com.core.widget.MyListView
                 android:id="@+id/common_docui_approval_flow_lv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="visible"
                 android:layout_marginBottom="10dp"
-                android:focusableInTouchMode="false"
                 android:background="#ebe9e9"
-               >
+                android:focusableInTouchMode="false"
+                android:visibility="visible"
+                >
             </com.core.widget.MyListView>
 
         </LinearLayout>
@@ -166,27 +204,28 @@
         android:id="@+id/item_common_docui_res_and_del_ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:background="@color/bg_main"
+        android:orientation="horizontal"
         android:paddingBottom="5dp"
         android:visibility="gone">
 
         <LinearLayout
             android:id="@+id/common_docui_resubmit_ll"
-            android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:background="@drawable/selector_me_menu_item_bg">
+            android:layout_weight="1"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:gravity="center_horizontal">
+
             <TextView
                 android:id="@+id/common_docui_resubmit_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="18sp"
-                android:textColor="@color/titleBlue"
                 android:layout_marginTop="10dp"
                 android:paddingBottom="10dp"
                 android:text="重新提交"
+                android:textColor="@color/titleBlue"
+                android:textSize="18sp"
                 />
 
         </LinearLayout>
@@ -195,25 +234,27 @@
         <View
             android:layout_width="1dp"
             android:layout_height="20dp"
-            android:background="@color/item_line"
             android:layout_gravity="center_vertical"
+            android:background="@color/item_line"
             />
+
         <LinearLayout
             android:id="@+id/common_docui_delete_ll"
-            android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:background="@drawable/selector_me_menu_item_bg">
+            android:layout_weight="1"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:gravity="center_horizontal">
+
             <TextView
                 android:id="@+id/common_docui_delete_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="18sp"
-                android:textColor="@color/titleBlue"
                 android:layout_marginTop="10dp"
                 android:paddingBottom="10dp"
                 android:text="删除"
+                android:textColor="@color/titleBlue"
+                android:textSize="18sp"
                 />
         </LinearLayout>
 
@@ -224,104 +265,109 @@
         android:id="@+id/common_docui_agree_and_change_ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:background="@color/bg_main"
+        android:orientation="horizontal"
         android:paddingBottom="5dp"
         android:visibility="gone">
 
         <LinearLayout
             android:id="@+id/common_docui_agree_ll"
-            android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_weight="1"
             android:background="@drawable/selector_me_menu_item_bg"
-           >
+            android:gravity="center_horizontal"
+            >
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_answer"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/icon_answer"
                 />
 
             <TextView
                 android:id="@+id/common_docui_agree_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:textSize="18sp"
-                android:textColor="@color/titleBlue"
-                android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
-                android:text="同意"
                 android:layout_marginLeft="8dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center_horizontal"
+                android:text="同意"
+                android:textColor="@color/titleBlue"
+                android:textSize="18sp"
                 />
         </LinearLayout>
 
         <View
             android:layout_width="1dp"
             android:layout_height="20dp"
-            android:background="@color/item_line"
             android:layout_gravity="center_vertical"
+            android:background="@color/item_line"
             />
+
         <LinearLayout
             android:id="@+id/common_docui_disagree_ll"
-            android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:background="@drawable/selector_me_menu_item_bg">
+            android:layout_weight="1"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:gravity="center_horizontal">
 
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_answer"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/icon_answer"
                 />
+
             <TextView
                 android:id="@+id/common_docui_disagree_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:textSize="18sp"
-                android:textColor="@color/titleBlue"
-                android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center_horizontal"
                 android:text="不同意"
-                android:layout_marginLeft="8dp"/>
+                android:textColor="@color/titleBlue"
+                android:textSize="18sp" />
         </LinearLayout>
 
         <View
             android:layout_width="1dp"
             android:layout_height="20dp"
-            android:background="@color/item_line"
             android:layout_gravity="center_vertical"
+            android:background="@color/item_line"
             />
+
         <LinearLayout
             android:id="@+id/common_docui_change_dealman_ll"
-            android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:background="@drawable/selector_me_menu_item_bg">
+            android:layout_weight="1"
+            android:background="@drawable/selector_me_menu_item_bg"
+            android:gravity="center_horizontal">
+
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/icon_answer"
                 android:layout_gravity="center_vertical"
+                android:src="@drawable/icon_answer"
                 />
+
             <TextView
                 android:id="@+id/common_docui_change_dealman_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:textSize="18sp"
-                android:textColor="@color/titleBlue"
-                android:layout_marginTop="10dp"
                 android:layout_marginBottom="10dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center_horizontal"
                 android:text="变更处理人"
-                android:layout_marginLeft="8dp"/>
+                android:textColor="@color/titleBlue"
+                android:textSize="18sp" />
         </LinearLayout>
 
     </LinearLayout>

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/ApprovalAdapter.java

@@ -91,7 +91,8 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 return new NodeViewHolder(parent);
             case Approval.NODES_TAG:
                 return new NodeTagViewHolder(parent);
-            default: return new BaseRVViewHodler(parent);
+            default:
+                return new BaseRVViewHodler(parent);
         }
     }
 
@@ -161,7 +162,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         int textColor = R.color.hintColor;
         int reId = R.drawable.weishenpi;
         if (!StringUtil.isEmpty(approval.getIdKey())) {
-            holder.valuesTv.setText(approval.getIdKey().replace("\\n","\n"));
+            holder.valuesTv.setText(approval.getIdKey().replace("\\n", "\n"));
             if (approval.getIdKey().startsWith("待审批")) {
                 textColor = R.color.approvaling;
                 reId = R.drawable.daishenpi;
@@ -289,6 +290,7 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     private void gotoReadEnclosure(Approval approval) {
         String url = approval.getIdKey();
+        LogUtil.d("enclosureUrl", url);
         final CustomProgressDialog progressDialog = CustomProgressDialog.createDialog(ct);
         progressDialog.setTitile("正在下载");
         progressDialog.setMessage("正在下载，请勿关闭程序");
@@ -389,8 +391,8 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                     if (approval.isNumber()) {
                         holder.valueTv.setText(approval.getNumber());
                     } else {
-                        LogUtil.i("bindBaseRVView="+approval.getValues());
-                        holder.valueTv.setText(Html.fromHtml(approval.getValues().replace("\n","<br />")));
+                        LogUtil.i("bindBaseRVView=" + approval.getValues());
+                        holder.valueTv.setText(Html.fromHtml(approval.getValues().replace("\n", "<br />")));
                     }
                 }
             }

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

@@ -25,6 +25,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
+import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.ActivityUtils;
@@ -48,7 +49,6 @@ import com.core.widget.view.MyGridView;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appworks.OA.erp.activity.ExpenseReimbursementActivity;
 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;
 import com.uas.appworks.OA.erp.adapter.CommonDocMainMsgAdapter;
 import com.uas.appworks.OA.erp.model.CommonApprovalFlowBean;
@@ -56,6 +56,8 @@ 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.R;
+import com.uas.appworks.adapter.EnclosureItemAdapter;
+import com.uas.appworks.model.bean.CityIndustryEnclosureBean;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -77,6 +79,8 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
     private final static int COMMON_DOC_AF_REQUEST = 1125;
     private final static int COMMON_DOC_MSG_REQUEST = 1126;
     private static final int DELETE_DOC_REQUEST = 1127;
+    private final int GET_CAPTION_PATH = 0x11;
+
     private EmptyLayout mEmptyLayput_approvalflow;
     private CommonApprovalFlowBean mCommonApprovalFlowBean;
     private CommonDocAMBean mCommonDocAMBean;
@@ -108,6 +112,8 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
     private LinearLayout resanddel_ll;
     private LinearLayout resubmit_ll;
     private LinearLayout delete_ll;
+    private LinearLayout mFilesLinearLayout;
+    private MyListView mFilesListView;
     private CustomerScrollView commondoc_sv;
     private View hide_above_af;
     private LinearLayout ex_invoice_ll;
@@ -121,6 +127,8 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
     private String real_status;
     private String emCode;
     private String mTitle;
+    private List<CityIndustryEnclosureBean> mCityIndustryEnclosureBeans;
+    private EnclosureItemAdapter mEnclosureItemAdapter;
 
 
     @Override
@@ -145,6 +153,9 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
         mEmptyLayput_applymsg.setShowErrorButton(false);
         mEmptyLayput_applymsg.setShowLoadingButton(false);
 
+        mCityIndustryEnclosureBeans = new ArrayList<>();
+        mEnclosureItemAdapter = new EnclosureItemAdapter(this, mCityIndustryEnclosureBeans);
+        mFilesListView.setAdapter(mEnclosureItemAdapter);
         //加载主单据信息适配器
         formdataBeans = new JSONArray();
         mFormconfigsBean = new ArrayList<>();
@@ -173,9 +184,15 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
         im_ids = new ArrayList<>();
         afpeople_names = new ArrayList<>();
 
-
         mAdapter = new GridViewAdapter();
         grid_view.setAdapter(mAdapter);
+
+        mEnclosureItemAdapter.setOnEnclosureItemClickListener(new EnclosureItemAdapter.OnEnclosureItemClickListener() {
+            @Override
+            public void onEnclosureClick(View view, int position) {
+
+            }
+        });
     }
 
     private void initIDS() {
@@ -198,7 +215,8 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
         hide_above_af = findViewById(R.id.hide_above_af);
         ex_invoice_ll = (LinearLayout) findViewById(R.id.ex_invoice_ll);
         grid_view = (MyGridView) findViewById(R.id.grid_view);
-
+        mFilesLinearLayout = (LinearLayout) findViewById(R.id.common_docui_files_ll);
+        mFilesListView = (MyListView) findViewById(R.id.common_docui_files_lv);
     }
 
     private void initDate() {
@@ -383,6 +401,34 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
                         DeleteComDocRequest(mCaller, mkeyValue);
                     }
                     break;
+                case GET_CAPTION_PATH:
+                    String result = msg.getData().getString("result");
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray filesArray = resultObject.getJSONArray("files");
+                    if (filesArray != null) {
+                        for (int i = 0; i < filesArray.size(); i++) {
+                            CityIndustryEnclosureBean cityIndustryEnclosureBean = new CityIndustryEnclosureBean();
+                            JSONObject fileObject = filesArray.getJSONObject(i);
+                            int fp_id = JSONUtil.getInt(fileObject, "fp_id");
+                            String fp_path = JSONUtil.getText(fileObject, "fp_path");
+                            int fp_size = JSONUtil.getInt(fileObject, "fp_size");
+                            String fp_name = JSONUtil.getText(fileObject, "fp_name");
+                            String fp_date = JSONUtil.getText(fileObject, "fp_date");
+                            String fp_man = JSONUtil.getText(fileObject, "fp_man");
+
+                            cityIndustryEnclosureBean.setFp_id(fp_id);
+                            cityIndustryEnclosureBean.setFp_path(fp_path);
+                            cityIndustryEnclosureBean.setFp_size(fp_size);
+                            cityIndustryEnclosureBean.setFp_name(fp_name);
+                            cityIndustryEnclosureBean.setFp_date(fp_date);
+                            cityIndustryEnclosureBean.setFp_man(fp_man);
+
+                            mCityIndustryEnclosureBeans.add(cityIndustryEnclosureBean);
+                        }
+                        mFilesLinearLayout.setVisibility(View.VISIBLE);
+                        mEnclosureItemAdapter.notifyDataSetChanged();
+                    }
+                    break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     Toast.makeText(CommonCityIndustryDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
                     if (!TextUtils.isEmpty(real_status) && real_status.equals("已审核")) {
@@ -433,6 +479,36 @@ public class CommonCityIndustryDetailsActivity extends BaseActivity {
             JSONArray formdataArray = dataObjecty.getJSONArray("formdata");
             showExP(formdataArray);
             JSONArray griddataArray = dataObjecty.getJSONArray("griddata");
+            JSONArray formconfigsArray = dataObjecty.getJSONArray("formconfigs");
+
+            if (formconfigsArray != null) {
+                boolean filesExist = false;
+                String fd_field = null;
+                for (int i = 0; i < formconfigsArray.size(); i++) {
+                    JSONObject formconfigsObject = formconfigsArray.getJSONObject(i);
+                    String fd_caption = JSONUtil.getText(formconfigsObject, "FD_CAPTION");
+                    if ("附件".equals(fd_caption)) {
+                        filesExist = true;
+                        fd_field = JSONUtil.getText(formconfigsObject, "FD_FIELD");
+                        break;
+                    }
+                }
+
+                if (filesExist) {
+                    String caption_id = JSONUtil.getText(formdataArray.getJSONObject(0), fd_field);
+                    progressDialog.show();
+                    String docmsg_url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "common/getFilePaths.action";
+                    Map<String, Object> param_am = new HashMap<>();
+                    param_am.put("field", "fb_attach");
+                    param_am.put("id", caption_id);
+                    LinkedHashMap headers_am = new LinkedHashMap();
+                    headers_am.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+                    ViewUtil.httpSendRequest(getApplicationContext(), docmsg_url, param_am, mHandler, headers_am, GET_CAPTION_PATH, null, null, "get");
+
+                } else {
+                    mFilesLinearLayout.setVisibility(View.GONE);
+                }
+            }
 
             LogUtil.prinlnLongMsg("amresultJsonObject", amresultJsonObject.toString());
             if (formdataArray == null) {

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

@@ -42,7 +42,12 @@ public class WorkFuncSetActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         getSupportActionBar().setTitle(R.string.work_func_set);
 
         mFuncRecyclerView = $(R.id.work_plat_func_set_rv);
-        mFuncRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
+        linearLayoutManager.setSmoothScrollbarEnabled(true);
+        linearLayoutManager.setAutoMeasureEnabled(true);
+//        linearLayoutManager.setRecycleChildrenOnDetach(true);
+//        mFuncRecyclerView.setItemViewCacheSize(0);
+        mFuncRecyclerView.setLayoutManager(linearLayoutManager);
 
         mWorkMenuBeans = new ArrayList<>();
         mHideWorkMenuBeans = new ArrayList<>();

app_modular/appworks/src/main/java/com/uas/appworks/adapter/EnclosureItemAdapter.java

@@ -0,0 +1,83 @@
+package com.uas.appworks.adapter;
+
+import android.content.Context;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.uas.appworks.R;
+import com.uas.appworks.model.bean.CityIndustryEnclosureBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EnclosureItemAdapter extends BaseAdapter {
+    private List<CityIndustryEnclosureBean> objects = new ArrayList<CityIndustryEnclosureBean>();
+
+    private Context context;
+    private LayoutInflater layoutInflater;
+    private OnEnclosureItemClickListener mOnEnclosureItemClickListener;
+
+    public EnclosureItemAdapter(Context context, List<CityIndustryEnclosureBean> objects) {
+        this.context = context;
+        this.objects = objects;
+        this.layoutInflater = LayoutInflater.from(context);
+    }
+
+    public void setOnEnclosureItemClickListener(OnEnclosureItemClickListener onEnclosureItemClickListener) {
+        mOnEnclosureItemClickListener = onEnclosureItemClickListener;
+    }
+
+    @Override
+    public int getCount() {
+        return objects.size();
+    }
+
+    @Override
+    public CityIndustryEnclosureBean getItem(int position) {
+        return objects.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = layoutInflater.inflate(R.layout.item_enclosure_layout, null);
+            convertView.setTag(new ViewHolder(convertView));
+        }
+        initializeViews((CityIndustryEnclosureBean) getItem(position), (ViewHolder) convertView.getTag(), position);
+        return convertView;
+    }
+
+    private void initializeViews(CityIndustryEnclosureBean object, ViewHolder holder, final int position) {
+        holder.itemEnclosureTv.setText(Html.fromHtml("&nbsp&nbsp&nbsp&nbsp&nbsp " + "<u>" + object.getFp_name() + "</u>"));
+        holder.itemEnclosureTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mOnEnclosureItemClickListener != null) {
+                    mOnEnclosureItemClickListener.onEnclosureClick(v, position);
+                }
+            }
+        });
+    }
+
+    protected class ViewHolder {
+        private TextView itemEnclosureTv;
+
+        public ViewHolder(View view) {
+            itemEnclosureTv = (TextView) view.findViewById(R.id.item_enclosure_tv);
+        }
+    }
+
+    public interface OnEnclosureItemClickListener {
+        void onEnclosureClick(View view, int position);
+    }
+
+}

app_modular/appworks/src/main/java/com/uas/appworks/adapter/WorkFuncSetChildAdapter.java

@@ -35,6 +35,10 @@ public class WorkFuncSetChildAdapter extends RecyclerView.Adapter<WorkFuncSetChi
         mOnVisibleChangeListener = onVisibleChangeListener;
     }
 
+    public List<WorkMenuBean.ModuleListBean> getModuleListBeans() {
+        return mModuleListBeans;
+    }
+
     public WorkFuncSetChildAdapter(Context context, List<WorkMenuBean.ModuleListBean> moduleListBeans) {
         mContext = context;
         mModuleListBeans = moduleListBeans;

app_modular/appworks/src/main/java/com/uas/appworks/adapter/WorkFuncSetParentAdapter.java

@@ -7,6 +7,7 @@ import android.os.Build;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,6 +30,7 @@ public class WorkFuncSetParentAdapter extends RecyclerView.Adapter<WorkFuncSetPa
     private List<WorkMenuBean> mWorkMenuBeans;
     private LayoutInflater mLayoutInflater;
     private Resources mResources;
+    private RecyclerView.RecycledViewPool mRecycledViewPool;
 
     public List<WorkMenuBean> getWorkMenuBeans() {
         return mWorkMenuBeans;
@@ -48,81 +50,100 @@ public class WorkFuncSetParentAdapter extends RecyclerView.Adapter<WorkFuncSetPa
     }
 
     @Override
-    public void onBindViewHolder(ParentViewHolder holder, final int position) {
+    public void onBindViewHolder(final ParentViewHolder holder, final int position) {
+        Log.d("ParentAdapter", "onBindViewHolder");
+        holder.setIsRecyclable(false);
         WorkMenuBean workMenuBean = mWorkMenuBeans.get(position);
         holder.titleTextView.setText(workMenuBean.getModuleName());
-        final List<WorkMenuBean.ModuleListBean> moduleListBeans = workMenuBean.getModuleList();
-
-        final WorkFuncSetChildAdapter childAdapter = new WorkFuncSetChildAdapter(mContext, moduleListBeans);
-        holder.parentRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4));
-        holder.parentRecyclerView.setAdapter(childAdapter);
-
-        ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(new ItemTouchHelper.Callback() {
-            @Override
-            public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-                //首先回调的方法 返回int表示是否监听该方向
-                int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
-                int swipeFlags = 0;
-                return makeMovementFlags(dragFlags, swipeFlags);
-            }
+        final List<WorkMenuBean.ModuleListBean> mModuleListBeans = workMenuBean.getModuleList();
+        final WorkFuncSetChildAdapter mChildAdapter = new WorkFuncSetChildAdapter(mContext, mModuleListBeans);
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 4);
+        gridLayoutManager.setSmoothScrollbarEnabled(true);
+        gridLayoutManager.setAutoMeasureEnabled(true);
+        gridLayoutManager.setRecycleChildrenOnDetach(true);
+
+        mRecycledViewPool = new RecyclerView.RecycledViewPool();
+        mRecycledViewPool.setMaxRecycledViews(mChildAdapter.getItemViewType(0), 20);
+
+        holder.parentRecyclerView.setLayoutManager(gridLayoutManager);
+        holder.parentRecyclerView.setNestedScrollingEnabled(false);
+//        holder.parentRecyclerView.setItemViewCacheSize(0);
+        holder.parentRecyclerView.setRecycledViewPool(mRecycledViewPool);
+        holder.parentRecyclerView.setAdapter(mChildAdapter);
+
+
+        try {
+            ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(new ItemTouchHelper.Callback() {
+                @Override
+                public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+                    //首先回调的方法 返回int表示是否监听该方向
+                    int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
+                    int swipeFlags = 0;
+                    return makeMovementFlags(dragFlags, swipeFlags);
+                }
 
-            @Override
-            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
-                int fromPosition = viewHolder.getAdapterPosition();
-                int toPosition = target.getAdapterPosition();
-                if (fromPosition < toPosition) {
-                    for (int i = fromPosition; i < toPosition; i++) {
-                        Collections.swap(moduleListBeans, i, i + 1);
-                    }
-                } else {
-                    for (int i = fromPosition; i > toPosition; i--) {
-                        Collections.swap(moduleListBeans, i, i - 1);
+                @Override
+                public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+                    int fromPosition = viewHolder.getAdapterPosition();
+                    int toPosition = target.getAdapterPosition();
+                    if (fromPosition < toPosition) {
+                        for (int i = fromPosition; i < toPosition; i++) {
+                            Collections.swap(mChildAdapter.getModuleListBeans(), i, i + 1);
+                        }
+                    } else {
+                        for (int i = fromPosition; i > toPosition; i--) {
+                            Collections.swap(mChildAdapter.getModuleListBeans(), i, i - 1);
+                        }
                     }
+                    mChildAdapter.notifyItemMoved(fromPosition, toPosition);
+                    return true;
                 }
-                childAdapter.notifyItemMoved(fromPosition, toPosition);
-                return true;
-            }
 
-            @Override
-            public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+                @Override
+                public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
 
-            }
+                }
 
-            @Override
-            public boolean canDropOver(RecyclerView recyclerView, RecyclerView.ViewHolder current, RecyclerView.ViewHolder target) {
-                return true;
-            }
+                @Override
+                public boolean canDropOver(RecyclerView recyclerView, RecyclerView.ViewHolder current, RecyclerView.ViewHolder target) {
+                    return true;
+                }
 
-            @Override
-            public boolean isLongPressDragEnabled() {
-                //是否可拖拽
-                return true;
-            }
+                @Override
+                public boolean isLongPressDragEnabled() {
+                    //是否可拖拽
+                    return true;
+                }
 
-            @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-            @Override
-            public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
-                if (actionState != ItemTouchHelper.ACTION_STATE_IDLE) {
-                    viewHolder.itemView.setBackgroundColor(mContext.getResources().getColor(R.color.item_drag_color));
-                    viewHolder.itemView.setScaleX(1.10f);
-                    viewHolder.itemView.setScaleY(1.10f);
+                @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+                @Override
+                public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+                    if (actionState != ItemTouchHelper.ACTION_STATE_IDLE) {
+                        viewHolder.itemView.setBackgroundColor(mContext.getResources().getColor(R.color.item_drag_color));
+                        viewHolder.itemView.setScaleX(1.10f);
+                        viewHolder.itemView.setScaleY(1.10f);
+                    }
+                    super.onSelectedChanged(viewHolder, actionState);
                 }
-                super.onSelectedChanged(viewHolder, actionState);
-            }
 
-            @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-            @Override
-            public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-                super.clearView(recyclerView, viewHolder);
-                viewHolder.itemView.setBackgroundColor(mContext.getResources().getColor(R.color.white));
-                viewHolder.itemView.setScaleX(1.0f);
-                viewHolder.itemView.setScaleY(1.0f);
-            }
-        });
+                @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+                @Override
+                public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+                    super.clearView(recyclerView, viewHolder);
+                    viewHolder.itemView.setBackgroundColor(mContext.getResources().getColor(R.color.white));
+                    viewHolder.itemView.setScaleX(1.0f);
+                    viewHolder.itemView.setScaleY(1.0f);
+                }
+            });
+
+            mItemTouchHelper.attachToRecyclerView(holder.parentRecyclerView);
+        } catch (Exception e) {
+            mChildAdapter.notifyDataSetChanged();
+            e.printStackTrace();
+        }
 
-        mItemTouchHelper.attachToRecyclerView(holder.parentRecyclerView);
 
-        childAdapter.setOnVisibleChangeListener(new WorkFuncSetChildAdapter.OnVisibleChangeListener() {
+        mChildAdapter.setOnVisibleChangeListener(new WorkFuncSetChildAdapter.OnVisibleChangeListener() {
             @Override
             public void onVisibleChange(boolean visible, int position) {
 

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

@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.config.BaseConfig;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
@@ -40,24 +42,28 @@ public class WorkPlatModel implements IWorkPlatModel {
             if (request == null) {
                 throw new NullPointerException("Request is null");
             }
-            mHttpClient = new HttpClient.Builder(CommonUtil.getAppBaseUrl(BaseConfig.getContext())).build();
-//            mHttpClient = new HttpClient.Builder("http://192.168.253.29:8080/ERP/").build();
-            mHttpClient.Api().send(new HttpClient.Builder()
-                    .url(request.getUrl())
-                    .addHeaders(request.getHeaders())
-                    .addParams(request.getParam())
-                    .method((request.getMode() == Request.Mode.GET) ? Method.GET : Method.POST)
-                    .build(), new ResultSubscriber<Object>(new Result2Listener<Object>() {
-                @Override
-                public void onResponse(Object o) {
-                    workCallback.onSuccess(request.getWhat(), o.toString());
-                }
+            if (ApiUtils.getApiModel() instanceof ApiPlatform) {
+//                mHttpClient = new HttpClient.Builder("").build();
+            } else {
+                mHttpClient = new HttpClient.Builder(CommonUtil.getAppBaseUrl(BaseConfig.getContext())).build();
+//                mHttpClient = new HttpClient.Builder("http://192.168.253.29:8080/ERP/").build();
+                mHttpClient.Api().send(new HttpClient.Builder()
+                        .url(request.getUrl())
+                        .addHeaders(request.getHeaders())
+                        .addParams(request.getParam())
+                        .method((request.getMode() == Request.Mode.GET) ? Method.GET : Method.POST)
+                        .build(), new ResultSubscriber<Object>(new Result2Listener<Object>() {
+                    @Override
+                    public void onResponse(Object o) {
+                        workCallback.onSuccess(request.getWhat(), o.toString());
+                    }
 
-                @Override
-                public void onFailure(Object t) {
-                    workCallback.onFail(request.getWhat(), t.toString());
-                }
-            }));
+                    @Override
+                    public void onFailure(Object t) {
+                        workCallback.onFail(request.getWhat(), t.toString());
+                    }
+                }));
+            }
         }
 
     }

app_modular/appworks/src/main/java/com/uas/appworks/model/bean/CityIndustryEnclosureBean.java

@@ -0,0 +1,74 @@
+package com.uas.appworks.model.bean;
+
+/**
+ * @author RaoMeng
+ * @describe
+ * @date 2017/11/22 17:58
+ */
+
+public class CityIndustryEnclosureBean {
+
+    /**
+     * fp_id : 45175
+     * fp_path : /usr/local/tomcat/webapps/postattach/U0807/d87ceda695654826b7866cd7674b151b.jpg
+     * fp_size : 359662
+     * fp_name : 2017-11-22 15:24:43:477.jpg
+     * fp_date : 2017-11-22 15:24:08
+     * fp_man : 刘金龙
+     */
+
+    private int fp_id;
+    private String fp_path;
+    private int fp_size;
+    private String fp_name;
+    private String fp_date;
+    private String fp_man;
+
+    public int getFp_id() {
+        return fp_id;
+    }
+
+    public void setFp_id(int fp_id) {
+        this.fp_id = fp_id;
+    }
+
+    public String getFp_path() {
+        return fp_path;
+    }
+
+    public void setFp_path(String fp_path) {
+        this.fp_path = fp_path;
+    }
+
+    public int getFp_size() {
+        return fp_size;
+    }
+
+    public void setFp_size(int fp_size) {
+        this.fp_size = fp_size;
+    }
+
+    public String getFp_name() {
+        return fp_name;
+    }
+
+    public void setFp_name(String fp_name) {
+        this.fp_name = fp_name;
+    }
+
+    public String getFp_date() {
+        return fp_date;
+    }
+
+    public void setFp_date(String fp_date) {
+        this.fp_date = fp_date;
+    }
+
+    public String getFp_man() {
+        return fp_man;
+    }
+
+    public void setFp_man(String fp_man) {
+        this.fp_man = fp_man;
+    }
+}

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

@@ -0,0 +1,14 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/item_enclosure_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:textColor="@color/titleBlue" />
+</LinearLayout>

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 124,
-            versionName      : '6.0.4',
+            versionCode      : 130,
+            versionName      : '6.0.6',
     ]
 
     depsVersion = [