diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 949881f..f9484f6 100644
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
Binary files differ

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 949881f..f9484f6 100644
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
Binary files differ
diff --git a/app/app.iml b/app/app.iml
index e4ddc21..659f253 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -19,7 +19,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 949881f..f9484f6 100644
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
Binary files differ
diff --git a/app/app.iml b/app/app.iml
index e4ddc21..659f253 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -19,7 +19,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
diff --git a/app/libs/Native_Libs2.jar b/app/libs/Native_Libs2.jar
index 471fba7..1cc5852 100644
--- a/app/libs/Native_Libs2.jar
+++ b/app/libs/Native_Libs2.jar
Binary files differ

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 949881f..f9484f6 100644
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
Binary files differ
diff --git a/app/app.iml b/app/app.iml
index e4ddc21..659f253 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -19,7 +19,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
diff --git a/app/libs/Native_Libs2.jar b/app/libs/Native_Libs2.jar
index 471fba7..1cc5852 100644
--- a/app/libs/Native_Libs2.jar
+++ b/app/libs/Native_Libs2.jar
Binary files differ
diff --git a/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java b/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java
index fb4a998..61c8aca 100644
--- a/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java
+++ b/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java
@@ -2,7 +2,6 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.bluetooth.BluetoothAdapter;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
@@ -20,7 +19,6 @@
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
@@ -35,7 +33,6 @@
 import com.baoyz.swipemenulistview.SwipeMenuCreator;
 import com.baoyz.swipemenulistview.SwipeMenuItem;
 import com.baoyz.swipemenulistview.SwipeMenuListView;
-import com.casic.mapcollector.MyApplication;
 import com.casic.mapcollector.R;
 import com.casic.mapcollector.bean.AppendantInfo;
 import com.casic.mapcollector.bean.LineInfo;
@@ -64,7 +61,6 @@
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.annotations.ViewById;
 
-import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -93,7 +89,13 @@
     public ViewPager mViewPager;
 
     @ViewById
-    public NiceTabLayout mNiceTabLayout;
+    public LinearLayout tabLinearLayout;
+    @ViewById
+    public TextView firstTabView;
+    @ViewById
+    public TextView secondTabView;
+    @ViewById
+    public TextView thirdTabView;
 
     @ViewById
     LinearLayout buttonLayout;
@@ -130,41 +132,24 @@
 
     private MapDetailInfo selectedMapDetailInfo;
 
-    private BluetoothAdapter bluetoothAdapter;
-
-    private MyApplication appState;
-
     private int mapMode = 0;//0为新增，1为查看
 
     private int saveMode = 0;//0为新增，1为编辑
 
     private String positionInfo = "未获取到坐标";
 
-    private static int[] btcmd = {0x02, 0x00, 0x64, 0x0D, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x07, 0x04, 0x26, 0x00, 0x03, 0x00, 0xA9, 0x03};
-
-    private static int[] stopcmd = {0x02, 0x00, 0x64, 0x0D, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x07, 0x04, 0xFF, 0x00, 0x00, 0x00, 0x7F, 0x03};
-
-    ArrayAdapter<String> typeSpinnerArrayAdapter;
-
-    private List<SamplePagerItem> mTabs = new ArrayList<>();
-
     ArrayList<Fragment> listFragment;
 
