From 9bb016c5b6e5bb6745e23489221a912051fbdd95 Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Wed, 4 Apr 2018 18:48:15 +0800
Subject: [PATCH] no message

---
 .idea/modules.xml                            |  1 -
 app/libs/processor.jar                       | Bin 5681 -> 0 bytes
 app/src/main/assets/migrations/3.sql         |  3 ---
 app/src/main/res/layout/fragment_ce_ping.xml | 77 ++++++++++++++++++++++++++++++++++++++---------------------------------------
 4 files changed, 38 insertions(+), 43 deletions(-)
 delete mode 100644 app/src/main/assets/migrations/3.sql

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1e51467..9c7f509 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -9,7 +9,6 @@
       <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" />
       <module fileurl="file://F:\parentWorkHolper\parentwork.iml" filepath="F:\parentWorkHolper\parentwork.iml" />
       <module fileurl="file://$PROJECT_DIR$/processor/processor.iml" filepath="$PROJECT_DIR$/processor/processor.iml" />
-      <module fileurl="file://E:\parentwork\processor\processor.iml" filepath="E:\parentwork\processor\processor.iml" />
       <module fileurl="file://$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" filepath="$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" />
     </modules>
   </component>
diff --git a/app/libs/processor.jar b/app/libs/processor.jar
index 279fe2c..df31023 100644
Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ
diff --git a/app/src/main/assets/migrations/3.sql b/app/src/main/assets/migrations/3.sql
deleted file mode 100644
index 24d224b..0000000
--- a/app/src/main/assets/migrations/3.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER table test ADD COLUMN age INTEGER
-ALTER table test ADD COLUMN area INTEGER
-ALTER table test ADD COLUMN name TEXT
diff --git a/app/src/main/res/layout/fragment_ce_ping.xml b/app/src/main/res/layout/fragment_ce_ping.xml
index da10553..8f6dbdc 100644
--- a/app/src/main/res/layout/fragment_ce_ping.xml
+++ b/app/src/main/res/layout/fragment_ce_ping.xml
@@ -8,6 +8,7 @@
     tools:context="com.shunzhi.parent.ui.fragment.CePingFragment">
 
     <LinearLayout
+        android:background="@drawable/shape_bg_radius8"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
@@ -54,7 +55,6 @@
             android:layout_height="0dp"
             android:layout_margin="@dimen/size_dp_10"
             android:layout_weight="3"
-            android:background="@drawable/shape_bg_radius8"
             android:orientation="vertical">
 
 
@@ -68,6 +68,40 @@
                 android:layout_marginRight="@dimen/size_dp_5"
                 android:background="@color/bg_gray" />
 
+
+            <LinearLayout
+                android:layout_marginTop="@dimen/size_dp_10"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/size_dp_10"
+                android:layout_marginRight="@dimen/size_dp_10"
+                android:gravity="center_vertical">
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1"
+                    android:background="@color/huodong_blue"></View>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="活动专栏"
+                    android:layout_marginLeft="@dimen/size_dp_5"
+                    android:layout_marginRight="@dimen/size_dp_5"
+                    android:textColor="@color/huodong_blue"
+                    android:textSize="@dimen/textSize16"
+
+                    />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1"
+                    android:background="@color/huodong_blue"></View>
+
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -78,10 +112,8 @@
                     android:id="@+id/frame_xqjc"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_marginBottom="@dimen/size_dp_20"
-                    android:layout_marginLeft="@dimen/size_dp_10"
                     android:layout_marginRight="@dimen/size_dp_5"
-                    android:layout_marginTop="@dimen/size_dp_20"
+                    android:layout_marginTop="@dimen/size_dp_10"
                     android:layout_weight="1"
                     android:background="@drawable/xqjc"
                     >
@@ -100,10 +132,8 @@
                     android:id="@+id/frame_zxxl"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_marginBottom="@dimen/size_dp_20"
                     android:layout_marginLeft="@dimen/size_dp_5"
-                    android:layout_marginRight="@dimen/size_dp_10"
-                    android:layout_marginTop="@dimen/size_dp_20"
+                    android:layout_marginTop="@dimen/size_dp_10"
                     android:layout_weight="1"
                     android:background="@drawable/zxlx"
                    >
@@ -124,42 +154,11 @@
 
 
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/size_dp_10"
             android:layout_marginRight="@dimen/size_dp_10"
-            android:gravity="center_vertical">
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_weight="1"
-                android:background="@color/huodong_blue"></View>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="活动专栏"
-                android:layout_marginLeft="@dimen/size_dp_5"
-                android:layout_marginRight="@dimen/size_dp_5"
-                android:textColor="@color/huodong_blue"
-                android:textSize="@dimen/textSize16"
-
-                />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_weight="1"
-                android:background="@color/huodong_blue"></View>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_marginBottom="@dimen/textSize20"
+            android:layout_marginBottom="@dimen/size_dp_10"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_margin="@dimen/size_dp_10"
             android:layout_weight="2">
 
             <FrameLayout
--
libgit2 0.21.0