diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aab9444..c3cef33 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -75,28 +75,27 @@ - - - - + + + - - - - + + + + - + + android:windowSoftInputMode="adjustPan|stateHidden" /> + \ No newline at end of file diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java index 546ad6b..1b7cd49 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java @@ -20,11 +20,9 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. context.startActivity(intent); } - TextView tvLocalAddress; - EditText et_search; - ImageView ivSearch; + ImageView ivSearch,ivLocalAddress; @Override protected void initView(Bundle savedInstanceState) { @@ -34,14 +32,12 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. private void initViews() { - tvLocalAddress=findViewById(R.id.tvLocalAddress); et_search=findViewById(R.id.et_search); ivSearch=findViewById(R.id.ivSearch); + ivLocalAddress=findViewById(R.id.ivLocalAddress); ivSearch.setOnClickListener(this); - tvLocalAddress.setBackgroundResource(R.drawable.back); - tvLocalAddress.setText(""); - + ivLocalAddress.setOnClickListener(this); } @Override @@ -55,6 +51,9 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. case R.id.ivSearch: break; + case R.id.ivLocalAddress: + finish(); + break; } } } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java new file mode 100644 index 0000000..c70a9d9 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java @@ -0,0 +1,21 @@ +package com.shunzhi.parent.ui.activity.consult; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +import com.share.mvpsdk.base.activity.BaseCompatActivity; +import com.shunzhi.parent.R; + +public class ConsultTwoLevelActivity extends BaseCompatActivity { + + + @Override + protected void initView(Bundle savedInstanceState) { + + } + + @Override + protected int getLayoutId() { + return R.layout.activity_consult_two_level; + } +} diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java index 551a814..637e552 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java @@ -24,7 +24,7 @@ public class ReportFragment extends BaseMVPCompatFragment { @Override public void initUI(View view, @Nullable Bundle savedInstanceState) { - + } diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java index e27c8d9..7d30efd 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java @@ -67,6 +67,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment implements Vi } private void initViews(View view) { + textAndImg1 = view.findViewById(R.id.textAndImg1); textAndImg2 = view.findViewById(R.id.textAndImg2); textAndImg3 = view.findViewById(R.id.textAndImg3); diff --git a/app/src/main/res/layout/activity_consult_one_level.xml b/app/src/main/res/layout/activity_consult_one_level.xml index a13f874..cbd95c4 100644 --- a/app/src/main/res/layout/activity_consult_one_level.xml +++ b/app/src/main/res/layout/activity_consult_one_level.xml @@ -7,7 +7,7 @@ android:orientation="vertical" tools:context="com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity"> - + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml index 099b624..c003f2f 100644 --- a/app/src/main/res/layout/fragment_report.xml +++ b/app/src/main/res/layout/fragment_report.xml @@ -5,12 +5,6 @@ android:orientation="vertical" tools:context="com.shunzhi.parent.ui.fragment.ReportFragment"> -<<<<<<< HEAD - -======= ->>>>>>> 91d4262102c69d0c070bfc0895a51c51b717175b - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_report_BACKUP_12928.xml b/app/src/main/res/layout/fragment_report_BACKUP_12928.xml deleted file mode 100644 index 099b624..0000000 --- a/app/src/main/res/layout/fragment_report_BACKUP_12928.xml +++ /dev/null @@ -1,113 +0,0 @@ - - -<<<<<<< HEAD - -======= - - - - - - - - - - - - - - - - ->>>>>>> 91d4262102c69d0c070bfc0895a51c51b717175b - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_report_BASE_12928.xml b/app/src/main/res/layout/fragment_report_BASE_12928.xml deleted file mode 100644 index f97eea6..0000000 --- a/app/src/main/res/layout/fragment_report_BASE_12928.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/fragment_report_LOCAL_12928.xml b/app/src/main/res/layout/fragment_report_LOCAL_12928.xml deleted file mode 100644 index f7e0053..0000000 --- a/app/src/main/res/layout/fragment_report_LOCAL_12928.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_report_REMOTE_12928.xml b/app/src/main/res/layout/fragment_report_REMOTE_12928.xml deleted file mode 100644 index 8d3f24f..0000000 --- a/app/src/main/res/layout/fragment_report_REMOTE_12928.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/layout_search_back.xml b/app/src/main/res/layout/layout_search_back.xml new file mode 100644 index 0000000..4a4e73c --- /dev/null +++ b/app/src/main/res/layout/layout_search_back.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + \ No newline at end of file -- libgit2 0.21.0