-    public MapInfo getMapInfo() {
-        return mapInfo;
-    }
-
     @AfterViews
     public void init() {
         try {
             mapMode = mapInfo == null ? 0 : 1;
-            initTabs();
             initViewPager();
             mapUploadFloatButton.attachToListView(pipeListView);
             if (mapMode == 0) {
                 mapInfo = new MapInfo();
                 seriesNumber = "";
-                mNiceTabLayout.setVisibility(View.VISIBLE);
+                tabLinearLayout.setVisibility(View.VISIBLE);
                 mViewPager.setVisibility(View.VISIBLE);
             } else if (mapMode == 1) {
                 lineInfos = mapInfo.getLines();
@@ -176,13 +161,10 @@
                 editMapName.setEnabled(false);
                 buttonLayout.setVisibility(View.GONE);
                 mapUploadFloatButton.setVisibility(View.GONE);
-                mNiceTabLayout.setVisibility(View.GONE);
+                tabLinearLayout.setVisibility(View.GONE);
                 mViewPager.setVisibility(View.GONE);
             }
             pipeListView.setAdapter(mAdapter);
-
-            appState = (MyApplication) getApplicationContext();
-            //TODO LIST：初始化可刷新的ListView
             initListView();
         } catch (Exception e) {
             Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
@@ -204,113 +186,16 @@
 
     }
 
-    static class SamplePagerItem {
-        private final CharSequence mTitle;
-        private final int mIosIconResId;
-        private final int mAndroidIconResId;
-        private final int mIndicatorColor;
-        private final int mDividerColor;
-
-        SamplePagerItem(CharSequence title, int iosIconResId, int androidIconResId, int indicatorColor, int dividerColor) {
-            mTitle = title;
-            mIosIconResId = iosIconResId;
-            mAndroidIconResId = androidIconResId;
-            mIndicatorColor = indicatorColor;
-            mDividerColor = dividerColor;
-        }
-
-        CharSequence getTitle() {
-            return mTitle;
-        }
-
-        int getIosIconResId() {
-            return mIosIconResId;
-        }
-
-        int getAndroidIconResId() {
-            return mAndroidIconResId;
-        }
-
-        int getIndicatorColor() {
-            return mIndicatorColor;
-        }
-
-        int getDividerColor() {
-            return mDividerColor;
-        }
-    }
-
-    private void initTabs() {
-
-        mTabs.add(new SamplePagerItem(
-                getString(R.string.tab_pipe), // Title
-                R.drawable.ic_home, // Icon
-                R.drawable.ic_home_a, // Icon
-                getResources().getColor(R.color.home), // Indicator color
-                getResources().getColor(R.color.home) // Divider color
-        ));
-
-        mTabs.add(new SamplePagerItem(
-                getString(R.string.tab_appendant), // Title
-                R.drawable.ic_activity, // Icon
-                R.drawable.ic_activity_a, // Icon
-                getResources().getColor(R.color.activity), // Indicator color
-                getResources().getColor(R.color.activity) // Divider color
-        ));
-
-        mTabs.add(new SamplePagerItem(
-                getString(R.string.tab_point), // Title
-                R.drawable.ic_search, // Icon
-                R.drawable.ic_search_a, // Icon
-                getResources().getColor(R.color.search), // Indicator color
-                getResources().getColor(R.color.search) // Divider color
-        ));
-    }
-
     private void initViewPager() {
-        listFragment = new ArrayList<Fragment>();
-        Fragment fragment1;
-        Fragment fragment2;
-        Fragment fragment3;
-        fragment1 = new EditPipeFragment_();
-        fragment2 = new EditAppendantFragment_();
-        fragment3 = new EditPointFragment_();
+        listFragment = new ArrayList<>();
+        Fragment fragment1 = new EditPipeFragment_();
+        Fragment fragment2 = new EditAppendantFragment_();
+        Fragment fragment3 = new EditPointFragment_();
         listFragment.add(fragment1);
         listFragment.add(fragment2);
         listFragment.add(fragment3);
 
-        mViewPager.setAdapter(new SampleFragmentPagerAdapter(getSupportFragmentManager(), listFragment));
-        mViewPager.setCurrentItem(0);
-        mNiceTabLayout.setViewPager(mViewPager);
-
-        mNiceTabLayout.setTabStripColorize(new NiceTabStrip.TabStripColorize() {
-
-            @Override
-            public int getIndicatorColor(int position) {
-                return mTabs.get(position).getIndicatorColor();
-            }
-
-            @Override
-            public int getDividerColor(int position) {
-                return mTabs.get(position).getDividerColor();
-            }
-        });
-
-        mNiceTabLayout.setTabColorize(new NiceTabLayout.TabColorize() {
-
-            @Override
-            public int getDefaultTabColor(int position) {
-                return Color.WHITE;
-            }
-
-            @Override
-            public int getSelectedTabColor(int position) {
-                return mTabs.get(position).getIndicatorColor();
-            }
-        });
-        mNiceTabLayout.setDistributeEvenly(true);
-        mNiceTabLayout.setOnIndicatorColorChangedListener(this);
-        mNiceTabLayout.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+        mViewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
 
@@ -318,6 +203,23 @@
 
             @Override
             public void onPageSelected(int position) {
+                switch (position) {
+                    case 0:
+                        firstTabView.setTextColor(getResources().getColor(R.color.home));
+                        secondTabView.setTextColor(getResources().getColor(R.color.white));
+                        thirdTabView.setTextColor(getResources().getColor(R.color.white));
+                        break;
+                    case 1:
+                        firstTabView.setTextColor(getResources().getColor(R.color.white));
+                        secondTabView.setTextColor(getResources().getColor(R.color.activity));
+                        thirdTabView.setTextColor(getResources().getColor(R.color.white));
+                        break;
+                    case 2:
+                        firstTabView.setTextColor(getResources().getColor(R.color.white));
+                        secondTabView.setTextColor(getResources().getColor(R.color.white));
+                        thirdTabView.setTextColor(getResources().getColor(R.color.search));
+                        break;
+                }
                 saveMode = 0;
                 btnAdd.setText("添加");
                 if (position == 0) {
@@ -326,7 +228,6 @@
                 } else if (position == 1) {
                     EditAppendantFragment editAppendantFragment = (EditAppendantFragment) listFragment.get(position);
 //                    editAppendantFragment.refreshPipeTypeList(null,null);
-
                 } else if (position == 2) {
                     EditPointFragment editPointFragment = (EditPointFragment) listFragment.get(position);
 //                    editPointFragment.refreshPipeTypeList(null,null);
@@ -338,7 +239,58 @@
 
             }
         });
+        mViewPager.setAdapter(new TabFragmentPagerAdapter(getSupportFragmentManager(), listFragment));
+        mViewPager.setCurrentItem(0);
+        firstTabView.setTextColor(getResources().getColor(R.color.home));
 
+        firstTabView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mViewPager.setCurrentItem(0);
+                firstTabView.setTextColor(getResources().getColor(R.color.home));
+                secondTabView.setTextColor(getResources().getColor(R.color.white));
+                thirdTabView.setTextColor(getResources().getColor(R.color.white));
+            }
+        });
+
+        secondTabView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mViewPager.setCurrentItem(1);
+                firstTabView.setTextColor(getResources().getColor(R.color.white));
+                secondTabView.setTextColor(getResources().getColor(R.color.activity));
+                thirdTabView.setTextColor(getResources().getColor(R.color.white));
+            }
+        });
+
+        thirdTabView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mViewPager.setCurrentItem(2);
+                firstTabView.setTextColor(getResources().getColor(R.color.white));
+                secondTabView.setTextColor(getResources().getColor(R.color.white));
+                thirdTabView.setTextColor(getResources().getColor(R.color.search));
+            }
+        });
+    }
+
+    public static class TabFragmentPagerAdapter extends FragmentPagerAdapter {
+        private List<Fragment> listFragments;
+
+        TabFragmentPagerAdapter(FragmentManager fm, List<Fragment> list) {
+            super(fm);
+            this.listFragments = list;
+        }
+
+        @Override
+        public Fragment getItem(int arg0) {
+            return listFragments.get(arg0);//显示第几个页面
+        }
+
+        @Override
+        public int getCount() {
+            return listFragments.size();//有几个页面
+        }
     }
 
     private void initListView() {
@@ -438,46 +390,6 @@
                 getResources().getDisplayMetrics());
     }
 
-
-    //蓝牙
-//    @Override
-//    public boolean handleMessage(Message msg)
-//    {
-//        super.handleMessage(msg);;
-//        String message = "";
-//        switch(msg.what)
-//        {
-//            case MyApplication.MSG_READ:
-//                Log.d("btreceive", String.valueOf(msg.obj));
-//                message = String.valueOf(msg.obj);
-//                if (message.contains("GPGGA"))
-//                {
-//                    try
-//                    {
-//                        String messagePart[] = message.split(",");
-//                        String latitude = String.valueOf(Double.valueOf(messagePart[2].substring(0,2))+Double.valueOf(messagePart[2].substring(2))/60).substring(0,9);
-//                        String longitude = String.valueOf(Double.valueOf(messagePart[4].substring(0,3))+Double.valueOf(messagePart[4].substring(3))/60).substring(0,10);;
-//                        Log.d("RTKposition",Double.valueOf(messagePart[2].substring(0, 2)).toString());
-//                        Log.d("RTKposition",Double.valueOf(messagePart[2].substring(2)).toString());
-//                        Log.d("RTKposition","latitude="+latitude);
-//                        Log.d("RTKposition","longitude="+longitude);
-//                        positionInfo = latitude+","+longitude;
-//                    }
-//                    catch (Exception e)
-//                    {
-//                        Log.e(TAG, e.getLocalizedMessage());
-//                    }
-//                }
-//                break;
-//            case MyApplication.MSG_WRITE:
-//                break;
-//            case MyApplication.MSG_CONNECTED:
-//                appState.write(String.valueOf(btcmd));
-//                break;
-//        }
-//        return false;
-//    }
-
     @Click
     public void mapUploadFloatButton() {
         System.out.println("exit scan");
@@ -604,7 +516,7 @@
             endLong = editEndPos.getText().toString().split(",")[1].trim();
             material = editTexture.getText().toString().trim();
             diameter = editDiameter.getText().toString().trim();
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINESE);
             collectDate = simpleDateFormat.format(new Date());
             code = "PIPELINE" + collectDate;
             startMemo = editStartMemo.getText().toString().trim();
