陶汉栋 / ParentWork

Download as
Browse Code »

Commit a299f7102cf46afd0c8b794bcbc1e6697ae9610e

Authored by 姚旭斌
2 parents df3a9c11 c45f5ac9
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'developer' into yxb_dev 

# Conflicts:
#	.idea/modules.xml
#	app/libs/processor.jar
Showing 3 changed files with 39 additions and 41 deletions   Show diff stats
.idea/modules.xml
  Diff comments   View file @a299f71
... ... @@ -4,12 +4,11 @@
4 4 <modules>
5 5 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
6 6 <module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" />
  7 + <module fileurl="file://$PROJECT_DIR$/parentWorkHolper.iml" filepath="$PROJECT_DIR$/parentWorkHolper.iml" />
7 8 <module fileurl="file://F:\parentwork\parentWorkHolper.iml" filepath="F:\parentwork\parentWorkHolper.iml" />
8 9 <module fileurl="file://E:\parentwork\parentWorkHolper.iml" filepath="E:\parentwork\parentWorkHolper.iml" />
9   - <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" />
10 10 <module fileurl="file://F:\parentWorkHolper\parentwork.iml" filepath="F:\parentWorkHolper\parentwork.iml" />
11 11 <module fileurl="file://$PROJECT_DIR$/processor/processor.iml" filepath="$PROJECT_DIR$/processor/processor.iml" />
12   - <module fileurl="file://E:\parentwork\processor\processor.iml" filepath="E:\parentwork\processor\processor.iml" />
13 12 <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" />
14 13 </modules>
15 14 </component>
... ...
app/libs/processor.jar
View file @a299f71
No preview for this file type
app/src/main/res/layout/fragment_ce_ping.xml
  Diff comments   View file @a299f71
... ... @@ -8,6 +8,7 @@
8 8 tools:context="com.shunzhi.parent.ui.fragment.CePingFragment">
9 9  
10 10 <LinearLayout
  11 + android:background="@drawable/shape_bg_radius8"
11 12 android:layout_width="match_parent"
12 13 android:layout_height="match_parent"
13 14 android:orientation="vertical">
... ... @@ -54,7 +55,6 @@
54 55 android:layout_height="0dp"
55 56 android:layout_margin="@dimen/size_dp_10"
56 57 android:layout_weight="3"
57   - android:background="@drawable/shape_bg_radius8"
58 58 android:orientation="vertical">
59 59  
60 60  
... ... @@ -68,6 +68,40 @@
68 68 android:layout_marginRight="@dimen/size_dp_5"
69 69 android:background="@color/bg_gray" />
70 70  
  71 +
  72 + <LinearLayout
  73 + android:layout_marginTop="@dimen/size_dp_10"
  74 + android:layout_width="match_parent"
  75 + android:layout_height="wrap_content"
  76 + android:layout_marginLeft="@dimen/size_dp_10"
  77 + android:layout_marginRight="@dimen/size_dp_10"
  78 + android:gravity="center_vertical">
  79 +
  80 + <View
  81 + android:layout_width="0dp"
  82 + android:layout_height="1dp"
  83 + android:layout_weight="1"
  84 + android:background="@color/huodong_blue"></View>
  85 +
  86 + <TextView
  87 + android:layout_width="wrap_content"
  88 + android:layout_height="wrap_content"
  89 + android:text="活动专栏"
  90 + android:layout_marginLeft="@dimen/size_dp_5"
  91 + android:layout_marginRight="@dimen/size_dp_5"
  92 + android:textColor="@color/huodong_blue"
  93 + android:textSize="@dimen/textSize16"
  94 +
  95 + />
  96 +
  97 + <View
  98 + android:layout_width="0dp"
  99 + android:layout_height="1dp"
  100 + android:layout_weight="1"
  101 + android:background="@color/huodong_blue"></View>
  102 +
  103 + </LinearLayout>
  104 +
71 105 <LinearLayout
72 106 android:layout_width="match_parent"
73 107 android:layout_height="match_parent"
... ... @@ -78,10 +112,8 @@
78 112 android:id="@+id/frame_xqjc"
79 113 android:layout_width="0dp"
80 114 android:layout_height="match_parent"
81   - android:layout_marginBottom="@dimen/size_dp_20"
82   - android:layout_marginLeft="@dimen/size_dp_10"
83 115 android:layout_marginRight="@dimen/size_dp_5"
84   - android:layout_marginTop="@dimen/size_dp_20"
  116 + android:layout_marginTop="@dimen/size_dp_10"
85 117 android:layout_weight="1"
86 118 android:background="@drawable/xqjc"
87 119 >
... ... @@ -100,10 +132,8 @@
100 132 android:id="@+id/frame_zxxl"
101 133 android:layout_width="0dp"
102 134 android:layout_height="match_parent"
103   - android:layout_marginBottom="@dimen/size_dp_20"
104 135 android:layout_marginLeft="@dimen/size_dp_5"
105   - android:layout_marginRight="@dimen/size_dp_10"
106   - android:layout_marginTop="@dimen/size_dp_20"
  136 + android:layout_marginTop="@dimen/size_dp_10"
107 137 android:layout_weight="1"
108 138 android:background="@drawable/zxlx"
109 139 >
... ... @@ -124,42 +154,11 @@
124 154  
125 155  
126 156 <LinearLayout
127   - android:layout_width="match_parent"
128   - android:layout_height="wrap_content"
129 157 android:layout_marginLeft="@dimen/size_dp_10"
130 158 android:layout_marginRight="@dimen/size_dp_10"
131   - android:gravity="center_vertical">
132   -
133   - <View
134   - android:layout_width="0dp"
135   - android:layout_height="1dp"
136   - android:layout_weight="1"
137   - android:background="@color/huodong_blue"></View>
138   -
139   - <TextView
140   - android:layout_width="wrap_content"
141   - android:layout_height="wrap_content"
142   - android:text="活动专栏"
143   - android:layout_marginLeft="@dimen/size_dp_5"
144   - android:layout_marginRight="@dimen/size_dp_5"
145   - android:textColor="@color/huodong_blue"
146   - android:textSize="@dimen/textSize16"
147   -
148   - />
149   -
150   - <View
151   - android:layout_width="0dp"
152   - android:layout_height="1dp"
153   - android:layout_weight="1"
154   - android:background="@color/huodong_blue"></View>
155   -
156   - </LinearLayout>
157   -
158   - <LinearLayout
159   - android:layout_marginBottom="@dimen/textSize20"
  159 + android:layout_marginBottom="@dimen/size_dp_10"
160 160 android:layout_width="match_parent"
161 161 android:layout_height="0dp"
162   - android:layout_margin="@dimen/size_dp_10"
163 162 android:layout_weight="2">
164 163  
165 164 <FrameLayout
... ...