Commit a56f821adf224149af3773bbe24cb73fb20ac6ef
1 parent
5ecc3e8e
Exists in
yxb_dev
and in
2 other branches
no message
Showing
5 changed files
with
63 additions
and
27 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
@@ -22,7 +22,7 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. | @@ -22,7 +22,7 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. | ||
22 | 22 | ||
23 | EditText et_search; | 23 | EditText et_search; |
24 | 24 | ||
25 | - ImageView ivSearch,ivLocalAddress; | 25 | + ImageView ivSearch,ivBack; |
26 | @Override | 26 | @Override |
27 | protected void initView(Bundle savedInstanceState) { | 27 | protected void initView(Bundle savedInstanceState) { |
28 | 28 | ||
@@ -34,10 +34,10 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. | @@ -34,10 +34,10 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. | ||
34 | 34 | ||
35 | et_search=findViewById(R.id.et_search); | 35 | et_search=findViewById(R.id.et_search); |
36 | ivSearch=findViewById(R.id.ivSearch); | 36 | ivSearch=findViewById(R.id.ivSearch); |
37 | - ivLocalAddress=findViewById(R.id.ivLocalAddress); | 37 | + ivBack=findViewById(R.id.ivBack); |
38 | 38 | ||
39 | ivSearch.setOnClickListener(this); | 39 | ivSearch.setOnClickListener(this); |
40 | - ivLocalAddress.setOnClickListener(this); | 40 | + ivBack.setOnClickListener(this); |
41 | } | 41 | } |
42 | 42 | ||
43 | @Override | 43 | @Override |
@@ -51,7 +51,7 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. | @@ -51,7 +51,7 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. | ||
51 | case R.id.ivSearch: | 51 | case R.id.ivSearch: |
52 | 52 | ||
53 | break; | 53 | break; |
54 | - case R.id.ivLocalAddress: | 54 | + case R.id.ivBack: |
55 | finish(); | 55 | finish(); |
56 | break; | 56 | break; |
57 | } | 57 | } |
app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java
1 | package com.shunzhi.parent.ui.activity.consult; | 1 | package com.shunzhi.parent.ui.activity.consult; |
2 | 2 | ||
3 | +import android.support.annotation.NonNull; | ||
4 | +import android.support.annotation.Nullable; | ||
3 | import android.support.v7.app.AppCompatActivity; | 5 | import android.support.v7.app.AppCompatActivity; |
4 | import android.os.Bundle; | 6 | import android.os.Bundle; |
7 | +import android.view.View; | ||
8 | +import android.widget.EditText; | ||
9 | +import android.widget.ImageView; | ||
10 | +import android.widget.TextView; | ||
5 | 11 | ||
12 | +import com.share.mvpsdk.base.BasePresenter; | ||
6 | import com.share.mvpsdk.base.activity.BaseCompatActivity; | 13 | import com.share.mvpsdk.base.activity.BaseCompatActivity; |
14 | +import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; | ||
7 | import com.shunzhi.parent.R; | 15 | import com.shunzhi.parent.R; |
8 | 16 | ||
9 | -public class ConsultTwoLevelActivity extends BaseCompatActivity { | 17 | +public class ConsultTwoLevelActivity extends BaseMVPCompatFragment implements View.OnClickListener{ |
10 | 18 | ||
19 | + ImageView ivBack,ivSearch; | ||
20 | + | ||
21 | + EditText et_search; | ||
22 | + | ||
23 | + TextView tvContentName; | ||
24 | + | ||
25 | + @Override | ||
26 | + public int getLayoutId() { | ||
27 | + return R.layout.activity_consult_two_level; | ||
28 | + } | ||
11 | 29 | ||
12 | @Override | 30 | @Override |
13 | - protected void initView(Bundle savedInstanceState) { | 31 | + public void initUI(View view, @Nullable Bundle savedInstanceState) { |
32 | + | ||
33 | + initViews(view); | ||
14 | 34 | ||
15 | } | 35 | } |
16 | 36 | ||
37 | + private void initViews(View view) { | ||
38 | + | ||
39 | + ivBack=view.findViewById(R.id.ivBack); | ||
40 | + ivBack.setOnClickListener(this); | ||
41 | + | ||
42 | + et_search=view.findViewById(R.id.et_search); | ||
43 | + | ||
44 | + ivSearch=view.findViewById(R.id.ivSearch); | ||
45 | + ivSearch.setOnClickListener(this); | ||
46 | + | ||
47 | + tvContentName=view.findViewById(R.id.tvContentName); | ||
48 | + tvContentName.setText(""); | ||
49 | + | ||
50 | + } | ||
51 | + | ||
52 | + @NonNull | ||
17 | @Override | 53 | @Override |
18 | - protected int getLayoutId() { | ||
19 | - return R.layout.activity_consult_two_level; | 54 | + public BasePresenter initPresenter() { |
55 | + return null; | ||
56 | + } | ||
57 | + | ||
58 | + @Override | ||
59 | + public void onClick(View view) { | ||
60 | + switch (view.getId()){ | ||
61 | + case R.id.ivBack: | ||
62 | + back(); | ||
63 | + break; | ||
64 | + case R.id.ivSearch: | ||
65 | + | ||
66 | + break; | ||
67 | + } | ||
20 | } | 68 | } |
21 | } | 69 | } |
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
@@ -3,34 +3,21 @@ package com.shunzhi.parent.ui.fragment; | @@ -3,34 +3,21 @@ package com.shunzhi.parent.ui.fragment; | ||
3 | import android.content.Context; | 3 | import android.content.Context; |
4 | import android.net.Uri; | 4 | import android.net.Uri; |
5 | import android.os.Bundle; | 5 | import android.os.Bundle; |
6 | -import android.support.annotation.NonNull; | ||
7 | -import android.support.annotation.Nullable; | ||
8 | import android.support.v4.app.Fragment; | 6 | import android.support.v4.app.Fragment; |
9 | import android.view.LayoutInflater; | 7 | import android.view.LayoutInflater; |
10 | import android.view.View; | 8 | import android.view.View; |
11 | import android.view.ViewGroup; | 9 | import android.view.ViewGroup; |
12 | 10 | ||
13 | -import com.share.mvpsdk.base.BasePresenter; | ||
14 | -import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; | ||
15 | import com.shunzhi.parent.R; | 11 | import com.shunzhi.parent.R; |
16 | 12 | ||
17 | -public class ReportFragment extends BaseMVPCompatFragment { | ||
18 | - | 13 | +public class ReportFragment extends Fragment { |
19 | 14 | ||
20 | @Override | 15 | @Override |
21 | - public int getLayoutId() { | ||
22 | - return R.layout.fragment_report; | 16 | + public View onCreateView(LayoutInflater inflater, ViewGroup container, |
17 | + Bundle savedInstanceState) { | ||
18 | + // Inflate the layout for this fragment | ||
19 | + return inflater.inflate(R.layout.fragment_report, container, false); | ||
23 | } | 20 | } |
24 | 21 | ||
25 | - @Override | ||
26 | - public void initUI(View view, @Nullable Bundle savedInstanceState) { | ||
27 | - | ||
28 | - } | ||
29 | 22 | ||
30 | - | ||
31 | - @NonNull | ||
32 | - @Override | ||
33 | - public BasePresenter initPresenter() { | ||
34 | - return null; | ||
35 | - } | ||
36 | } | 23 | } |
app/src/main/res/layout/activity_consult_two_level.xml
@@ -16,6 +16,7 @@ | @@ -16,6 +16,7 @@ | ||
16 | android:textColor="@color/textColor" | 16 | android:textColor="@color/textColor" |
17 | android:text="政策咨询" | 17 | android:text="政策咨询" |
18 | android:gravity="center" | 18 | android:gravity="center" |
19 | + android:id="@+id/tvContentName" | ||
19 | android:paddingTop="@dimen/size_dp_5" | 20 | android:paddingTop="@dimen/size_dp_5" |
20 | android:paddingBottom="@dimen/size_dp_5" | 21 | android:paddingBottom="@dimen/size_dp_5" |
21 | /> | 22 | /> |
app/src/main/res/layout/layout_search_back.xml
@@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
5 | android:background="@color/titleColor"> | 5 | android:background="@color/titleColor"> |
6 | 6 | ||
7 | <ImageView | 7 | <ImageView |
8 | - android:id="@+id/ivLocalAddress" | 8 | + android:id="@+id/ivBack" |
9 | android:layout_width="wrap_content" | 9 | android:layout_width="wrap_content" |
10 | android:layout_height="match_parent" | 10 | android:layout_height="match_parent" |
11 | android:gravity="center" | 11 | android:gravity="center" |