@@ -914,9 +826,7 @@
     public static boolean isDouble(String value) {
         try {
             Double.parseDouble(value);
-            if (value.contains("."))
-                return true;
-            return false;
+            return value.contains(".");
         } catch (NumberFormatException e) {
             return false;
         }
@@ -977,10 +887,6 @@
         }
     }
 
-    public class TwoBean implements Serializable {
-        public double[][] point;
-    }
-
     @Click
     public void btnView() {
         ArrayList<String> lineList = new ArrayList<>();
@@ -1288,7 +1194,6 @@
         return false;
     }
 
-
     static class ViewHolder {
 
         View pipeItem;
@@ -1305,76 +1210,17 @@
 
     }
 
-    class SampleFragmentPagerAdapter extends FragmentPagerAdapter implements NiceTabLayout.IconTabProvider {
-
-        private ArrayList<Fragment> listFragments;
-
-        SampleFragmentPagerAdapter(FragmentManager fm, ArrayList<Fragment> al) {
-            super(fm);
-            listFragments = al;
-        }
-
-        @Override
-        public Fragment getItem(int i) {
-            return listFragments.get(i);
-        }
-
-        @Override
-        public int getCount() {
-            return mTabs.size();
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return mTabs.get(position).getTitle();
-        }
-
-        @Override
-        public int getPageIconResId(int position) {
-            return mTabs.get(position).getAndroidIconResId();
-        }
-    }
-
-
-    //GPS
-//    private void startServices()
-//    {
-//        gpsLongitude = 0;
-//        gpsLatitude = 0;
-//        Intent gpsIntent = new Intent(this, GpsControlService.class);
-//        gpsIntent.putExtra(GpsControlService.LABEL_NM, "United");
-//        gpsIntent.putExtra(GpsControlService.LABEL_SN, "Pheonix");
-//        startService(gpsIntent);
-//    }
-
     private void stopServices() {
         try {
             stopService(new Intent(this, GpsControlService.class));
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
     }
 
-//    private final BroadcastReceiver getMyPositionReceiver = new BroadcastReceiver()
-//    {
-//        @Override
-//        public void onReceive(Context context, Intent intent)
-//        {
-//            if (GpsControlService.GPS_MY_LOCATION.equals(intent.getAction()))
-//            {
-//                Bundle bundle = intent.getExtras();
-//                if (bundle != null) {
-//                    gpsLongitude = GpsControlService.getMyPostion().getLongitude();
-//                    gpsLatitude = GpsControlService.getMyPostion().getLatitude();
-//                }
-//            }
-//        }
-//    };
-
     @Override
     protected void onDestroy() {
         stopServices();
         super.onDestroy();
     }
-
-}
+}
\ No newline at end of file

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 949881f..f9484f6 100644
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
Binary files differ
diff --git a/app/app.iml b/app/app.iml
index e4ddc21..659f253 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -19,7 +19,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
diff --git a/app/libs/Native_Libs2.jar b/app/libs/Native_Libs2.jar
index 471fba7..1cc5852 100644
--- a/app/libs/Native_Libs2.jar
+++ b/app/libs/Native_Libs2.jar
Binary files differ
diff --git a/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java b/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java
index fb4a998..61c8aca 100644
--- a/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java
+++ b/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java
@@ -2,7 +2,6 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.bluetooth.BluetoothAdapter;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
@@ -20,7 +19,6 @@
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
@@ -35,7 +33,6 @@
 import com.baoyz.swipemenulistview.SwipeMenuCreator;
 import com.baoyz.swipemenulistview.SwipeMenuItem;
 import com.baoyz.swipemenulistview.SwipeMenuListView;
-import com.casic.mapcollector.MyApplication;
 import com.casic.mapcollector.R;
 import com.casic.mapcollector.bean.AppendantInfo;
 import com.casic.mapcollector.bean.LineInfo;
@@ -64,7 +61,6 @@
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.annotations.ViewById;
 
-import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -93,7 +89,13 @@
     public ViewPager mViewPager;
 
     @ViewById
-    public NiceTabLayout mNiceTabLayout;
+    public LinearLayout tabLinearLayout;
+    @ViewById
+    public TextView firstTabView;
+    @ViewById
+    public TextView secondTabView;
+    @ViewById
+    public TextView thirdTabView;
 
     @ViewById
     LinearLayout buttonLayout;
@@ -130,41 +132,24 @@
 
     private MapDetailInfo selectedMapDetailInfo;
 
-    private BluetoothAdapter bluetoothAdapter;
-
-    private MyApplication appState;
-
     private int mapMode = 0;//0为新增，1为查看
 
     private int saveMode = 0;//0为新增，1为编辑
 
     private String positionInfo = "未获取到坐标";
 
-    private static int[] btcmd = {0x02, 0x00, 0x64, 0x0D, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x07, 0x04, 0x26, 0x00, 0x03, 0x00, 0xA9, 0x03};
-
-    private static int[] stopcmd = {0x02, 0x00, 0x64, 0x0D, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x07, 0x04, 0xFF, 0x00, 0x00, 0x00, 0x7F, 0x03};
-
-    ArrayAdapter<String> typeSpinnerArrayAdapter;
-
-    private List<SamplePagerItem> mTabs = new ArrayList<>();
-
     ArrayList<Fragment> listFragment;
 
