修改订阅号、外勤签到字数限制、屏幕不适配

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

@@ -9,9 +9,12 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -60,6 +63,8 @@ public class OutSigninOKActivity extends BaseActivity {
     private TextView addr_tv;
     @ViewInject(R.id.com_tv)//签到对应公司
     private TextView com_tv;
+    @ViewInject(R.id.text_num)//填写备注字数
+    private TextView text_num;
     @ViewInject(R.id.text_edit)
     private EditText text_edit;
     @ViewInject(R.id.image_tag)
@@ -84,8 +89,8 @@ public class OutSigninOKActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.push) {
-            if (StringUtils.isEmpty(text_edit.getText().toString())){
-                Crouton.makeText(ct,"请填写备注");
+            if (StringUtils.isEmpty(text_edit.getText().toString())) {
+                Crouton.makeText(ct, "请填写备注");
                 return true;
             }
             if (!StringUtils.isEmpty(path) && new File(path).isFile())
@@ -101,6 +106,15 @@ public class OutSigninOKActivity extends BaseActivity {
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (getWindow().getAttributes().softInputMode == WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED) {
+            //隐藏软键盘
+            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+        }
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_push, menu);
@@ -126,6 +140,25 @@ public class OutSigninOKActivity extends BaseActivity {
                 showPopup();
             }
         });
+
+        text_edit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                int num = editable.length();
+                text_num.setText(num+"/"+ 60);
+                if (num > 60) {
+                    text_edit.setText(editable.subSequence(0, 60));
+                }
+            }
+        });
     }
 
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照

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

@@ -9,6 +9,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -55,6 +56,19 @@ public class StringUtils {
         }
     }
 
