Commit 08e1bf53e5978ebd43297639547473adfd592621
1 parent
07328347
Exists in
yxb_dev
and in
2 other branches
no message
Showing
4 changed files
with
20 additions
and
16 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
| @@ -85,10 +85,10 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils. | @@ -85,10 +85,10 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils. | ||
| 85 | .add(R.id.frame, consultFragment) | 85 | .add(R.id.frame, consultFragment) |
| 86 | .add(R.id.frame, reportFragment) | 86 | .add(R.id.frame, reportFragment) |
| 87 | .add(R.id.frame, mineFragment) | 87 | .add(R.id.frame, mineFragment) |
| 88 | - .show(mineFragment) | 88 | + .show(cePingFragment) |
| 89 | .hide(consultFragment) | 89 | .hide(consultFragment) |
| 90 | .hide(reportFragment) | 90 | .hide(reportFragment) |
| 91 | - .hide(cePingFragment) | 91 | + .hide(mineFragment) |
| 92 | .commit(); | 92 | .commit(); |
| 93 | } | 93 | } |
| 94 | 94 |
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
| @@ -5,11 +5,8 @@ import android.content.Context; | @@ -5,11 +5,8 @@ import android.content.Context; | ||
| 5 | import android.content.Intent; | 5 | import android.content.Intent; |
| 6 | import android.content.IntentFilter; | 6 | import android.content.IntentFilter; |
| 7 | import android.os.Bundle; | 7 | import android.os.Bundle; |
| 8 | -import android.os.Handler; | ||
| 9 | -import android.os.Message; | ||
| 10 | import android.support.annotation.NonNull; | 8 | import android.support.annotation.NonNull; |
| 11 | import android.support.annotation.Nullable; | 9 | import android.support.annotation.Nullable; |
| 12 | -import android.util.Log; | ||
| 13 | import android.view.View; | 10 | import android.view.View; |
| 14 | import android.widget.ImageView; | 11 | import android.widget.ImageView; |
| 15 | import android.widget.LinearLayout; | 12 | import android.widget.LinearLayout; |
| @@ -22,8 +19,6 @@ import com.shunzhi.parent.AppContext; | @@ -22,8 +19,6 @@ import com.shunzhi.parent.AppContext; | ||
| 22 | import com.shunzhi.parent.R; | 19 | import com.shunzhi.parent.R; |
| 23 | import com.shunzhi.parent.contract.consult.ConsultContract; | 20 | import com.shunzhi.parent.contract.consult.ConsultContract; |
| 24 | import com.shunzhi.parent.presenter.consult.ConsultPresenter; | 21 | import com.shunzhi.parent.presenter.consult.ConsultPresenter; |
| 25 | -import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity; | ||
| 26 | -import com.shunzhi.parent.views.TextAndImgShowView; | ||
| 27 | import com.stx.xhb.xbanner.XBanner; | 22 | import com.stx.xhb.xbanner.XBanner; |
| 28 | 23 | ||
| 29 | import java.io.ByteArrayOutputStream; | 24 | import java.io.ByteArrayOutputStream; |
app/src/main/res/layout/fragment_zi_xun.xml
| @@ -14,16 +14,25 @@ | @@ -14,16 +14,25 @@ | ||
| 14 | android:layout_height="0dp" | 14 | android:layout_height="0dp" |
| 15 | android:layout_weight="2"></com.stx.xhb.xbanner.XBanner> | 15 | android:layout_weight="2"></com.stx.xhb.xbanner.XBanner> |
| 16 | 16 | ||
| 17 | -<include layout="@layout/layout_textandimgshow"/> | 17 | + <LinearLayout |
| 18 | + android:layout_width="wrap_content" | ||
| 19 | + android:layout_height="wrap_content" | ||
| 20 | + android:layout_marginLeft="@dimen/size_dp_10" | ||
| 21 | + android:layout_marginRight="@dimen/size_dp_10" | ||
| 22 | + > | ||
| 23 | +<include layout="@layout/layout_textandimgshow" | ||
| 24 | + /> | ||
| 25 | + </LinearLayout> | ||
| 18 | <LinearLayout | 26 | <LinearLayout |
| 19 | android:layout_width="match_parent" | 27 | android:layout_width="match_parent" |
| 20 | android:layout_height="wrap_content" | 28 | android:layout_height="wrap_content" |
| 29 | + android:paddingLeft="@dimen/size_dp_10" | ||
| 30 | + android:paddingRight="@dimen/size_dp_10" | ||
| 21 | android:orientation="vertical"> | 31 | android:orientation="vertical"> |
| 22 | 32 | ||
| 23 | <TextView | 33 | <TextView |
| 24 | android:layout_width="wrap_content" | 34 | android:layout_width="wrap_content" |
| 25 | android:layout_height="wrap_content" | 35 | android:layout_height="wrap_content" |
| 26 | - android:layout_marginLeft="@dimen/size_dp_10" | ||
| 27 | android:text="@string/consult_huati" | 36 | android:text="@string/consult_huati" |
| 28 | android:textColor="@color/xueqing_blue" | 37 | android:textColor="@color/xueqing_blue" |
| 29 | android:textSize="@dimen/textSize16" /> | 38 | android:textSize="@dimen/textSize16" /> |
app/src/main/res/layout/item_report.xml
| @@ -3,10 +3,10 @@ | @@ -3,10 +3,10 @@ | ||
| 3 | android:layout_width="match_parent" | 3 | android:layout_width="match_parent" |
| 4 | android:layout_height="match_parent"> | 4 | android:layout_height="match_parent"> |
| 5 | 5 | ||
| 6 | - <LinearLayout | 6 | + <LinearLayout |
| 7 | android:layout_width="match_parent" | 7 | android:layout_width="match_parent" |
| 8 | - android:layout_marginTop="@dimen/size_dp_10" | ||
| 9 | android:layout_height="250dp" | 8 | android:layout_height="250dp" |
| 9 | + android:layout_marginTop="@dimen/size_dp_10" | ||
| 10 | android:background="@drawable/report_white" | 10 | android:background="@drawable/report_white" |
| 11 | android:orientation="vertical"> | 11 | android:orientation="vertical"> |
| 12 | 12 | ||
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | android:textColor="#20519f" | 20 | android:textColor="#20519f" |
| 21 | android:textSize="@dimen/sp_16" /> | 21 | android:textSize="@dimen/sp_16" /> |
| 22 | 22 | ||
| 23 | - <RelativeLayout | 23 | + <RelativeLayout |
| 24 | android:layout_width="match_parent" | 24 | android:layout_width="match_parent" |
| 25 | android:layout_height="wrap_content" | 25 | android:layout_height="wrap_content" |
| 26 | android:layout_weight="1" | 26 | android:layout_weight="1" |
| @@ -52,10 +52,10 @@ | @@ -52,10 +52,10 @@ | ||
| 52 | <LinearLayout | 52 | <LinearLayout |
| 53 | android:layout_width="wrap_content" | 53 | android:layout_width="wrap_content" |
| 54 | android:layout_height="match_parent" | 54 | android:layout_height="match_parent" |
| 55 | - android:layout_weight="1" | ||
| 56 | android:layout_centerInParent="true" | 55 | android:layout_centerInParent="true" |
| 57 | - android:gravity="center_horizontal" | ||
| 58 | - > | 56 | + android:layout_weight="1" |
| 57 | + android:gravity="center_horizontal"> | ||
| 58 | + | ||
| 59 | <com.shunzhi.parent.views.ProgressView | 59 | <com.shunzhi.parent.views.ProgressView |
| 60 | android:id="@+id/ring" | 60 | android:id="@+id/ring" |
| 61 | android:layout_width="160dp" | 61 | android:layout_width="160dp" |
| @@ -66,8 +66,8 @@ | @@ -66,8 +66,8 @@ | ||
| 66 | <LinearLayout | 66 | <LinearLayout |
| 67 | android:layout_width="80dp" | 67 | android:layout_width="80dp" |
| 68 | android:layout_height="match_parent" | 68 | android:layout_height="match_parent" |
| 69 | - android:layout_marginTop="10dp" | ||
| 70 | android:layout_alignParentRight="true" | 69 | android:layout_alignParentRight="true" |
| 70 | + android:layout_marginTop="10dp" | ||
| 71 | android:orientation="vertical"> | 71 | android:orientation="vertical"> |
| 72 | 72 | ||
| 73 | <TextView | 73 | <TextView |