-    public MapInfo getMapInfo() {
-        return mapInfo;
-    }
-
     @AfterViews
     public void init() {
         try {
             mapMode = mapInfo == null ? 0 : 1;
-            initTabs();
             initViewPager();
             mapUploadFloatButton.attachToListView(pipeListView);
             if (mapMode == 0) {
                 mapInfo = new MapInfo();
                 seriesNumber = "";
-                mNiceTabLayout.setVisibility(View.VISIBLE);
+                tabLinearLayout.setVisibility(View.VISIBLE);
                 mViewPager.setVisibility(View.VISIBLE);
             } else if (mapMode == 1) {
                 lineInfos = mapInfo.getLines();
@@ -176,13 +161,10 @@
                 editMapName.setEnabled(false);
                 buttonLayout.setVisibility(View.GONE);
                 mapUploadFloatButton.setVisibility(View.GONE);
-                mNiceTabLayout.setVisibility(View.GONE);
+                tabLinearLayout.setVisibility(View.GONE);
                 mViewPager.setVisibility(View.GONE);
             }
             pipeListView.setAdapter(mAdapter);
-
-            appState = (MyApplication) getApplicationContext();
-            //TODO LIST：初始化可刷新的ListView
             initListView();
         } catch (Exception e) {
             Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
@@ -204,113 +186,16 @@
 
     }
 
-    static class SamplePagerItem {
-        private final CharSequence mTitle;
-        private final int mIosIconResId;
-        private final int mAndroidIconResId;
-        private final int mIndicatorColor;
-        private final int mDividerColor;
-
-        SamplePagerItem(CharSequence title, int iosIconResId, int androidIconResId, int indicatorColor, int dividerColor) {
-            mTitle = title;
-            mIosIconResId = iosIconResId;
-            mAndroidIconResId = androidIconResId;
-            mIndicatorColor = indicatorColor;
-            mDividerColor = dividerColor;
-        }
-
-        CharSequence getTitle() {
-            return mTitle;
-        }
-
-        int getIosIconResId() {
-            return mIosIconResId;
-        }
-
-        int getAndroidIconResId() {
-            return mAndroidIconResId;
-        }
-
-        int getIndicatorColor() {
-            return mIndicatorColor;
-        }
-
-        int getDividerColor() {
-            return mDividerColor;
-        }
-    }
-
-    private void initTabs() {
-
-        mTabs.add(new SamplePagerItem(
-                getString(R.string.tab_pipe), // Title
-                R.drawable.ic_home, // Icon
-                R.drawable.ic_home_a, // Icon
-                getResources().getColor(R.color.home), // Indicator color
-                getResources().getColor(R.color.home) // Divider color
-        ));
-
-        mTabs.add(new SamplePagerItem(
-                getString(R.string.tab_appendant), // Title
-                R.drawable.ic_activity, // Icon
-                R.drawable.ic_activity_a, // Icon
-                getResources().getColor(R.color.activity), // Indicator color
-                getResources().getColor(R.color.activity) // Divider color
-        ));
-
-        mTabs.add(new SamplePagerItem(
-                getString(R.string.tab_point), // Title
-                R.drawable.ic_search, // Icon
-                R.drawable.ic_search_a, // Icon
-                getResources().getColor(R.color.search), // Indicator color
-                getResources().getColor(R.color.search) // Divider color
-        ));
-    }
-
     private void initViewPager() {
-        listFragment = new ArrayList<Fragment>();
-        Fragment fragment1;
-        Fragment fragment2;
-        Fragment fragment3;
-        fragment1 = new EditPipeFragment_();
-        fragment2 = new EditAppendantFragment_();
-        fragment3 = new EditPointFragment_();
+        listFragment = new ArrayList<>();
+        Fragment fragment1 = new EditPipeFragment_();
+        Fragment fragment2 = new EditAppendantFragment_();
+        Fragment fragment3 = new EditPointFragment_();
         listFragment.add(fragment1);
         listFragment.add(fragment2);
         listFragment.add(fragment3);
 
-        mViewPager.setAdapter(new SampleFragmentPagerAdapter(getSupportFragmentManager(), listFragment));
-        mViewPager.setCurrentItem(0);
-        mNiceTabLayout.setViewPager(mViewPager);
-
-        mNiceTabLayout.setTabStripColorize(new NiceTabStrip.TabStripColorize() {
-
-            @Override
-            public int getIndicatorColor(int position) {
-                return mTabs.get(position).getIndicatorColor();
-            }
-
-            @Override
-            public int getDividerColor(int position) {
-                return mTabs.get(position).getDividerColor();
-            }
-        });
-
-        mNiceTabLayout.setTabColorize(new NiceTabLayout.TabColorize() {
-
-            @Override
-            public int getDefaultTabColor(int position) {
-                return Color.WHITE;
-            }
-
-            @Override
-            public int getSelectedTabColor(int position) {
-                return mTabs.get(position).getIndicatorColor();
-            }
-        });
-        mNiceTabLayout.setDistributeEvenly(true);
-        mNiceTabLayout.setOnIndicatorColorChangedListener(this);
-        mNiceTabLayout.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+        mViewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
 
@@ -318,6 +203,23 @@
 
             @Override
             public void onPageSelected(int position) {
+                switch (position) {
+                    case 0:
+                        firstTabView.setTextColor(getResources().getColor(R.color.home));
+                        secondTabView.setTextColor(getResources().getColor(R.color.white));
+                        thirdTabView.setTextColor(getResources().getColor(R.color.white));
+                        break;
+                    case 1:
+                        firstTabView.setTextColor(getResources().getColor(R.color.white));
+                        secondTabView.setTextColor(getResources().getColor(R.color.activity));
+                        thirdTabView.setTextColor(getResources().getColor(R.color.white));
+                        break;
+                    case 2:
+                        firstTabView.setTextColor(getResources().getColor(R.color.white));
+                        secondTabView.setTextColor(getResources().getColor(R.color.white));
+                        thirdTabView.setTextColor(getResources().getColor(R.color.search));
+                        break;
+                }
                 saveMode = 0;
                 btnAdd.setText("添加");
                 if (position == 0) {
@@ -326,7 +228,6 @@
                 } else if (position == 1) {
                     EditAppendantFragment editAppendantFragment = (EditAppendantFragment) listFragment.get(position);
 //                    editAppendantFragment.refreshPipeTypeList(null,null);
-
                 } else if (position == 2) {
                     EditPointFragment editPointFragment = (EditPointFragment) listFragment.get(position);
 //                    editPointFragment.refreshPipeTypeList(null,null);
@@ -338,7 +239,58 @@
 
             }
         });
+        mViewPager.setAdapter(new TabFragmentPagerAdapter(getSupportFragmentManager(), listFragment));
+        mViewPager.setCurrentItem(0);
+        firstTabView.setTextColor(getResources().getColor(R.color.home));
 
+        firstTabView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mViewPager.setCurrentItem(0);
+                firstTabView.setTextColor(getResources().getColor(R.color.home));
+                secondTabView.setTextColor(getResources().getColor(R.color.white));
+                thirdTabView.setTextColor(getResources().getColor(R.color.white));
+            }
+        });
+
+        secondTabView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mViewPager.setCurrentItem(1);
+                firstTabView.setTextColor(getResources().getColor(R.color.white));
+                secondTabView.setTextColor(getResources().getColor(R.color.activity));
+                thirdTabView.setTextColor(getResources().getColor(R.color.white));
+            }
+        });
+
+        thirdTabView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mViewPager.setCurrentItem(2);
+                firstTabView.setTextColor(getResources().getColor(R.color.white));
+                secondTabView.setTextColor(getResources().getColor(R.color.white));
+                thirdTabView.setTextColor(getResources().getColor(R.color.search));
+            }
+        });
+    }
+
+    public static class TabFragmentPagerAdapter extends FragmentPagerAdapter {
+        private List<Fragment> listFragments;
+
+        TabFragmentPagerAdapter(FragmentManager fm, List<Fragment> list) {
+            super(fm);
+            this.listFragments = list;
+        }
+
+        @Override
+        public Fragment getItem(int arg0) {
+            return listFragments.get(arg0);//显示第几个页面
+        }
+
+        @Override
+        public int getCount() {
+            return listFragments.size();//有几个页面
+        }
     }
 
     private void initListView() {
@@ -438,46 +390,6 @@
                 getResources().getDisplayMetrics());
     }
 