+    /**
+     * 判断指定字符是否被包含
+     *
+     * @param text 大字符
+     * @param str  小字符
+     * @return 是否包含
+     */
+    public static boolean isInclude(String text, String str) {
+        Pattern p = Pattern.compile(str);
+        Matcher m = p.matcher(text);
+        return m.find();
+    }
+
     /**
      * 以友好的方式显示时间
      *

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

@@ -158,7 +158,7 @@ public class MessageFragment extends EasyFragment {
             public void run() {
 //                if (mNeedUpdate) {
 //                    mNeedUpdate = false;
-                    refreshUI();
+                refreshUI();
 //                }
             }
         }, 1);
@@ -168,7 +168,8 @@ public class MessageFragment extends EasyFragment {
         this.refreshRedUIListener = refreshRedUI;
     }
 
-    public void setListener(int num) {
+    public void setListener() {
+        int num = BMSGS_count + GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count;
         if (refreshRedUIListener == null) return;
         refreshRedUIListener.updata(num);
     }
@@ -721,7 +722,8 @@ public class MessageFragment extends EasyFragment {
             b2b_num_tv.setVisibility(View.VISIBLE);
             b2b_content_tv.setText("您有" + bMsgs.size() + "条商务消息未读");
             rl_b2b.setVisibility(View.VISIBLE);
-            setListener(bMsgs.size() + GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
+            BMSGS_count = bMsgs.size();
+            setListener();
         } else {
             rl_b2b.setVisibility(View.GONE);
         }
@@ -744,7 +746,8 @@ public class MessageFragment extends EasyFragment {
                                 num += 1;
                         }
                     }
-                    setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + num);
+                    SUBRICE_count = num;
+                    setListener();
                     if (num > 0) {
                         num_tv.setText(num + "");
                         num_tv.setVisibility(View.VISIBLE);
@@ -779,7 +782,7 @@ public class MessageFragment extends EasyFragment {
                     break;
                 case TASK_MSG:
                     Log.i("gonpengming", "TASK_MSG=" + TASK_count);
-                    setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
+                    setListener();
                     if (TASK_count > 0) {
                         task_num_tv.setText(TASK_count + "");
                         task_num_tv.setVisibility(View.VISIBLE);
@@ -791,7 +794,7 @@ public class MessageFragment extends EasyFragment {
                     }
                     break;
                 case DAIBAN_MSG:
-                    setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
+                    setListener();
                     if (DAIBAN_count > 0) {
                         schedule_num_tv.setText(DAIBAN_count + "");
                         schedule_num_tv.setVisibility(View.VISIBLE);
@@ -802,25 +805,13 @@ public class MessageFragment extends EasyFragment {
                         schedule_content_tv.setText("您暂无未阅读审批流程");
                     }
                     break;
-//                case SUBRICE_MSG:
-//                    setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
-//                    if (SUBRICE_count > 0) {
-//                        num_tv.setText(SUBRICE_count + "");
-//                        num_tv.setVisibility(View.VISIBLE);
-//                        content_tv.setText("您有" + SUBRICE_count + "条订阅消息未阅读");
-//                        time_tv.setText("刚刚");
-//                    } else {
-//                        num_tv.setVisibility(View.GONE);
-//                        content_tv.setText("您暂无未阅读订阅消息");
-//                    }
-//                    break;
             }
         }
     };
 
 
     private void setNOTICE_count(int count) {
-        setListener(GONGGAO_count + NOTICE_count + NES_count + TASK_count + DAIBAN_count + SUBRICE_count);
+        setListener();
         if (count > 0) {
             notice_num_tv.setText(count + "");
             notice_num_tv.setVisibility(View.VISIBLE);
@@ -832,8 +823,8 @@ public class MessageFragment extends EasyFragment {
         }
     }
 
-    public static final int GONGGAO_MSG = 0X00a, NOTICE_MSG = 0X00b, NES_MSG = 0X00c, TASK_MSG = 0X00d, DAIBAN_MSG = 0X00e, SUBRICE_MSG = 0xf;
-    private int GONGGAO_count = 0, NOTICE_count = 0, NES_count = 0, TASK_count = 0, DAIBAN_count = 0, SUBRICE_count = 0;
+    public static final int GONGGAO_MSG = 0X00a, NOTICE_MSG = 0X00b, NES_MSG = 0X00c, TASK_MSG = 0X00d, DAIBAN_MSG = 0X00e;
+    private int GONGGAO_count = 0, NOTICE_count = 0, NES_count = 0, TASK_count = 0, DAIBAN_count = 0, SUBRICE_count = 0, BMSGS_count = 0;
 
     private void updateGongGao(Message msg) {
         final String result = msg.getData().getString("result");

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

@@ -31,6 +31,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.SubcribeManageActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.tool.ThreadPool;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.LoadLocalImageUtil;
@@ -82,8 +83,8 @@ public class SubscriptionActivity extends BaseActivity {
                 listView.onRefreshComplete();
             switch (msg.what) {
                 case LOAD_NET:
-                    String message =   msg.getData().getString("result");
-                    Log.e("subscribeMsg",message);
+                    String message = msg.getData().getString("result");
+                    Log.e("subscribeMsg", message);
                     if (message != null && JSON.parseObject(message).containsKey("data")) {
                         String str = JSON.parseObject(message).getJSONArray("data").toJSONString();
                         SubscriptionMessages = JSON.parseArray(str, SubscriptionMessage.class);
@@ -101,7 +102,7 @@ public class SubscriptionActivity extends BaseActivity {
                     }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    ToastUtil.showToast(ct,"系统内部错误");
+                    ToastUtil.showToast(ct, "系统内部错误");
                     break;
                 default:
             }
@@ -160,7 +161,7 @@ public class SubscriptionActivity extends BaseActivity {
 
             case R.id.subscribe_manage:
                 Intent intent = new Intent();
-                intent.setClass(this,SubcribeManageActivity.class);
+                intent.setClass(this, SubcribeManageActivity.class);
                 startActivity(intent);
                 break;
             case android.R.id.home:
@@ -522,7 +523,12 @@ public class SubscriptionActivity extends BaseActivity {
                     String url = baseUrl + "common/charts/mobileCharts.action?" + "numId=" + bean.getNUM_ID_() +
                             "&mainId=" + bean.getINSTANCE_ID_() + "&insId=" + bean.getID_() +
                             "&title=" + bean.getTITLE_();
-                    String title = TimeUtils.ym_long_2_str(sortSubsrciprions.get(position).tiem) + "  " + bean.getTITLE_();
+                    String chche = bean.getTITLE_() == null ? "" : bean.getTITLE_();
+                    String title = TimeUtils.long2str(sortSubsrciprions.get(position).tiem, "yyyyMMdd") + "  " + bean.getTITLE_();
+                    if (StringUtils.isInclude(chche, "日报登记")) {
+                        title = TimeUtils.long2str(sortSubsrciprions.get(position).tiem - (24 * 3600 * 1000), "yyyyMMdd") + "  " + bean.getTITLE_();
+                    }
+
                     ViewUtil.webLinks(activity, url, title, true);
                     if (bean.getSTATUS_() == 0) {//当点击未读消息
                         SubscriptionDao.getInstance().UpdateStatus(bean.getID_() + "", true);
@@ -531,6 +537,7 @@ public class SubscriptionActivity extends BaseActivity {
                     }
                 }
             });
+
             contextView.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View view) {

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

@@ -105,20 +105,20 @@
                 android:layout_height="wrap_content"
                 android:background="@null"
                 android:gravity="top"
-                android:hint="请填写备注(不超过100个字)"
+                android:hint="请填写备注(不超过60个字)"
                 android:inputType="textMultiLine"
                 android:minLines="6"
                 android:textSize="@dimen/text_main" />
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-            >
+                android:layout_height="wrap_content">
 
                 <ImageView
                     android:id="@+id/image"
                     android:layout_width="50dp"
-                    android:layout_height="50dp" />
+                    android:layout_height="50dp"
+                    android:scaleType="fitXY" />
 
                 <ImageView
                     android:id="@+id/image_tag"
@@ -127,6 +127,16 @@
                     android:layout_alignParentRight="true"
                     android:background="@null"
                     android:src="@drawable/picture" />
+
+                <TextView
+                    android:id="@+id/text_num"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_margin="5dp"
+                    android:layout_toLeftOf="@id/image_tag"
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
             </RelativeLayout>
         </LinearLayout>
 

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

@@ -1,188 +1,193 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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:background="@color/bg_main">
 
-    <RelativeLayout
-        android:id="@+id/top"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="10dp">
-
-        <ImageView
-            android:id="@+id/name_img"
-            android:layout_width="60dp"
-            android:background="@drawable/round_bg"
-            android:layout_height="60dp"
-            android:gravity="center"
-            android:scaleType="fitXY"
-            android:textColor="@color/white"
-            android:textSize="40sp" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/top"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dp">
+
+            <ImageView
+                android:id="@+id/name_img"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:background="@drawable/round_bg"
+                android:gravity="center"
+                android:scaleType="fitXY"
+                android:textColor="@color/white"
+                android:textSize="40sp" />
+
+            <View
+                android:id="@+id/line"
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:layout_alignLeft="@id/name_img"
+                android:layout_below="@id/name_img"
+                android:background="@color/item_line" />
+
+            <TextView
+                android:id="@+id/name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@+id/name_img"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@+id/name_img"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                android:id="@+id/tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@+id/name_tv"
+                android:layout_below="@+id/line"
+                android:layout_marginTop="15dp"
+                android:text="你今天完成签到"
+                android:textSize="20dp" />
+
+            <TextView
+                android:id="@+id/num_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/tv"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_toRightOf="@+id/tv"
+                android:text=" 0"
+                android:textColor="@color/mainList2"
+                android:textSize="25dp" />
+
+            <TextView
+
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/tv"
+                android:layout_marginLeft="2dp"
+                android:layout_toRightOf="@+id/num_tv"
+                android:text="次"
+                android:textSize="20dp" />
+
+            <TextView
+                android:id="@+id/com_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@+id/name_tv"
+                android:layout_below="@+id/name_tv"
+                android:layout_marginTop="5dp"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine" />
+        </RelativeLayout>
+
 
         <View
-            android:id="@+id/line"
             android:layout_width="match_parent"
             android:layout_height="2px"
-            android:layout_alignLeft="@id/name_img"
-            android:layout_below="@id/name_img"
+            android:layout_marginTop="30dp"
             android:background="@color/item_line" />
 
-        <TextView
-            android:id="@+id/name_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/name_img"
-            android:layout_marginLeft="10dp"
-            android:layout_toRightOf="@+id/name_img"
-            android:text="熊天命"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <TextView
-            android:id="@+id/tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/name_tv"
-            android:layout_below="@+id/line"
-            android:layout_marginTop="15dp"
-            android:text="你今天完成签到"
-            android:textSize="20dp" />
-
-        <TextView
-            android:id="@+id/num_tv"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/tv"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_toRightOf="@+id/tv"
-            android:text=" 0"
-            android:textColor="@color/mainList2"
-            android:textSize="25dp" />
-
-        <TextView
+            android:layout_below="@id/tv"
+            android:background="@color/white"
+            android:padding="10dp">
+
+            <com.baidu.mapapi.map.MapView
+                android:id="@+id/mapView"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_centerVertical="true"
+                android:clickable="true" />
+
+            <ImageView
+                android:id="@+id/tag_img"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/mapView"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@id/mapView"
+                android:src="@drawable/outoffice_time" />
+
+            <TextView
+                android:id="@+id/date_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/tag_img"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@id/tag_img"
+                android:gravity="center_vertical"
+                android:textSize="@dimen/text_hine" />
+
+            <ImageView
+                android:id="@+id/tag_img2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/tag_img"
+                android:layout_below="@id/tag_img"
+                android:layout_marginTop="10dp"
+                android:src="@drawable/outffice_addr" />
+
+            <TextView
+                android:id="@+id/location_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/date_tv"
+                android:layout_alignTop="@id/tag_img2"
+                android:layout_below="@+id/date_tv"
+                android:gravity="center_vertical"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                android:id="@+id/addr_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/date_tv"
+                android:layout_below="@+id/location_tv"
+                android:layout_marginTop="5dp"
+                android:maxLines="2"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine" />
+
+            <TextView
+                android:id="@+id/do_trim"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/date_tv"
+                android:layout_below="@id/addr_tv"
+                android:layout_marginTop="10dp"
+                android:maxLines="1"
+                android:text="地点微调"
+                android:textColor="@color/green"
+                android:textSize="@dimen/text_hine" />
+        </RelativeLayout>
 
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/tv"
-            android:layout_marginLeft="2dp"
-            android:layout_toRightOf="@+id/num_tv"
-            android:text="次"
-            android:textSize="20dp" />
-
-        <TextView
-            android:id="@+id/com_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/name_tv"
-            android:layout_below="@+id/name_tv"
-            android:layout_marginTop="5dp"
-            android:text="优软科技"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-    </RelativeLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:layout_below="@+id/mapView"
+            android:background="@color/item_line" />
 
+        <Button
+            android:id="@+id/click_btn"
+            android:layout_width="130dp"
+            android:layout_height="130dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_gravity="center"
+            android:layout_marginTop="100dp"
+            android:background="@drawable/signin"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+    </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_marginTop="30dp"
-        android:background="@color/item_line" />
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/tv"
-        android:background="@color/white"
-        android:padding="10dp">
-
-        <com.baidu.mapapi.map.MapView
-            android:id="@+id/mapView"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_centerVertical="true"
-            android:clickable="true" />
-
-        <ImageView
-            android:id="@+id/tag_img"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/mapView"
-            android:layout_marginLeft="10dp"
-            android:layout_toRightOf="@id/mapView"
-            android:src="@drawable/outoffice_time" />
-
-        <TextView
-            android:id="@+id/date_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/tag_img"
-            android:layout_marginLeft="5dp"
-            android:layout_toRightOf="@id/tag_img"
-            android:gravity="center_vertical"
-            android:textSize="@dimen/text_hine" />
-
-        <ImageView
-            android:id="@+id/tag_img2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/tag_img"
-            android:layout_below="@id/tag_img"
-            android:layout_marginTop="10dp"
-            android:src="@drawable/outffice_addr" />
-
-        <TextView
-            android:id="@+id/location_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/date_tv"
-            android:layout_alignTop="@id/tag_img2"
-            android:layout_below="@+id/date_tv"
-            android:gravity="center_vertical"
-            android:textColor="@color/text_main"
-            android:textSize="@dimen/text_main" />
-
-        <TextView
-            android:id="@+id/addr_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/date_tv"
-            android:layout_below="@+id/location_tv"
-            android:layout_marginTop="5dp"
-            android:maxLines="2"
-            android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
-
-        <TextView
-            android:id="@+id/do_trim"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/date_tv"
-            android:layout_below="@id/addr_tv"
-            android:layout_marginTop="10dp"
-            android:maxLines="1"
-            android:text="地点微调"
-            android:textColor="@color/green"
-            android:textSize="@dimen/text_hine" />
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:layout_below="@+id/mapView"
-        android:background="@color/item_line" />
-
-    <Button
-        android:id="@+id/click_btn"
-        android:layout_width="130dp"
-        android:layout_height="130dp"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_gravity="center"
-        android:layout_marginTop="100dp"
-        android:background="@drawable/signin"
-        android:textColor="@color/white"
-        android:textSize="20sp" />
-</LinearLayout>
+</ScrollView>