-
-    //蓝牙
-//    @Override
-//    public boolean handleMessage(Message msg)
-//    {
-//        super.handleMessage(msg);;
-//        String message = "";
-//        switch(msg.what)
-//        {
-//            case MyApplication.MSG_READ:
-//                Log.d("btreceive", String.valueOf(msg.obj));
-//                message = String.valueOf(msg.obj);
-//                if (message.contains("GPGGA"))
-//                {
-//                    try
-//                    {
-//                        String messagePart[] = message.split(",");
-//                        String latitude = String.valueOf(Double.valueOf(messagePart[2].substring(0,2))+Double.valueOf(messagePart[2].substring(2))/60).substring(0,9);
-//                        String longitude = String.valueOf(Double.valueOf(messagePart[4].substring(0,3))+Double.valueOf(messagePart[4].substring(3))/60).substring(0,10);;
-//                        Log.d("RTKposition",Double.valueOf(messagePart[2].substring(0, 2)).toString());
-//                        Log.d("RTKposition",Double.valueOf(messagePart[2].substring(2)).toString());
-//                        Log.d("RTKposition","latitude="+latitude);
-//                        Log.d("RTKposition","longitude="+longitude);
-//                        positionInfo = latitude+","+longitude;
-//                    }
-//                    catch (Exception e)
-//                    {
-//                        Log.e(TAG, e.getLocalizedMessage());
-//                    }
-//                }
-//                break;
-//            case MyApplication.MSG_WRITE:
-//                break;
-//            case MyApplication.MSG_CONNECTED:
-//                appState.write(String.valueOf(btcmd));
-//                break;
-//        }
-//        return false;
-//    }
-
     @Click
     public void mapUploadFloatButton() {
         System.out.println("exit scan");
@@ -604,7 +516,7 @@
             endLong = editEndPos.getText().toString().split(",")[1].trim();
             material = editTexture.getText().toString().trim();
             diameter = editDiameter.getText().toString().trim();
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINESE);
             collectDate = simpleDateFormat.format(new Date());
             code = "PIPELINE" + collectDate;
             startMemo = editStartMemo.getText().toString().trim();
@@ -914,9 +826,7 @@
     public static boolean isDouble(String value) {
         try {
             Double.parseDouble(value);
-            if (value.contains("."))
-                return true;
-            return false;
+            return value.contains(".");
         } catch (NumberFormatException e) {
             return false;
         }
@@ -977,10 +887,6 @@
         }
     }
 
-    public class TwoBean implements Serializable {
-        public double[][] point;
-    }
-
     @Click
     public void btnView() {
         ArrayList<String> lineList = new ArrayList<>();
@@ -1288,7 +1194,6 @@
         return false;
     }
 
-
     static class ViewHolder {
 
         View pipeItem;
@@ -1305,76 +1210,17 @@
 
     }
 
-    class SampleFragmentPagerAdapter extends FragmentPagerAdapter implements NiceTabLayout.IconTabProvider {
-
-        private ArrayList<Fragment> listFragments;
-
-        SampleFragmentPagerAdapter(FragmentManager fm, ArrayList<Fragment> al) {
-            super(fm);
-            listFragments = al;
-        }
-
-        @Override
-        public Fragment getItem(int i) {
-            return listFragments.get(i);
-        }
-
-        @Override
-        public int getCount() {
-            return mTabs.size();
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return mTabs.get(position).getTitle();
-        }
-
-        @Override
-        public int getPageIconResId(int position) {
-            return mTabs.get(position).getAndroidIconResId();
-        }
-    }
-
-
-    //GPS
-//    private void startServices()
-//    {
-//        gpsLongitude = 0;
-//        gpsLatitude = 0;
-//        Intent gpsIntent = new Intent(this, GpsControlService.class);
-//        gpsIntent.putExtra(GpsControlService.LABEL_NM, "United");
-//        gpsIntent.putExtra(GpsControlService.LABEL_SN, "Pheonix");
-//        startService(gpsIntent);
-//    }
-
     private void stopServices() {
         try {
             stopService(new Intent(this, GpsControlService.class));
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
     }
 
-//    private final BroadcastReceiver getMyPositionReceiver = new BroadcastReceiver()
-//    {
-//        @Override
-//        public void onReceive(Context context, Intent intent)
-//        {
-//            if (GpsControlService.GPS_MY_LOCATION.equals(intent.getAction()))
-//            {
-//                Bundle bundle = intent.getExtras();
-//                if (bundle != null) {
-//                    gpsLongitude = GpsControlService.getMyPostion().getLongitude();
-//                    gpsLatitude = GpsControlService.getMyPostion().getLatitude();
-//                }
-//            }
-//        }
-//    };
-
     @Override
     protected void onDestroy() {
         stopServices();
         super.onDestroy();
     }
-
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_map_detail.xml b/app/src/main/res/layout/activity_map_detail.xml
index 5739987..e990d24 100644
--- a/app/src/main/res/layout/activity_map_detail.xml
+++ b/app/src/main/res/layout/activity_map_detail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -45,44 +45,65 @@
 
         </LinearLayout>
 
-        <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <me.amiee.nicetab.NiceTabLayout
-                android:id="@+id/mNiceTabLayout"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="?colorPrimary"
-                android:fillViewport="false"
-                app:ntlDividerPaddingLeft="8dp"
-                app:ntlDividerPaddingRight="8dp"
-                app:ntlIndicatorHeight="2dp"
-                app:ntlOverlayColor="#aa1a237e"
-                app:ntlTabMode="titleOnly"
-                app:ntlTextSize="24dp"
-                app:ntlTextStyle="normal"
-                app:ntlUnderlineHeight="1dp" />
-        </LinearLayout>
-
         <LinearLayout
+            android:id="@+id/tabLinearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="?colorPrimary"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/firstTabView"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="管线"
+                android:textColor="@color/white"
+                android:textSize="@dimen/textSize_24" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="45dp"
+                android:background="@color/white" />
+
+            <TextView
+                android:id="@+id/secondTabView"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="附属物"
+                android:textColor="@color/white"
+                android:textSize="@dimen/textSize_24" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="45dp"
+                android:background="@color/white" />
+
+            <TextView
+                android:id="@+id/thirdTabView"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="特征点"
+                android:textColor="@color/white"
+                android:textSize="@dimen/textSize_24" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/mWrapFl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-
-            <FrameLayout
-                android:id="@+id/mWrapFl"
+            <android.support.v4.view.ViewPager
+                android:id="@+id/mViewPager"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <android.support.v4.view.ViewPager
-                    android:id="@+id/mViewPager"
-                    android:layout_width="match_parent"
-                    android:layout_height="260dp" />
-
-            </FrameLayout>
-
-        </LinearLayout>
+                android:layout_height="260dp" />
+        </FrameLayout>
 
         <LinearLayout
             android:id="@+id/buttonLayout"
@@ -136,7 +157,7 @@
                 android:textSize="@dimen/textSize_18" />
         </LinearLayout>
 
-        <FrameLayout xmlns:fab="http://schemas.android.com/apk/res-auto"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1">
@@ -150,13 +171,11 @@
                 android:id="@+id/mapUploadFloatButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
+                android:layout_gravity="bottom|end"
                 android:layout_margin="16dp"
                 android:src="@drawable/ic_upload"
                 fab:fab_colorNormal="@color/font_green"
                 fab:fab_colorPressed="@color/font_green_1" />
-
         </FrameLayout>
-
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 949881f..f9484f6 100644
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
Binary files differ
diff --git a/app/app.iml b/app/app.iml
index e4ddc21..659f253 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -19,7 +19,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
diff --git a/app/libs/Native_Libs2.jar b/app/libs/Native_Libs2.jar
index 471fba7..1cc5852 100644
--- a/app/libs/Native_Libs2.jar
+++ b/app/libs/Native_Libs2.jar
Binary files differ
diff --git a/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java b/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java
index fb4a998..61c8aca 100644
--- a/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java
+++ b/app/src/main/java/com/casic/mapcollector/activity/MapDetailActivity.java
@@ -2,7 +2,6 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.bluetooth.BluetoothAdapter;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
@@ -20,7 +19,6 @@
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
@@ -35,7 +33,6 @@
 import com.baoyz.swipemenulistview.SwipeMenuCreator;
 import com.baoyz.swipemenulistview.SwipeMenuItem;
 import com.baoyz.swipemenulistview.SwipeMenuListView;
-import com.casic.mapcollector.MyApplication;
 import com.casic.mapcollector.R;
 import com.casic.mapcollector.bean.AppendantInfo;
 import com.casic.mapcollector.bean.LineInfo;
@@ -64,7 +61,6 @@
 import org.androidannotations.annotations.UiThread;
 import org.androidannotations.annotations.ViewById;
 
-import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -93,7 +89,13 @@
     public ViewPager mViewPager;
 
     @ViewById
-    public NiceTabLayout mNiceTabLayout;
+    public LinearLayout tabLinearLayout;
+    @ViewById
+    public TextView firstTabView;
+    @ViewById
+    public TextView secondTabView;
+    @ViewById
+    public TextView thirdTabView;
 
     @ViewById
     LinearLayout buttonLayout;
@@ -130,41 +132,24 @@
 
     private MapDetailInfo selectedMapDetailInfo;
 
-    private BluetoothAdapter bluetoothAdapter;
-
-    private MyApplication appState;
-
     private int mapMode = 0;//0为新增，1为查看
 
     private int saveMode = 0;//0为新增，1为编辑
 
     private String positionInfo = "未获取到坐标";
 
-    private static int[] btcmd = {0x02, 0x00, 0x64, 0x0D, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x07, 0x04, 0x26, 0x00, 0x03, 0x00, 0xA9, 0x03};
-
-    private static int[] stopcmd = {0x02, 0x00, 0x64, 0x0D, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x07, 0x04, 0xFF, 0x00, 0x00, 0x00, 0x7F, 0x03};
-
-    ArrayAdapter<String> typeSpinnerArrayAdapter;
-
-    private List<SamplePagerItem> mTabs = new ArrayList<>();
-
     ArrayList<Fragment> listFragment;
 
-    public MapInfo getMapInfo() {
-        return mapInfo;
-    }
-
     @AfterViews
     public void init() {
         try {
             mapMode = mapInfo == null ? 0 : 1;
-            initTabs();
             initViewPager();
             mapUploadFloatButton.attachToListView(pipeListView);
             if (mapMode == 0) {
                 mapInfo = new MapInfo();
                 seriesNumber = "";
-                mNiceTabLayout.setVisibility(View.VISIBLE);
+                tabLinearLayout.setVisibility(View.VISIBLE);
                 mViewPager.setVisibility(View.VISIBLE);
             } else if (mapMode == 1) {
                 lineInfos = mapInfo.getLines();
@@ -176,13 +161,10 @@
                 editMapName.setEnabled(false);
                 buttonLayout.setVisibility(View.GONE);
                 mapUploadFloatButton.setVisibility(View.GONE);
-                mNiceTabLayout.setVisibility(View.GONE);
+                tabLinearLayout.setVisibility(View.GONE);
                 mViewPager.setVisibility(View.GONE);
             }
             pipeListView.setAdapter(mAdapter);
-
-            appState = (MyApplication) getApplicationContext();
-            //TODO LIST：初始化可刷新的ListView
             initListView();
         } catch (Exception e) {
             Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
@@ -204,113 +186,16 @@
 
     }
 
-    static class SamplePagerItem {
-        private final CharSequence mTitle;
-        private final int mIosIconResId;
-        private final int mAndroidIconResId;
-        private final int mIndicatorColor;
-        private final int mDividerColor;
-
-        SamplePagerItem(CharSequence title, int iosIconResId, int androidIconResId, int indicatorColor, int dividerColor) {
-            mTitle = title;
-            mIosIconResId = iosIconResId;
-            mAndroidIconResId = androidIconResId;
-            mIndicatorColor = indicatorColor;
-            mDividerColor = dividerColor;
-        }
-
-        CharSequence getTitle() {
-            return mTitle;
-        }
-
-        int getIosIconResId() {
-            return mIosIconResId;
-        }
-
-        int getAndroidIconResId() {
-            return mAndroidIconResId;
-        }
-
-        int getIndicatorColor() {
-            return mIndicatorColor;
-        }
-
-        int getDividerColor() {
-            return mDividerColor;
-        }
-    }
-
-    private void initTabs() {
-
-        mTabs.add(new SamplePagerItem(
-                getString(R.string.tab_pipe), // Title
-                R.drawable.ic_home, // Icon
-                R.drawable.ic_home_a, // Icon
-                getResources().getColor(R.color.home), // Indicator color
-                getResources().getColor(R.color.home) // Divider color
-        ));
-
-        mTabs.add(new SamplePagerItem(
-                getString(R.string.tab_appendant), // Title
-                R.drawable.ic_activity, // Icon
-                R.drawable.ic_activity_a, // Icon
-                getResources().getColor(R.color.activity), // Indicator color
-                getResources().getColor(R.color.activity) // Divider color
-        ));
-
-        mTabs.add(new SamplePagerItem(
-                getString(R.string.tab_point), // Title
-                R.drawable.ic_search, // Icon
-                R.drawable.ic_search_a, // Icon
-                getResources().getColor(R.color.search), // Indicator color
-                getResources().getColor(R.color.search) // Divider color
-        ));
-    }
-
     private void initViewPager() {
-        listFragment = new ArrayList<Fragment>();
-        Fragment fragment1;
-        Fragment fragment2;
-        Fragment fragment3;
-        fragment1 = new EditPipeFragment_();
-        fragment2 = new EditAppendantFragment_();
-        fragment3 = new EditPointFragment_();
+        listFragment = new ArrayList<>();
+        Fragment fragment1 = new EditPipeFragment_();
+        Fragment fragment2 = new EditAppendantFragment_();
+        Fragment fragment3 = new EditPointFragment_();
         listFragment.add(fragment1);
         listFragment.add(fragment2);
         listFragment.add(fragment3);
 
-        mViewPager.setAdapter(new SampleFragmentPagerAdapter(getSupportFragmentManager(), listFragment));
-        mViewPager.setCurrentItem(0);
-        mNiceTabLayout.setViewPager(mViewPager);
-
-        mNiceTabLayout.setTabStripColorize(new NiceTabStrip.TabStripColorize() {
-
-            @Override
-            public int getIndicatorColor(int position) {
-                return mTabs.get(position).getIndicatorColor();
-            }
-
-            @Override
-            public int getDividerColor(int position) {
-                return mTabs.get(position).getDividerColor();
-            }
-        });
-
-        mNiceTabLayout.setTabColorize(new NiceTabLayout.TabColorize() {
-
-            @Override
-            public int getDefaultTabColor(int position) {
-                return Color.WHITE;
-            }
-
-            @Override
-            public int getSelectedTabColor(int position) {
-                return mTabs.get(position).getIndicatorColor();
-            }
-        });
-        mNiceTabLayout.setDistributeEvenly(true);
-        mNiceTabLayout.setOnIndicatorColorChangedListener(this);
-        mNiceTabLayout.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+        mViewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
 
@@ -318,6 +203,23 @@
 
             @Override
             public void onPageSelected(int position) {
+                switch (position) {
+                    case 0:
+                        firstTabView.setTextColor(getResources().getColor(R.color.home));
+                        secondTabView.setTextColor(getResources().getColor(R.color.white));
+                        thirdTabView.setTextColor(getResources().getColor(R.color.white));
+                        break;
+                    case 1:
+                        firstTabView.setTextColor(getResources().getColor(R.color.white));
+                        secondTabView.setTextColor(getResources().getColor(R.color.activity));
+                        thirdTabView.setTextColor(getResources().getColor(R.color.white));
+                        break;
+                    case 2:
+                        firstTabView.setTextColor(getResources().getColor(R.color.white));
+                        secondTabView.setTextColor(getResources().getColor(R.color.white));
+                        thirdTabView.setTextColor(getResources().getColor(R.color.search));
+                        break;
+                }
                 saveMode = 0;
                 btnAdd.setText("添加");
                 if (position == 0) {
@@ -326,7 +228,6 @@
                 } else if (position == 1) {
                     EditAppendantFragment editAppendantFragment = (EditAppendantFragment) listFragment.get(position);
 //                    editAppendantFragment.refreshPipeTypeList(null,null);
-
                 } else if (position == 2) {
                     EditPointFragment editPointFragment = (EditPointFragment) listFragment.get(position);
 //                    editPointFragment.refreshPipeTypeList(null,null);
@@ -338,7 +239,58 @@
 
             }
         });
+        mViewPager.setAdapter(new TabFragmentPagerAdapter(getSupportFragmentManager(), listFragment));
+        mViewPager.setCurrentItem(0);
+        firstTabView.setTextColor(getResources().getColor(R.color.home));
 
+        firstTabView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mViewPager.setCurrentItem(0);
+                firstTabView.setTextColor(getResources().getColor(R.color.home));
+                secondTabView.setTextColor(getResources().getColor(R.color.white));
+                thirdTabView.setTextColor(getResources().getColor(R.color.white));
+            }
+        });
+
+        secondTabView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mViewPager.setCurrentItem(1);
+                firstTabView.setTextColor(getResources().getColor(R.color.white));
+                secondTabView.setTextColor(getResources().getColor(R.color.activity));
+                thirdTabView.setTextColor(getResources().getColor(R.color.white));
+            }
+        });
+
+        thirdTabView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mViewPager.setCurrentItem(2);
+                firstTabView.setTextColor(getResources().getColor(R.color.white));
+                secondTabView.setTextColor(getResources().getColor(R.color.white));
+                thirdTabView.setTextColor(getResources().getColor(R.color.search));
+            }
+        });
+    }
+
+    public static class TabFragmentPagerAdapter extends FragmentPagerAdapter {
+        private List<Fragment> listFragments;
+
+        TabFragmentPagerAdapter(FragmentManager fm, List<Fragment> list) {
+            super(fm);
+            this.listFragments = list;
+        }
+
+        @Override
+        public Fragment getItem(int arg0) {
+            return listFragments.get(arg0);//显示第几个页面
+        }
+
+        @Override
+        public int getCount() {
+            return listFragments.size();//有几个页面
+        }
     }
 
     private void initListView() {
@@ -438,46 +390,6 @@
                 getResources().getDisplayMetrics());
     }
 
-
-    //蓝牙
-//    @Override
-//    public boolean handleMessage(Message msg)
-//    {
-//        super.handleMessage(msg);;
-//        String message = "";
-//        switch(msg.what)
-//        {
-//            case MyApplication.MSG_READ:
-//                Log.d("btreceive", String.valueOf(msg.obj));
-//                message = String.valueOf(msg.obj);
-//                if (message.contains("GPGGA"))
-//                {
-//                    try
-//                    {
-//                        String messagePart[] = message.split(",");
-//                        String latitude = String.valueOf(Double.valueOf(messagePart[2].substring(0,2))+Double.valueOf(messagePart[2].substring(2))/60).substring(0,9);
-//                        String longitude = String.valueOf(Double.valueOf(messagePart[4].substring(0,3))+Double.valueOf(messagePart[4].substring(3))/60).substring(0,10);;
-//                        Log.d("RTKposition",Double.valueOf(messagePart[2].substring(0, 2)).toString());
-//                        Log.d("RTKposition",Double.valueOf(messagePart[2].substring(2)).toString());
-//                        Log.d("RTKposition","latitude="+latitude);
-//                        Log.d("RTKposition","longitude="+longitude);
-//                        positionInfo = latitude+","+longitude;
-//                    }
-//                    catch (Exception e)
-//                    {
-//                        Log.e(TAG, e.getLocalizedMessage());
-//                    }
-//                }
-//                break;
-//            case MyApplication.MSG_WRITE:
-//                break;
-//            case MyApplication.MSG_CONNECTED:
-//                appState.write(String.valueOf(btcmd));
-//                break;
-//        }
-//        return false;
-//    }
-
     @Click
     public void mapUploadFloatButton() {
         System.out.println("exit scan");
@@ -604,7 +516,7 @@
             endLong = editEndPos.getText().toString().split(",")[1].trim();
             material = editTexture.getText().toString().trim();
             diameter = editDiameter.getText().toString().trim();
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINESE);
             collectDate = simpleDateFormat.format(new Date());
             code = "PIPELINE" + collectDate;
             startMemo = editStartMemo.getText().toString().trim();
@@ -914,9 +826,7 @@
     public static boolean isDouble(String value) {
         try {
             Double.parseDouble(value);
-            if (value.contains("."))
-                return true;
-            return false;
+            return value.contains(".");
         } catch (NumberFormatException e) {
             return false;
         }
@@ -977,10 +887,6 @@
         }
     }
 
-    public class TwoBean implements Serializable {
-        public double[][] point;
-    }
-
     @Click
     public void btnView() {
         ArrayList<String> lineList = new ArrayList<>();
@@ -1288,7 +1194,6 @@
         return false;
     }
 
-
     static class ViewHolder {
 
         View pipeItem;
@@ -1305,76 +1210,17 @@
 
     }
 
-    class SampleFragmentPagerAdapter extends FragmentPagerAdapter implements NiceTabLayout.IconTabProvider {
-
-        private ArrayList<Fragment> listFragments;
-
-        SampleFragmentPagerAdapter(FragmentManager fm, ArrayList<Fragment> al) {
-            super(fm);
-            listFragments = al;
-        }
-
-        @Override
-        public Fragment getItem(int i) {
-            return listFragments.get(i);
-        }
-
-        @Override
-        public int getCount() {
-            return mTabs.size();
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return mTabs.get(position).getTitle();
-        }
-
-        @Override
-        public int getPageIconResId(int position) {
-            return mTabs.get(position).getAndroidIconResId();
-        }
-    }
-
-
-    //GPS
-//    private void startServices()
-//    {
-//        gpsLongitude = 0;
-//        gpsLatitude = 0;
-//        Intent gpsIntent = new Intent(this, GpsControlService.class);
-//        gpsIntent.putExtra(GpsControlService.LABEL_NM, "United");
-//        gpsIntent.putExtra(GpsControlService.LABEL_SN, "Pheonix");
-//        startService(gpsIntent);
-//    }
-
     private void stopServices() {
         try {
             stopService(new Intent(this, GpsControlService.class));
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
     }
 
-//    private final BroadcastReceiver getMyPositionReceiver = new BroadcastReceiver()
-//    {
-//        @Override
-//        public void onReceive(Context context, Intent intent)
-//        {
-//            if (GpsControlService.GPS_MY_LOCATION.equals(intent.getAction()))
-//            {
-//                Bundle bundle = intent.getExtras();
-//                if (bundle != null) {
-//                    gpsLongitude = GpsControlService.getMyPostion().getLongitude();
-//                    gpsLatitude = GpsControlService.getMyPostion().getLatitude();
-//                }
-//            }
-//        }
-//    };
-
     @Override
     protected void onDestroy() {
         stopServices();
         super.onDestroy();
     }
-
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_map_detail.xml b/app/src/main/res/layout/activity_map_detail.xml
index 5739987..e990d24 100644
--- a/app/src/main/res/layout/activity_map_detail.xml
+++ b/app/src/main/res/layout/activity_map_detail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -45,44 +45,65 @@
 
         </LinearLayout>
 
-        <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <me.amiee.nicetab.NiceTabLayout
-                android:id="@+id/mNiceTabLayout"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:background="?colorPrimary"
-                android:fillViewport="false"
-                app:ntlDividerPaddingLeft="8dp"
-                app:ntlDividerPaddingRight="8dp"
-                app:ntlIndicatorHeight="2dp"
-                app:ntlOverlayColor="#aa1a237e"
-                app:ntlTabMode="titleOnly"
-                app:ntlTextSize="24dp"
-                app:ntlTextStyle="normal"
-                app:ntlUnderlineHeight="1dp" />
-        </LinearLayout>
-
         <LinearLayout
+            android:id="@+id/tabLinearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="?colorPrimary"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/firstTabView"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="管线"
+                android:textColor="@color/white"
+                android:textSize="@dimen/textSize_24" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="45dp"
+                android:background="@color/white" />
+
+            <TextView
+                android:id="@+id/secondTabView"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="附属物"
+                android:textColor="@color/white"
+                android:textSize="@dimen/textSize_24" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="45dp"
+                android:background="@color/white" />
+
+            <TextView
+                android:id="@+id/thirdTabView"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="特征点"
+                android:textColor="@color/white"
+                android:textSize="@dimen/textSize_24" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/mWrapFl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-
-            <FrameLayout
-                android:id="@+id/mWrapFl"
+            <android.support.v4.view.ViewPager
+                android:id="@+id/mViewPager"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <android.support.v4.view.ViewPager
-                    android:id="@+id/mViewPager"
-                    android:layout_width="match_parent"
-                    android:layout_height="260dp" />
-
-            </FrameLayout>
-
-        </LinearLayout>
+                android:layout_height="260dp" />
+        </FrameLayout>
 
         <LinearLayout
             android:id="@+id/buttonLayout"
@@ -136,7 +157,7 @@
                 android:textSize="@dimen/textSize_18" />
         </LinearLayout>
 
-        <FrameLayout xmlns:fab="http://schemas.android.com/apk/res-auto"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1">
@@ -150,13 +171,11 @@
                 android:id="@+id/mapUploadFloatButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
+                android:layout_gravity="bottom|end"
                 android:layout_margin="16dp"
                 android:src="@drawable/ic_upload"
                 fab:fab_colorNormal="@color/font_green"
                 fab:fab_colorPressed="@color/font_green_1" />
-
         </FrameLayout>
-
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/map.jks b/map.jks
new file mode 100644
index 0000000..c7ccf52
--- /dev/null
+++ b/map.jks
Binary files differ