张涛 / huahang_project · 提交

转到一个项目

作者 qin
提交 eb9d7f5336746aeaada078d56e535cf0f9bb15ec 1 个父辈 9706212c

bug修改

内嵌 并排对比
正在显示 53 个修改的文件 包含 503 行增加 和 210 行删除
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="MarkdownExportedFiles">
  4 + <htmlFiles />
  5 + <imageFiles />
  6 + <otherFiles />
  7 + </component>
  8 +</project>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="MarkdownProjectSettings" wasCopied="false">
  4 + <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true" openRemoteLinks="true" replaceUnicodeEmoji="false" lastLayoutSetsDefault="false">
  5 + <PanelProvider>
  6 + <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
  7 + </PanelProvider>
  8 + </PreviewSettings>
  9 + <ParserSettings gitHubSyntaxChange="false" emojiShortcuts="1" emojiImages="0">
  10 + <PegdownExtensions>
  11 + <option name="ABBREVIATIONS" value="false" />
  12 + <option name="ANCHORLINKS" value="true" />
  13 + <option name="ASIDE" value="false" />
  14 + <option name="ATXHEADERSPACE" value="true" />
  15 + <option name="AUTOLINKS" value="true" />
  16 + <option name="DEFINITIONS" value="false" />
  17 + <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
  18 + <option name="FENCED_CODE_BLOCKS" value="true" />
  19 + <option name="FOOTNOTES" value="false" />
  20 + <option name="HARDWRAPS" value="false" />
  21 + <option name="HTML_DEEP_PARSER" value="false" />
  22 + <option name="INSERTED" value="false" />
  23 + <option name="QUOTES" value="false" />
  24 + <option name="RELAXEDHRULES" value="true" />
  25 + <option name="SMARTS" value="false" />
  26 + <option name="STRIKETHROUGH" value="true" />
  27 + <option name="SUBSCRIPT" value="false" />
  28 + <option name="SUPERSCRIPT" value="false" />
  29 + <option name="SUPPRESS_HTML_BLOCKS" value="false" />
  30 + <option name="SUPPRESS_INLINE_HTML" value="false" />
  31 + <option name="TABLES" value="true" />
  32 + <option name="TASKLISTITEMS" value="true" />
  33 + <option name="TOC" value="false" />
  34 + <option name="WIKILINKS" value="false" />
  35 + </PegdownExtensions>
  36 + <ParserOptions>
  37 + <option name="ADMONITION_EXT" value="false" />
  38 + <option name="ATTRIBUTES_EXT" value="false" />
  39 + <option name="COMMONMARK_LISTS" value="true" />
  40 + <option name="DUMMY" value="false" />
  41 + <option name="EMOJI_SHORTCUTS" value="true" />
  42 + <option name="ENUMERATED_REFERENCES_EXT" value="false" />
  43 + <option name="FLEXMARK_FRONT_MATTER" value="false" />
  44 + <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
  45 + <option name="GFM_TABLE_RENDERING" value="true" />
  46 + <option name="GITBOOK_URL_ENCODING" value="false" />
  47 + <option name="GITHUB_LISTS" value="false" />
  48 + <option name="GITHUB_WIKI_LINKS" value="false" />
  49 + <option name="GITLAB_EXT" value="false" />
  50 + <option name="GITLAB_MATH_EXT" value="false" />
  51 + <option name="GITLAB_MERMAID_EXT" value="false" />
  52 + <option name="HEADER_ID_NON_ASCII_TO_LOWERCASE" value="false" />
  53 + <option name="HEADER_ID_NO_DUPED_DASHES" value="false" />
  54 + <option name="JEKYLL_FRONT_MATTER" value="false" />
  55 + <option name="MACROS_EXT" value="false" />
  56 + <option name="NO_TEXT_ATTRIBUTES" value="false" />
  57 + <option name="PARSE_HTML_ANCHOR_ID" value="false" />
  58 + <option name="PLANTUML_FENCED_CODE" value="false" />
  59 + <option name="PUML_FENCED_CODE" value="false" />
  60 + <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
  61 + </ParserOptions>
  62 + </ParserSettings>
  63 + <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true" embedImages="false" embedHttpImages="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0" mathConversion="0">
  64 + <GeneratorProvider>
  65 + <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
  66 + </GeneratorProvider>
  67 + <headerTop />
  68 + <headerBottom />
  69 + <bodyTop />
  70 + <bodyBottom />
  71 + </HtmlSettings>
  72 + <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
  73 + <StylesheetProvider>
  74 + <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
  75 + </StylesheetProvider>
  76 + <ScriptProviders />
  77 + <cssText />
  78 + <cssUriHistory />
  79 + </CssSettings>
  80 + <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
  81 + <LinkMapSettings>
  82 + <textMaps />
  83 + </LinkMapSettings>
  84 + </component>
  85 +</project>
  1 +<component name="MarkdownNavigator.ProfileManager">
  2 + <settings default="" pdf-export="" />
  3 +</component>
@@ -137,6 +137,15 @@ @@ -137,6 +137,15 @@
137 <activity 137 <activity
138 android:name=".activity.pratice.AnswerWrongActivity" 138 android:name=".activity.pratice.AnswerWrongActivity"
139 android:screenOrientation="portrait" /> 139 android:screenOrientation="portrait" />
  140 + <activity
  141 + android:name=".activity.pratice.a"
  142 + android:screenOrientation="portrait" />
  143 + <activity
  144 + android:name=".activity.pratice.b"
  145 + android:screenOrientation="portrait" />
  146 + <activity
  147 + android:name=".activity.pratice.c"
  148 + android:screenOrientation="portrait" />
140 149
141 <!-- 微信 --> 150 <!-- 微信 -->
142 <activity 151 <activity
@@ -6,7 +6,6 @@ import android.support.v4.app.FragmentTransaction; @@ -6,7 +6,6 @@ import android.support.v4.app.FragmentTransaction;
6 import android.view.View; 6 import android.view.View;
7 import android.widget.RadioButton; 7 import android.widget.RadioButton;
8 8
9 -import com.hh.xuetubao.Utils.SharedPrefrenceUtils;  
10 import com.hh.xuetubao.activity.pratice.PracticeActivity; 9 import com.hh.xuetubao.activity.pratice.PracticeActivity;
11 import com.hh.xuetubao.activity.study.StudyActivity; 10 import com.hh.xuetubao.activity.study.StudyActivity;
12 import com.hh.xuetubao.activity.work.JobHuntActivity; 11 import com.hh.xuetubao.activity.work.JobHuntActivity;
@@ -53,8 +52,6 @@ public class MainActivity extends BaseMvpActivity<CommonPresenter, MainModel> im @@ -53,8 +52,6 @@ public class MainActivity extends BaseMvpActivity<CommonPresenter, MainModel> im
53 getWindow().setNavigationBarColor(Color.parseColor("#fcfcfc")); 52 getWindow().setNavigationBarColor(Color.parseColor("#fcfcfc"));
54 //状态栏颜色 53 //状态栏颜色
55 getWindow().setStatusBarColor(Color.parseColor("#fcfcfc"));*/ 54 getWindow().setStatusBarColor(Color.parseColor("#fcfcfc"));*/
56 -  
57 -  
58 homeFragment = new HomeFragment(); 55 homeFragment = new HomeFragment();
59 wrongFragment = new PraticeWrongFragment(); 56 wrongFragment = new PraticeWrongFragment();
60 57
@@ -145,7 +142,7 @@ public class MainActivity extends BaseMvpActivity<CommonPresenter, MainModel> im @@ -145,7 +142,7 @@ public class MainActivity extends BaseMvpActivity<CommonPresenter, MainModel> im
145 MainActivity.this.finish(); 142 MainActivity.this.finish();
146 break; 143 break;
147 case R.id.rl_mine: 144 case R.id.rl_mine:
148 - transaction.replace(R.id.frame, mineFragment); 145 + transaction.replace(R.id.frame, mineFragment, "1");
149 transaction.commit(); 146 transaction.commit();
150 rlMine.setChecked(true); 147 rlMine.setChecked(true);
151 selectTag = 4; 148 selectTag = 4;
@@ -547,4 +547,13 @@ public interface MyServer { @@ -547,4 +547,13 @@ public interface MyServer {
547 @GET("GetRandomQuestions") 547 @GET("GetRandomQuestions")
548 Observable<AnswerBean> GetRandomQuestions(@Query("catalogOid") String catalogOid, @Query("randomNum") int randomNum, @Query("accountOid") String accountOid); 548 Observable<AnswerBean> GetRandomQuestions(@Query("catalogOid") String catalogOid, @Query("randomNum") int randomNum, @Query("accountOid") String accountOid);
549 549
  550 + /**
  551 + * 删除成绩接口
  552 + *
  553 + * @param oid 当前目录ID
  554 + * @return
  555 + */
  556 + @GET("DeleteExamRecordInfo")
  557 + Observable<UserBean> DeleteExamRecordInfo(@Query("oid") String oid);
  558 +
550 } 559 }
  1 +package com.hh.xuetubao.Utils;
  2 +
  3 +import android.content.Context;
  4 +import android.content.Intent;
  5 +import android.util.AttributeSet;
  6 +import android.widget.GridView;
  7 +
  8 +/**
  9 + * Time: 11/22/2019 9:28
  10 + * Author: 秦小飞
  11 + * Description:
  12 + */
  13 +public class GridViewNesting extends GridView {
  14 + public GridViewNesting(Context context) {
  15 + super(context);
  16 + }
  17 +
  18 + public GridViewNesting(Context context, AttributeSet attrs) {
  19 + super(context, attrs);
  20 + }
  21 +
  22 + public GridViewNesting(Context context, AttributeSet attrs, int defStyleAttr) {
  23 + super(context, attrs, defStyleAttr);
  24 + }
  25 +
  26 + public GridViewNesting(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
  27 + super(context, attrs, defStyleAttr, defStyleRes);
  28 + }
  29 +
  30 + @Override
  31 + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
  32 + int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2,
  33 + MeasureSpec.AT_MOST);
  34 + super.onMeasure(widthMeasureSpec, expandSpec);
  35 + }
  36 +}
@@ -6,15 +6,16 @@ import android.os.Build; @@ -6,15 +6,16 @@ import android.os.Build;
6 import android.os.Bundle; 6 import android.os.Bundle;
7 import android.support.annotation.RequiresApi; 7 import android.support.annotation.RequiresApi;
8 import android.util.Log; 8 import android.util.Log;
9 -import android.view.KeyEvent;  
10 import android.view.View; 9 import android.view.View;
11 import android.widget.LinearLayout; 10 import android.widget.LinearLayout;
12 import android.widget.RelativeLayout; 11 import android.widget.RelativeLayout;
13 import android.widget.TextView; 12 import android.widget.TextView;
  13 +import android.widget.Toast;
14 14
15 import com.hh.xuetubao.R; 15 import com.hh.xuetubao.R;
16 import com.hh.xuetubao.Utils.SharedPrefrenceUtils; 16 import com.hh.xuetubao.Utils.SharedPrefrenceUtils;
17 import com.hh.xuetubao.Utils.WaveView; 17 import com.hh.xuetubao.Utils.WaveView;
  18 +import com.hh.xuetubao.bean.UserBean;
18 import com.hh.xuetubao.model.ExerciseModel; 19 import com.hh.xuetubao.model.ExerciseModel;
19 import com.hh.xuetubao.mvp.BaseMvpActivity; 20 import com.hh.xuetubao.mvp.BaseMvpActivity;
20 import com.hh.xuetubao.mvp.CommonPresenter; 21 import com.hh.xuetubao.mvp.CommonPresenter;
@@ -35,7 +36,7 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise @@ -35,7 +36,7 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
35 @BindView(R.id.tv_title) 36 @BindView(R.id.tv_title)
36 TextView tvTitle; 37 TextView tvTitle;
37 @BindView(R.id.lin_tab) 38 @BindView(R.id.lin_tab)
38 - LinearLayout linTab; 39 + RelativeLayout linTab;
39 @BindView(R.id.tv_time) 40 @BindView(R.id.tv_time)
40 TextView tvTime; 41 TextView tvTime;
41 @BindView(R.id.tv3) 42 @BindView(R.id.tv3)
@@ -62,6 +63,8 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise @@ -62,6 +63,8 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
62 RelativeLayout rlAllWrong; 63 RelativeLayout rlAllWrong;
63 @BindView(R.id.rl_reStart) 64 @BindView(R.id.rl_reStart)
64 RelativeLayout rlReStart; 65 RelativeLayout rlReStart;
  66 + @BindView(R.id.tv_delete)
  67 + TextView tvDelete;
65 private String catalogOid; 68 private String catalogOid;
66 private Intent intent; 69 private Intent intent;
67 private String thisCatalogOid; 70 private String thisCatalogOid;
@@ -107,7 +110,7 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise @@ -107,7 +110,7 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
107 linTab.setOnClickListener(this); 110 linTab.setOnClickListener(this);
108 rlAllWrong.setOnClickListener(this); 111 rlAllWrong.setOnClickListener(this);
109 rlReStart.setOnClickListener(this); 112 rlReStart.setOnClickListener(this);
110 - 113 + tvDelete.setOnClickListener(this);
111 114
112 thisCatalogOid = SharedPrefrenceUtils.getString(this, "thisCatalogOid"); 115 thisCatalogOid = SharedPrefrenceUtils.getString(this, "thisCatalogOid");
113 } 116 }
@@ -134,7 +137,9 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise @@ -134,7 +137,9 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
134 137
135 @Override 138 @Override
136 public void getData(Object o, int api, int intent) { 139 public void getData(Object o, int api, int intent) {
137 - 140 + if (api == 9 && intent == 1) {
  141 + UserBean bean = (UserBean) o;
  142 + }
138 } 143 }
139 144
140 @Override 145 @Override
@@ -178,7 +183,7 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise @@ -178,7 +183,7 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
178 finish(); 183 finish();
179 break; 184 break;
180 case R.id.rl_allWrong: 185 case R.id.rl_allWrong:
181 - intent = new Intent(this,c.class); 186 + intent = new Intent(this, c.class);
182 intent.putExtra("catalogOid", catalogOid); 187 intent.putExtra("catalogOid", catalogOid);
183 startActivity(intent); 188 startActivity(intent);
184 break; 189 break;
@@ -187,6 +192,10 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise @@ -187,6 +192,10 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
187 intent.putExtra("catalogOid", catalogOid); 192 intent.putExtra("catalogOid", catalogOid);
188 startActivity(intent); 193 startActivity(intent);
189 break; 194 break;
  195 + case R.id.tv_delete:
  196 + Toast.makeText(this,"1",Toast.LENGTH_SHORT).show();
  197 + mPresenter.getPresenter(9, 1, thisCatalogOid);
  198 + break;
190 199
191 } 200 }
192 } 201 }
@@ -4,6 +4,7 @@ import android.content.Context; @@ -4,6 +4,7 @@ import android.content.Context;
4 import android.content.Intent; 4 import android.content.Intent;
5 import android.os.Build; 5 import android.os.Build;
6 import android.os.Bundle; 6 import android.os.Bundle;
  7 +import android.os.CountDownTimer;
7 import android.support.annotation.RequiresApi; 8 import android.support.annotation.RequiresApi;
8 import android.text.TextUtils; 9 import android.text.TextUtils;
9 import android.util.Log; 10 import android.util.Log;
@@ -72,18 +73,20 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement @@ -72,18 +73,20 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
72 LinearLayout linTab; 73 LinearLayout linTab;
73 @BindView(R.id.rl_card) 74 @BindView(R.id.rl_card)
74 RelativeLayout rlCard; 75 RelativeLayout rlCard;
75 - @BindView(R.id.right_select)  
76 - TextView rightSelect;  
77 - @BindView(R.id.right_answer)  
78 - TextView rightAnswerText;  
79 - @BindView(R.id.rl_answer)  
80 - RelativeLayout rlAnswer; 76 +// @BindView(R.id.right_select)
  77 +// TextView rightSelect;
  78 +// @BindView(R.id.right_answer)
  79 +// TextView rightAnswerText;
  80 +// @BindView(R.id.rl_answer)
  81 +// RelativeLayout rlAnswer;
81 @BindView(R.id.commit) 82 @BindView(R.id.commit)
82 LinearLayout commit; 83 LinearLayout commit;
83 - @BindView(R.id.tv2)  
84 - TextView tv2; 84 +// @BindView(R.id.tv2)
  85 +// TextView tv2;
85 @BindView(R.id.tv_show_card) 86 @BindView(R.id.tv_show_card)
86 TextView tvShowCard; 87 TextView tvShowCard;
  88 + @BindView(R.id.tv_second)
  89 + TextView tvSecond;
87 90
88 private String catalogOid; 91 private String catalogOid;
89 private String accountOid; 92 private String accountOid;
@@ -115,6 +118,9 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement @@ -115,6 +118,9 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
115 private double danxuan; 118 private double danxuan;
116 private double duoxuan; 119 private double duoxuan;
117 private double panduan; 120 private double panduan;
  121 + private int longTime;
  122 + private int thisTime;
  123 + private CountDownTimer timer;
118 124
119 125
120 @Override 126 @Override
@@ -292,7 +298,8 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement @@ -292,7 +298,8 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
292 @Override 298 @Override
293 public int initLayout() { 299 public int initLayout() {
294 // return R.layout.activity_answer; 300 // return R.layout.activity_answer;
295 - return R.layout.activity_answer_sheet; 301 +// return R.layout.activity_answer_sheet;
  302 + return R.layout.activity_answer;
296 } 303 }
297 304
298 @Override 305 @Override
@@ -311,6 +318,13 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement @@ -311,6 +318,13 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
311 return new ExerciseModel(); 318 return new ExerciseModel();
312 } 319 }
313 320
  321 +
  322 + @Override
  323 + protected void onDestroy() {
  324 + super.onDestroy();
  325 + timer.cancel();
  326 + }
  327 +
314 @Override 328 @Override
315 public void getData(Object o, int api, int intent) { 329 public void getData(Object o, int api, int intent) {
316 if (api == 4 && intent == 1) { 330 if (api == 4 && intent == 1) {
@@ -335,9 +349,9 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement @@ -335,9 +349,9 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
335 type = questionLstBeans.get(listIndex).getQuestionTypeName(); 349 type = questionLstBeans.get(listIndex).getQuestionTypeName();
336 tvRadio.setText(type); 350 tvRadio.setText(type);
337 rightAnswer = questionLstBeans.get(listIndex).getAnswer(); 351 rightAnswer = questionLstBeans.get(listIndex).getAnswer();
338 - rightSelect.setText(questionLstBeans.get(listIndex).getAnswer()); 352 +// rightSelect.setText(questionLstBeans.get(listIndex).getAnswer());
339 if (!TextUtils.isEmpty(questionLstBeans.get(listIndex).getAnswer())) { 353 if (!TextUtils.isEmpty(questionLstBeans.get(listIndex).getAnswer())) {
340 - rightAnswerText.setText(questionLstBeans.get(listIndex).getWrongAnaly()); 354 +// rightAnswerText.setText(questionLstBeans.get(listIndex).getWrongAnaly());
341 } 355 }
342 optionsAdapter = new ListAnswerAdapter(questionLst.get(listIndex).getOptionsLst(), this); 356 optionsAdapter = new ListAnswerAdapter(questionLst.get(listIndex).getOptionsLst(), this);
343 listAnswer.setAdapter(optionsAdapter); 357 listAnswer.setAdapter(optionsAdapter);
@@ -348,6 +362,60 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement @@ -348,6 +362,60 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
348 } 362 }
349 sheetGridAdapter = new AnswerSheetGridAdapter(statusList, this); 363 sheetGridAdapter = new AnswerSheetGridAdapter(statusList, this);
350 364
  365 + longTime = bean.getExamMinute() * 60;
  366 +
  367 + thisTime = longTime;
  368 + timer = new CountDownTimer(thisTime * 1000, 1000) {
  369 +
  370 + private Intent intent;
  371 +
  372 + @Override
  373 + public void onTick(long millisUntilFinished) {
  374 + thisTime--;
  375 + tvSecond.setText(String.valueOf(thisTime));
  376 + }
  377 +
  378 + @Override
  379 + public void onFinish() {
  380 + if (listIndex == 0) {
  381 + intent = new Intent(b.this, TestScoreActivity.class);
  382 + intent.putExtra("catalogOid", catalogOid);
  383 + intent.putExtra("danxuanCount", danxuanCount);
  384 + intent.putExtra("duoxuanCount", duoxuanCount);
  385 + intent.putExtra("panduanCount", panduanCount);
  386 + intent.putExtra("danxuanWrong", danxuanCount);
  387 + intent.putExtra("panduanWrong", panduanCount);
  388 + intent.putExtra("duoxuanWrong", duoxuanCount);
  389 + intent.putExtra("totalScore", totalScore);
  390 + startActivity(intent);
  391 + b.this.finish();
  392 + } else {
  393 +
  394 + for (int i = listIndex + 1; i < questionLst.size(); i++) {
  395 + if (questionLst.get(i).getQuestionTypeName().contains("单选")) {
  396 + danxuanWrong++;
  397 + } else if (questionLst.get(i).getQuestionTypeName().contains("多选")) {
  398 + duoxuanWrong++;
  399 + } else if (questionLst.get(i).getQuestionTypeName().contains("判断")) {
  400 + panduanWrong++;
  401 + }
  402 +
  403 + }
  404 + intent = new Intent(b.this, TestScoreActivity.class);
  405 + intent.putExtra("catalogOid", catalogOid);
  406 + intent.putExtra("danxuanCount", danxuanCount);
  407 + intent.putExtra("duoxuanCount", duoxuanCount);
  408 + intent.putExtra("panduanCount", panduanCount);
  409 + intent.putExtra("danxuanWrong", danxuanWrong);
  410 + intent.putExtra("panduanWrong", panduanWrong);
  411 + intent.putExtra("duoxuanWrong", duoxuanWrong);
  412 + intent.putExtra("totalScore", totalScore);
  413 + startActivity(intent);
  414 + b.this.finish();
  415 + }
  416 + }
  417 + }.start();
  418 +
351 } 419 }
352 } 420 }
353 421
@@ -367,10 +435,10 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement @@ -367,10 +435,10 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
367 tvRadio.setText(type); 435 tvRadio.setText(type);
368 index.setText(String.valueOf(listIndex + 1)); 436 index.setText(String.valueOf(listIndex + 1));
369 rightAnswer = questionLst.get(listIndex).getAnswer(); 437 rightAnswer = questionLst.get(listIndex).getAnswer();
370 - rightSelect.setText(questionLst.get(listIndex).getAnswer()); 438 +// rightSelect.setText(questionLst.get(listIndex).getAnswer());
371 if (!TextUtils.isEmpty(questionLst.get(listIndex).getWrongAnaly())) 439 if (!TextUtils.isEmpty(questionLst.get(listIndex).getWrongAnaly()))
372 - rightAnswerText.setText(questionLst.get(listIndex).getWrongAnaly());  
373 - rlAnswer.setVisibility(View.GONE); 440 +// rightAnswerText.setText(questionLst.get(listIndex).getWrongAnaly());
  441 +// rlAnswer.setVisibility(View.GONE);
374 442
375 optionsAdapter = new ListAnswerAdapter(questionLst.get(listIndex).getOptionsLst(), this); 443 optionsAdapter = new ListAnswerAdapter(questionLst.get(listIndex).getOptionsLst(), this);
376 listAnswer.setAdapter(optionsAdapter); 444 listAnswer.setAdapter(optionsAdapter);
@@ -532,7 +600,7 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement @@ -532,7 +600,7 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
532 this.finish(); 600 this.finish();
533 break; 601 break;
534 case R.id.tv_look: 602 case R.id.tv_look:
535 - rlAnswer.setVisibility(View.VISIBLE); 603 +// rlAnswer.setVisibility(View.VISIBLE);
536 break; 604 break;
537 case R.id.commit: 605 case R.id.commit:
538 if (listIndex > historyAnswer.size()) { 606 if (listIndex > historyAnswer.size()) {
@@ -39,7 +39,7 @@ import butterknife.BindView; @@ -39,7 +39,7 @@ import butterknife.BindView;
39 import butterknife.ButterKnife; 39 import butterknife.ButterKnife;
40 40
41 /** 41 /**
42 - * 模拟练习页面 42 + * 错题练习页面
43 */ 43 */
44 public class c extends BaseMvpActivity<CommonPresenter, ExerciseModel> implements ICommonView, View.OnClickListener { 44 public class c extends BaseMvpActivity<CommonPresenter, ExerciseModel> implements ICommonView, View.OnClickListener {
45 45
@@ -42,12 +42,13 @@ public class CertificationCourseContentAdapter extends BaseAdapter { @@ -42,12 +42,13 @@ public class CertificationCourseContentAdapter extends BaseAdapter {
42 TextView title = (TextView) view.findViewById(R.id.title); 42 TextView title = (TextView) view.findViewById(R.id.title);
43 View line = view.findViewById(R.id.line); 43 View line = view.findViewById(R.id.line);
44 44
45 - if (list.get(position).getCatalogName() != null) 45 + if (list.get(position).getCatalogName() != null) {
46 title.setText(list.get(position).getCatalogName()); 46 title.setText(list.get(position).getCatalogName());
  47 + }
47 if (position == list.size() - 1) { 48 if (position == list.size() - 1) {
48 - line.setVisibility(View.VISIBLE); 49 + line.setVisibility(View.GONE);
49 } else { 50 } else {
50 - line.setVisibility(View.INVISIBLE); 51 + line.setVisibility(View.VISIBLE);
51 } 52 }
52 return view; 53 return view;
53 } 54 }
@@ -29,7 +29,11 @@ public class GridHomeHotAdapter extends BaseAdapter { @@ -29,7 +29,11 @@ public class GridHomeHotAdapter extends BaseAdapter {
29 29
30 @Override 30 @Override
31 public int getCount() { 31 public int getCount() {
32 - return list.size(); 32 + if (list.size() > 4) {
  33 + return 4;
  34 + } else {
  35 + return list.size();
  36 + }
33 } 37 }
34 38
35 @Override 39 @Override
1 package com.hh.xuetubao.adapter; 1 package com.hh.xuetubao.adapter;
2 2
3 import android.content.Context; 3 import android.content.Context;
  4 +import android.support.v7.widget.LinearLayoutManager;
  5 +import android.support.v7.widget.RecyclerView;
4 import android.view.LayoutInflater; 6 import android.view.LayoutInflater;
5 import android.view.View; 7 import android.view.View;
6 import android.view.ViewGroup; 8 import android.view.ViewGroup;
@@ -25,7 +27,11 @@ public class HomeCompanyAdapter extends BaseAdapter { @@ -25,7 +27,11 @@ public class HomeCompanyAdapter extends BaseAdapter {
25 27
26 @Override 28 @Override
27 public int getCount() { 29 public int getCount() {
28 - return list.size(); 30 + if (list.size() > 3) {
  31 + return 3;
  32 + } else {
  33 + return list.size();
  34 + }
29 } 35 }
30 36
31 @Override 37 @Override
@@ -48,6 +54,17 @@ public class HomeCompanyAdapter extends BaseAdapter { @@ -48,6 +54,17 @@ public class HomeCompanyAdapter extends BaseAdapter {
48 TextView address = (TextView) view.findViewById(R.id.address); 54 TextView address = (TextView) view.findViewById(R.id.address);
49 TextView job = (TextView) view.findViewById(R.id.job); 55 TextView job = (TextView) view.findViewById(R.id.job);
50 TextView count = (TextView) view.findViewById(R.id.job_count); 56 TextView count = (TextView) view.findViewById(R.id.job_count);
  57 + RecyclerView rec = (RecyclerView) view.findViewById(R.id.list_label);
  58 + View line = (View) view.findViewById(R.id.line);
  59 +
  60 +
  61 + LinearLayoutManager manager = new LinearLayoutManager(context);
  62 + manager.setOrientation(LinearLayoutManager.HORIZONTAL);
  63 + rec.setLayoutManager(manager);
  64 + List<CompanyBean.CompanyListBean.IndustryListBean> industryList = list.get(position).getIndustryList();
  65 + ListLabelAdapter adapter = new ListLabelAdapter(industryList, context);
  66 + rec.setAdapter(adapter);
  67 +
51 68
52 count.setText(String.valueOf(list.get(position).getJobCount())); 69 count.setText(String.valueOf(list.get(position).getJobCount()));
53 if (list.get(position).getCompanyLogo() != null) 70 if (list.get(position).getCompanyLogo() != null)
@@ -59,13 +76,30 @@ public class HomeCompanyAdapter extends BaseAdapter { @@ -59,13 +76,30 @@ public class HomeCompanyAdapter extends BaseAdapter {
59 if (list.get(position).getPopularJobName() != null) 76 if (list.get(position).getPopularJobName() != null)
60 job.setText(list.get(position).getPopularJobName()); 77 job.setText(list.get(position).getPopularJobName());
61 78
62 - job.setOnClickListener(new View.OnClickListener() { 79 +
  80 + if (list.size() > 3) {
  81 + if (position == 2) {
  82 + line.setVisibility(View.GONE);
  83 + } else {
  84 + line.setVisibility(View.VISIBLE);
  85 + }
  86 + } else {
  87 + if (position == list.size() - 1) {
  88 + line.setVisibility(View.GONE);
  89 + } else {
  90 + line.setVisibility(View.VISIBLE);
  91 + }
  92 +
  93 + }
  94 +
  95 +
  96 + /*job.setOnClickListener(new View.OnClickListener() {
63 @Override 97 @Override
64 public void onClick(View v) { 98 public void onClick(View v) {
65 99
66 } 100 }
67 }); 101 });
68 -  
69 - return view; 102 +*/
  103 + return view;
70 } 104 }
71 } 105 }
@@ -29,7 +29,11 @@ public class HomeQuestionAdapter extends BaseAdapter { @@ -29,7 +29,11 @@ public class HomeQuestionAdapter extends BaseAdapter {
29 29
30 @Override 30 @Override
31 public int getCount() { 31 public int getCount() {
32 - return list.size(); 32 + if (list.size() > 3) {
  33 + return 3;
  34 + } else {
  35 + return list.size();
  36 + }
33 } 37 }
34 38
35 @Override 39 @Override
@@ -55,12 +59,27 @@ public class HomeQuestionAdapter extends BaseAdapter { @@ -55,12 +59,27 @@ public class HomeQuestionAdapter extends BaseAdapter {
55 59
56 ImageView img = (ImageView) view.findViewById(R.id.img); 60 ImageView img = (ImageView) view.findViewById(R.id.img);
57 TextView title = (TextView) view.findViewById(R.id.title); 61 TextView title = (TextView) view.findViewById(R.id.title);
58 - TextView time = (TextView) view.findViewById(R.id.time); 62 + View line = view.findViewById(R.id.line);
59 63
60 if (list.get(position).getCatalogName() != null) 64 if (list.get(position).getCatalogName() != null)
61 title.setText(list.get(position).getCatalogName()); 65 title.setText(list.get(position).getCatalogName());
62 if (list.get(position).getConverUrl() != null) 66 if (list.get(position).getConverUrl() != null)
63 Glide.with(context).load(list.get(position).getConverUrl()).apply(coverRequestOptions).into(img); 67 Glide.with(context).load(list.get(position).getConverUrl()).apply(coverRequestOptions).into(img);
  68 +
  69 + if (list.size() > 3) {
  70 + if (position == 2) {
  71 + line.setVisibility(View.GONE);
  72 + } else {
  73 + line.setVisibility(View.VISIBLE);
  74 + }
  75 + } else {
  76 + if (position == list.size() - 1) {
  77 + line.setVisibility(View.GONE);
  78 + } else {
  79 + line.setVisibility(View.VISIBLE);
  80 + }
  81 +
  82 + }
64 return view; 83 return view;
65 } 84 }
66 85
@@ -70,7 +70,7 @@ public class JobHuntCompanyAdapter extends RecyclerView.Adapter<JobHuntCompanyAd @@ -70,7 +70,7 @@ public class JobHuntCompanyAdapter extends RecyclerView.Adapter<JobHuntCompanyAd
70 holder.hotJob.setOnClickListener(new View.OnClickListener() { 70 holder.hotJob.setOnClickListener(new View.OnClickListener() {
71 @Override 71 @Override
72 public void onClick(View v) { 72 public void onClick(View v) {
73 - if(turn != null){ 73 + if (turn != null) {
74 turn.turnToZw(list.get(position).getPopularJobOid()); 74 turn.turnToZw(list.get(position).getPopularJobOid());
75 } 75 }
76 } 76 }
@@ -80,7 +80,11 @@ public class JobHuntCompanyAdapter extends RecyclerView.Adapter<JobHuntCompanyAd @@ -80,7 +80,11 @@ public class JobHuntCompanyAdapter extends RecyclerView.Adapter<JobHuntCompanyAd
80 80
81 @Override 81 @Override
82 public int getItemCount() { 82 public int getItemCount() {
83 - return 3; 83 + if (list.size() > 3) {
  84 + return 3;
  85 + } else {
  86 + return list.size();
  87 + }
84 } 88 }
85 89
86 public class ViewHolder extends RecyclerView.ViewHolder { 90 public class ViewHolder extends RecyclerView.ViewHolder {
@@ -114,6 +118,7 @@ public class JobHuntCompanyAdapter extends RecyclerView.Adapter<JobHuntCompanyAd @@ -114,6 +118,7 @@ public class JobHuntCompanyAdapter extends RecyclerView.Adapter<JobHuntCompanyAd
114 118
115 public interface Turn { 119 public interface Turn {
116 void turnTo(String CompanyOid); 120 void turnTo(String CompanyOid);
  121 +
117 void turnToZw(String id); 122 void turnToZw(String id);
118 } 123 }
119 124
@@ -59,7 +59,7 @@ public class JobHuntWorkAdapter extends RecyclerView.Adapter<JobHuntWorkAdapter. @@ -59,7 +59,7 @@ public class JobHuntWorkAdapter extends RecyclerView.Adapter<JobHuntWorkAdapter.
59 59
60 @Override 60 @Override
61 public int getItemCount() { 61 public int getItemCount() {
62 - return 3; 62 + return list.size();
63 } 63 }
64 64
65 public class ViewHolder extends RecyclerView.ViewHolder { 65 public class ViewHolder extends RecyclerView.ViewHolder {
@@ -4,6 +4,7 @@ import android.content.Context; @@ -4,6 +4,7 @@ import android.content.Context;
4 import android.support.annotation.NonNull; 4 import android.support.annotation.NonNull;
5 import android.support.v7.widget.LinearLayoutManager; 5 import android.support.v7.widget.LinearLayoutManager;
6 import android.support.v7.widget.RecyclerView; 6 import android.support.v7.widget.RecyclerView;
  7 +import android.text.TextUtils;
7 import android.util.Log; 8 import android.util.Log;
8 import android.view.LayoutInflater; 9 import android.view.LayoutInflater;
9 import android.view.View; 10 import android.view.View;
@@ -46,12 +47,8 @@ public class RecruitmentRecAdapter extends RecyclerView.Adapter<RecruitmentRecAd @@ -46,12 +47,8 @@ public class RecruitmentRecAdapter extends RecyclerView.Adapter<RecruitmentRecAd
46 holder.year.setText(list.get(position).getExprience()); 47 holder.year.setText(list.get(position).getExprience());
47 if (list.get(position).getEducation() != null) 48 if (list.get(position).getEducation() != null)
48 holder.education.setText(list.get(position).getEducation()); 49 holder.education.setText(list.get(position).getEducation());
49 - if (list.get(position).getAddress() != null && !list.get(position).getAddress().equals("")) {  
50 - holder.address.setVisibility(View.VISIBLE); 50 + if (!TextUtils.isEmpty(list.get(position).getAddress())) {
51 holder.address.setText(list.get(position).getAddress()); 51 holder.address.setText(list.get(position).getAddress());
52 - Log.e("address111", list.get(position).getAddress().toString().trim());  
53 - }else {  
54 - holder.address.setVisibility(View.GONE);  
55 } 52 }
56 53
57 LinearLayoutManager manager = new LinearLayoutManager(context); 54 LinearLayoutManager manager = new LinearLayoutManager(context);
@@ -4,10 +4,10 @@ package com.hh.xuetubao.fragment; @@ -4,10 +4,10 @@ package com.hh.xuetubao.fragment;
4 import android.os.Bundle; 4 import android.os.Bundle;
5 import android.support.annotation.NonNull; 5 import android.support.annotation.NonNull;
6 import android.support.v4.app.Fragment; 6 import android.support.v4.app.Fragment;
  7 +import android.text.Html;
7 import android.view.LayoutInflater; 8 import android.view.LayoutInflater;
8 import android.view.View; 9 import android.view.View;
9 import android.view.ViewGroup; 10 import android.view.ViewGroup;
10 -import android.widget.ImageView;  
11 import android.widget.TextView; 11 import android.widget.TextView;
12 12
13 import com.amap.api.maps.AMap; 13 import com.amap.api.maps.AMap;
@@ -17,7 +17,6 @@ import com.amap.api.maps.MapView; @@ -17,7 +17,6 @@ import com.amap.api.maps.MapView;
17 import com.amap.api.maps.model.CameraPosition; 17 import com.amap.api.maps.model.CameraPosition;
18 import com.amap.api.maps.model.LatLng; 18 import com.amap.api.maps.model.LatLng;
19 import com.amap.api.maps.model.MyLocationStyle; 19 import com.amap.api.maps.model.MyLocationStyle;
20 -import com.bumptech.glide.Glide;  
21 import com.hh.xuetubao.MyServer; 20 import com.hh.xuetubao.MyServer;
22 import com.hh.xuetubao.R; 21 import com.hh.xuetubao.R;
23 import com.hh.xuetubao.Utils.BaseObsever; 22 import com.hh.xuetubao.Utils.BaseObsever;
@@ -46,7 +45,7 @@ public class CompanyMainFragment extends Fragment { @@ -46,7 +45,7 @@ public class CompanyMainFragment extends Fragment {
46 TextView address; 45 TextView address;
47 @BindView(R.id.web) 46 @BindView(R.id.web)
48 TextView web; 47 TextView web;
49 -// @BindView(R.id.img_hotel) 48 + // @BindView(R.id.img_hotel)
50 // ImageView imgHotel; 49 // ImageView imgHotel;
51 @BindView(R.id.tv_content) 50 @BindView(R.id.tv_content)
52 TextView tvContent; 51 TextView tvContent;
@@ -125,11 +124,10 @@ public class CompanyMainFragment extends Fragment { @@ -125,11 +124,10 @@ public class CompanyMainFragment extends Fragment {
125 web.setText(bean.getWebSite()); 124 web.setText(bean.getWebSite());
126 if (bean.getCompanyLogoPic() != null) 125 if (bean.getCompanyLogoPic() != null)
127 // Glide.with(getActivity()).load(bean.getCompanyLogoPic()).into(imgHotel); 126 // Glide.with(getActivity()).load(bean.getCompanyLogoPic()).into(imgHotel);
128 - if (bean.getIntroduction() != null)  
129 - tvContent.setText(bean.getIntroduction()); 127 + if (bean.getIntroduction() != null)
  128 + tvContent.setText(Html.fromHtml(bean.getIntroduction()));
130 if (bean.getFullAddress() != null) 129 if (bean.getFullAddress() != null)
131 tvDingwei.setText(bean.getFullAddress()); 130 tvDingwei.setText(bean.getFullAddress());
132 -  
133 } 131 }
134 132
135 }); 133 });
@@ -10,15 +10,21 @@ import android.view.LayoutInflater; @@ -10,15 +10,21 @@ import android.view.LayoutInflater;
10 import android.view.View; 10 import android.view.View;
11 import android.view.ViewGroup; 11 import android.view.ViewGroup;
12 import android.widget.AdapterView; 12 import android.widget.AdapterView;
13 -import android.widget.GridView;  
14 import android.widget.ImageView; 13 import android.widget.ImageView;
15 import android.widget.LinearLayout; 14 import android.widget.LinearLayout;
16 -import android.widget.ListView;  
17 import android.widget.TextView; 15 import android.widget.TextView;
  16 +import android.widget.Toast;
18 17
  18 +import com.hh.xuetubao.MyServer;
19 import com.hh.xuetubao.R; 19 import com.hh.xuetubao.R;
  20 +import com.hh.xuetubao.Utils.BaseObsever;
  21 +import com.hh.xuetubao.Utils.GridViewNesting;
  22 +import com.hh.xuetubao.Utils.HttpUtils;
20 import com.hh.xuetubao.Utils.ListViewNesting; 23 import com.hh.xuetubao.Utils.ListViewNesting;
  24 +import com.hh.xuetubao.Utils.NetConfig;
  25 +import com.hh.xuetubao.Utils.SharedPrefrenceUtils;
21 import com.hh.xuetubao.activity.pratice.PracticeActivity; 26 import com.hh.xuetubao.activity.pratice.PracticeActivity;
  27 +import com.hh.xuetubao.activity.pratice.PriacticeDistActivity;
22 import com.hh.xuetubao.activity.study.CourseDetailActivity_Video; 28 import com.hh.xuetubao.activity.study.CourseDetailActivity_Video;
23 import com.hh.xuetubao.activity.study.StudyActivity; 29 import com.hh.xuetubao.activity.study.StudyActivity;
24 import com.hh.xuetubao.activity.work.CompanyActivity; 30 import com.hh.xuetubao.activity.work.CompanyActivity;
@@ -26,6 +32,7 @@ import com.hh.xuetubao.activity.work.CompanyDetailActivity; @@ -26,6 +32,7 @@ import com.hh.xuetubao.activity.work.CompanyDetailActivity;
26 import com.hh.xuetubao.adapter.GridHomeHotAdapter; 32 import com.hh.xuetubao.adapter.GridHomeHotAdapter;
27 import com.hh.xuetubao.adapter.HomeCompanyAdapter; 33 import com.hh.xuetubao.adapter.HomeCompanyAdapter;
28 import com.hh.xuetubao.adapter.HomeQuestionAdapter; 34 import com.hh.xuetubao.adapter.HomeQuestionAdapter;
  35 +import com.hh.xuetubao.bean.AnswerBean;
29 import com.hh.xuetubao.bean.CompanyBean; 36 import com.hh.xuetubao.bean.CompanyBean;
30 import com.hh.xuetubao.bean.FreeCourseBean; 37 import com.hh.xuetubao.bean.FreeCourseBean;
31 import com.hh.xuetubao.bean.QuestionBankLstBean; 38 import com.hh.xuetubao.bean.QuestionBankLstBean;
@@ -46,6 +53,8 @@ import java.util.List; @@ -46,6 +53,8 @@ import java.util.List;
46 import butterknife.BindView; 53 import butterknife.BindView;
47 import butterknife.ButterKnife; 54 import butterknife.ButterKnife;
48 import butterknife.Unbinder; 55 import butterknife.Unbinder;
  56 +import io.reactivex.android.schedulers.AndroidSchedulers;
  57 +import io.reactivex.schedulers.Schedulers;
49 58
50 /** 59 /**
51 * 首页 60 * 首页
@@ -55,11 +64,10 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i @@ -55,11 +64,10 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
55 64
56 65
57 @BindView(R.id.grid_hotLesson) 66 @BindView(R.id.grid_hotLesson)
58 - GridView gridHotLesson; 67 + GridViewNesting gridHotLesson;
59 @BindView(R.id.list_question) 68 @BindView(R.id.list_question)
60 ListViewNesting listQuestion; 69 ListViewNesting listQuestion;
61 - @BindView(R.id.list_company)  
62 - ListView listCompany; 70 +
63 @BindView(R.id.img_top) 71 @BindView(R.id.img_top)
64 Banner banner; 72 Banner banner;
65 @BindView(R.id.tv_more_ke) 73 @BindView(R.id.tv_more_ke)
@@ -70,6 +78,8 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i @@ -70,6 +78,8 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
70 TextView tvMoreTi; 78 TextView tvMoreTi;
71 @BindView(R.id.lin_title) 79 @BindView(R.id.lin_title)
72 LinearLayout linTitle; 80 LinearLayout linTitle;
  81 + @BindView(R.id.list_company)
  82 + ListViewNesting listCompany;
73 private Unbinder unbinder; 83 private Unbinder unbinder;
74 private List<FreeCourseBean.bean> hotList = new ArrayList<>(); 84 private List<FreeCourseBean.bean> hotList = new ArrayList<>();
75 private List<QuestionBankLstBean.QuestionBankbean> questionList = new ArrayList<>(); 85 private List<QuestionBankLstBean.QuestionBankbean> questionList = new ArrayList<>();
@@ -79,6 +89,7 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i @@ -79,6 +89,7 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
79 private HomeCompanyAdapter companyAdapter; 89 private HomeCompanyAdapter companyAdapter;
80 private Intent intent; 90 private Intent intent;
81 private List<Drawable> imageList = new ArrayList<>(); 91 private List<Drawable> imageList = new ArrayList<>();
  92 + private String accountOid;
82 93
83 @Override 94 @Override
84 public int getLayoutId() { 95 public int getLayoutId() {
@@ -94,6 +105,8 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i @@ -94,6 +105,8 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
94 linTitle.setFocusableInTouchMode(true); 105 linTitle.setFocusableInTouchMode(true);
95 linTitle.requestFocus(); 106 linTitle.requestFocus();
96 107
  108 + accountOid = SharedPrefrenceUtils.getString(getActivity(), "AccountOid");
  109 +
97 hotAdapter = new GridHomeHotAdapter(hotList, getActivity()); 110 hotAdapter = new GridHomeHotAdapter(hotList, getActivity());
98 gridHotLesson.setAdapter(hotAdapter); 111 gridHotLesson.setAdapter(hotAdapter);
99 gridHotLesson.setOnItemClickListener(new AdapterView.OnItemClickListener() { 112 gridHotLesson.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -110,9 +123,11 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i @@ -110,9 +123,11 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
110 listQuestion.setOnItemClickListener(new AdapterView.OnItemClickListener() { 123 listQuestion.setOnItemClickListener(new AdapterView.OnItemClickListener() {
111 @Override 124 @Override
112 public void onItemClick(AdapterView<?> parent, View view, int position, long id) { 125 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
113 - intent = new Intent(getActivity(), PracticeActivity.class); 126 + /*intent = new Intent(getActivity(), PracticeActivity.class);
114 intent.putExtra("catalogOid", questionList.get(position).getCatalogOid()); 127 intent.putExtra("catalogOid", questionList.get(position).getCatalogOid());
115 - startActivity(intent); 128 + startActivity(intent);*/
  129 + doRequestTwo(questionList.get(position).getCatalogOid(),accountOid,questionList.get(position).getCatalogName());
  130 +
116 } 131 }
117 }); 132 });
118 133
@@ -143,13 +158,13 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i @@ -143,13 +158,13 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
143 @Override 158 @Override
144 public void OnBannerClick(int position) { 159 public void OnBannerClick(int position) {
145 switch (position) { 160 switch (position) {
146 - case 0: // 题库  
147 - Intent intent = new Intent(getActivity(),PracticeActivity.class);  
148 - intent.putExtra("tag","1"); 161 + case 0: // 题库
  162 + Intent intent = new Intent(getActivity(), PracticeActivity.class);
  163 + intent.putExtra("tag", "1");
149 startActivity(intent); 164 startActivity(intent);
150 break; 165 break;
151 case 1: 166 case 1:
152 - Intent intent1 = new Intent(getActivity(),StudyActivity.class); 167 + Intent intent1 = new Intent(getActivity(), StudyActivity.class);
153 startActivity(intent1); 168 startActivity(intent1);
154 break; 169 break;
155 } 170 }
@@ -168,6 +183,30 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i @@ -168,6 +183,30 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
168 183
169 } 184 }
170 185
  186 + private void doRequestTwo(final String catalogOid, String accountOid, final String title) {
  187 + MyServer mServers = HttpUtils.getInstance().getServer(NetConfig.shuaTiUrl);
  188 + mServers.GetRandomQuestions(catalogOid, Integer.valueOf(10), accountOid)
  189 + .subscribeOn(Schedulers.io())
  190 + .observeOn(AndroidSchedulers.mainThread())
  191 + .subscribe(new BaseObsever() {
  192 + @Override
  193 + public void onNext(Object value) {
  194 + super.onNext(value);
  195 + AnswerBean bean = (AnswerBean) value;
  196 + if (bean.isIsSuccess()) {
  197 + Intent intent = new Intent(getActivity(), PriacticeDistActivity.class);
  198 + intent.putExtra("CatalogOid", catalogOid);
  199 + SharedPrefrenceUtils.saveString(getActivity(), "PraticeTitle", title);
  200 + getActivity().startActivity(intent);
  201 + } else {
  202 + Toast.makeText(getActivity(), "当前账号无权限，请拨打电话xxxxxxxxxx", Toast.LENGTH_SHORT).show();
  203 + }
  204 + }
  205 +
  206 + });
  207 +
  208 + }
  209 +
171 @Override 210 @Override
172 public void initData() { 211 public void initData() {
173 LearnModel model = new LearnModel(); 212 LearnModel model = new LearnModel();
@@ -198,6 +237,12 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i @@ -198,6 +237,12 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
198 List<FreeCourseBean.bean> beanLessonLst = bean.getLessonLst(); 237 List<FreeCourseBean.bean> beanLessonLst = bean.getLessonLst();
199 hotList.addAll(beanLessonLst); 238 hotList.addAll(beanLessonLst);
200 hotAdapter.notifyDataSetChanged(); 239 hotAdapter.notifyDataSetChanged();
  240 +
  241 + if(beanLessonLst.size()>4){
  242 + tvMoreKe.setVisibility(View.VISIBLE);
  243 + }else{
  244 + tvMoreKe.setVisibility(View.GONE);
  245 + }
201 } 246 }
202 if (api == 2 && intent == 1) { 247 if (api == 2 && intent == 1) {
203 QuestionBankLstBean bean = (QuestionBankLstBean) o; 248 QuestionBankLstBean bean = (QuestionBankLstBean) o;
@@ -206,7 +251,7 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i @@ -206,7 +251,7 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
206 questionList.addAll(bankLst); 251 questionList.addAll(bankLst);
207 questionAdapter.notifyDataSetChanged(); 252 questionAdapter.notifyDataSetChanged();
208 253
209 - if (bankLst.size() > 4) { 254 + if (bankLst.size() > 3) {
210 tvMoreTi.setVisibility(View.VISIBLE); 255 tvMoreTi.setVisibility(View.VISIBLE);
211 } else { 256 } else {
212 tvMoreTi.setVisibility(View.GONE); 257 tvMoreTi.setVisibility(View.GONE);
@@ -218,7 +263,7 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i @@ -218,7 +263,7 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
218 companyList.addAll(companyListBeans); 263 companyList.addAll(companyListBeans);
219 companyAdapter.notifyDataSetChanged(); 264 companyAdapter.notifyDataSetChanged();
220 265
221 - if (companyListBeans.size() > 4) { 266 + if (companyListBeans.size() > 3) {
222 tvMoreQiye.setVisibility(View.VISIBLE); 267 tvMoreQiye.setVisibility(View.VISIBLE);
223 } else { 268 } else {
224 tvMoreQiye.setVisibility(View.GONE); 269 tvMoreQiye.setVisibility(View.GONE);
@@ -3,7 +3,6 @@ package com.hh.xuetubao.fragment; @@ -3,7 +3,6 @@ package com.hh.xuetubao.fragment;
3 import android.content.Intent; 3 import android.content.Intent;
4 import android.os.Bundle; 4 import android.os.Bundle;
5 import android.support.annotation.Nullable; 5 import android.support.annotation.Nullable;
6 -import android.support.v4.app.FragmentTransaction;  
7 import android.support.v7.widget.LinearLayoutManager; 6 import android.support.v7.widget.LinearLayoutManager;
8 import android.support.v7.widget.RecyclerView; 7 import android.support.v7.widget.RecyclerView;
9 import android.view.LayoutInflater; 8 import android.view.LayoutInflater;
@@ -12,7 +11,6 @@ import android.view.ViewGroup; @@ -12,7 +11,6 @@ import android.view.ViewGroup;
12 import android.widget.ImageView; 11 import android.widget.ImageView;
13 import android.widget.LinearLayout; 12 import android.widget.LinearLayout;
14 13
15 -import com.hh.xuetubao.MainActivity;  
16 import com.hh.xuetubao.R; 14 import com.hh.xuetubao.R;
17 import com.hh.xuetubao.Utils.RecyclerViewSpacesItemDecoration; 15 import com.hh.xuetubao.Utils.RecyclerViewSpacesItemDecoration;
18 import com.hh.xuetubao.activity.personal.DeliveryActivity; 16 import com.hh.xuetubao.activity.personal.DeliveryActivity;
@@ -35,7 +33,6 @@ import java.util.List; @@ -35,7 +33,6 @@ import java.util.List;
35 33
36 import butterknife.BindView; 34 import butterknife.BindView;
37 import butterknife.ButterKnife; 35 import butterknife.ButterKnife;
38 -import butterknife.OnClick;  
39 import butterknife.Unbinder; 36 import butterknife.Unbinder;
40 37
41 /** 38 /**
@@ -63,7 +60,7 @@ public class JobHuntFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMod @@ -63,7 +60,7 @@ public class JobHuntFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMod
63 private JobHuntWorkAdapter workAdapter; 60 private JobHuntWorkAdapter workAdapter;
64 private List<CompanyBean.CompanyListBean> companyList = new ArrayList<>(); 61 private List<CompanyBean.CompanyListBean> companyList = new ArrayList<>();
65 private List<HotJobBean.JobListBean> jobList = new ArrayList<>(); 62 private List<HotJobBean.JobListBean> jobList = new ArrayList<>();
66 -// private OfficeFragment officeFragment; 63 + // private OfficeFragment officeFragment;
67 // private FragmentTransaction transaction; 64 // private FragmentTransaction transaction;
68 private Intent intent; 65 private Intent intent;
69 66
@@ -128,6 +125,12 @@ public class JobHuntFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMod @@ -128,6 +125,12 @@ public class JobHuntFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMod
128 125
129 companyList.addAll(companyListBeans); 126 companyList.addAll(companyListBeans);
130 adapter.notifyDataSetChanged(); 127 adapter.notifyDataSetChanged();
  128 +
  129 + if (companyList.size() > 3) {
  130 + linMoreCompany.setVisibility(View.VISIBLE);
  131 + } else {
  132 + linMoreCompany.setVisibility(View.GONE);
  133 + }
131 } 134 }
132 if (api == 3 && intent == 2) { 135 if (api == 3 && intent == 2) {
133 HotJobBean bean = (HotJobBean) o; 136 HotJobBean bean = (HotJobBean) o;
@@ -174,7 +177,7 @@ public class JobHuntFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMod @@ -174,7 +177,7 @@ public class JobHuntFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMod
174 case R.id.img_zhiwei: 177 case R.id.img_zhiwei:
175 178
176 Intent intent1 = new Intent(getActivity(), JobHuntActivity.class); 179 Intent intent1 = new Intent(getActivity(), JobHuntActivity.class);
177 - intent1.putExtra("jobTag","1"); 180 + intent1.putExtra("jobTag", "1");
178 startActivity(intent1); 181 startActivity(intent1);
179 182
180 getActivity().finish(); 183 getActivity().finish();
@@ -66,6 +66,8 @@ public class MineFragment extends BaseMvpFragment<CommonPresenter, PersonalModel @@ -66,6 +66,8 @@ public class MineFragment extends BaseMvpFragment<CommonPresenter, PersonalModel
66 RelativeLayout rlEnd; 66 RelativeLayout rlEnd;
67 @BindView(R.id.lin_back) 67 @BindView(R.id.lin_back)
68 LinearLayout linBack; 68 LinearLayout linBack;
  69 + @BindView(R.id.rl_top)
  70 + RelativeLayout rlTop;
69 private Intent intent; 71 private Intent intent;
70 private FragmentTransaction transaction; 72 private FragmentTransaction transaction;
71 // private PraticeWrongFragment wrongFragment; 73 // private PraticeWrongFragment wrongFragment;
@@ -81,6 +83,13 @@ public class MineFragment extends BaseMvpFragment<CommonPresenter, PersonalModel @@ -81,6 +83,13 @@ public class MineFragment extends BaseMvpFragment<CommonPresenter, PersonalModel
81 public void initView(@Nullable Bundle savedInstanceState) { 83 public void initView(@Nullable Bundle savedInstanceState) {
82 accountOid = SharedPrefrenceUtils.getString(getActivity(), "AccountOid"); 84 accountOid = SharedPrefrenceUtils.getString(getActivity(), "AccountOid");
83 85
  86 + String tag = getTag();
  87 + if (tag.equals("1")) {
  88 + rlTop.setVisibility(View.GONE);
  89 + } else {
  90 + rlTop.setVisibility(View.VISIBLE);
  91 + }
  92 +
84 rlXinxi.setOnClickListener(this); 93 rlXinxi.setOnClickListener(this);
85 rlJianli.setOnClickListener(this); 94 rlJianli.setOnClickListener(this);
86 rlMessage.setOnClickListener(this); 95 rlMessage.setOnClickListener(this);
@@ -48,6 +48,24 @@ public class ExerciseModel implements ICommonModel { @@ -48,6 +48,24 @@ public class ExerciseModel implements ICommonModel {
48 if (api == 8 && intent == 1) 48 if (api == 8 && intent == 1)
49 GetRandomQuestions(commonView, api, intent, params); 49 GetRandomQuestions(commonView, api, intent, params);
50 50
  51 + if (api == 9 && intent == 1)
  52 + DeleteExamRecordInfo(commonView, api, intent, params);
  53 +
  54 + }
  55 +
  56 + private void DeleteExamRecordInfo(final ICommonView commonView, final int api, final int intent, String... params) {
  57 + if (api == 9 && intent == 1)
  58 + mServers.DeleteExamRecordInfo(params[0])
  59 + .subscribeOn(Schedulers.io())
  60 + .observeOn(AndroidSchedulers.mainThread())
  61 + .subscribe(new BaseObsever() {
  62 + @Override
  63 + public void onNext(Object value) {
  64 + super.onNext(value);
  65 + commonView.getData(value, api, intent);
  66 + }
  67 +
  68 + });
51 } 69 }
52 70
53 private void RemoveWrongQuestion(final ICommonView commonView, final int api, final int intent, String... params) { 71 private void RemoveWrongQuestion(final ICommonView commonView, final int api, final int intent, String... params) {
@@ -15,9 +15,8 @@ @@ -15,9 +15,8 @@
15 android:id="@+id/lin_back" 15 android:id="@+id/lin_back"
16 android:layout_width="wrap_content" 16 android:layout_width="wrap_content"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 - android:layout_alignParentBottom="true"  
19 android:layout_marginLeft="@dimen/dp_15" 18 android:layout_marginLeft="@dimen/dp_15"
20 - android:layout_marginBottom="@dimen/dp_18" 19 + android:layout_centerVertical="true"
21 android:orientation="horizontal"> 20 android:orientation="horizontal">
22 21
23 <ImageView 22 <ImageView
@@ -137,12 +137,6 @@ @@ -137,12 +137,6 @@
137 137
138 </RelativeLayout> 138 </RelativeLayout>
139 139
140 - <com.hh.xuetubao.Utils.WaveView  
141 - android:id="@+id/waveview"  
142 - android:layout_width="@dimen/dp_90"  
143 - android:layout_height="@dimen/dp_90"  
144 - android:layout_below="@id/lin_tab"  
145 - android:layout_centerHorizontal="true"  
146 - android:layout_marginTop="@dimen/dp_50" /> 140 +
147 141
148 </RelativeLayout> 142 </RelativeLayout>
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 android:layout_marginLeft="@dimen/dp_25" 64 android:layout_marginLeft="@dimen/dp_25"
65 android:layout_marginTop="@dimen/dp_15" 65 android:layout_marginTop="@dimen/dp_15"
66 android:layout_marginRight="@dimen/dp_25" 66 android:layout_marginRight="@dimen/dp_25"
67 - android:background="#333333" /> 67 + android:background="#D5D5D5" />
68 68
69 <ImageView 69 <ImageView
70 android:id="@+id/img_message" 70 android:id="@+id/img_message"
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 android:layout_width="@dimen/dp_30" 18 android:layout_width="@dimen/dp_30"
19 android:layout_height="wrap_content" 19 android:layout_height="wrap_content"
20 android:layout_marginLeft="@dimen/dp_15" 20 android:layout_marginLeft="@dimen/dp_15"
21 - android:layout_marginTop="@dimen/dp_35"> 21 + android:layout_marginTop="@dimen/dp_20">
22 22
23 <ImageView 23 <ImageView
24 android:layout_width="@dimen/dp_15" 24 android:layout_width="@dimen/dp_15"
@@ -28,26 +28,6 @@ @@ -28,26 +28,6 @@
28 28
29 29
30 <TextView 30 <TextView
31 - android:id="@+id/tv_more"  
32 - android:layout_width="wrap_content"  
33 - android:layout_height="@dimen/dp_20"  
34 - android:layout_alignTop="@id/img_back"  
35 - android:layout_alignParentRight="true"  
36 - android:layout_marginRight="@dimen/dp_15"  
37 - android:text="···"  
38 - android:textColor="#333333"  
39 - android:textSize="20sp" />  
40 -  
41 - <ImageView  
42 - android:id="@+id/img_more"  
43 - android:layout_width="@dimen/dp_20"  
44 - android:layout_height="@dimen/dp_20"  
45 - android:layout_alignTop="@id/img_back"  
46 - android:layout_marginRight="@dimen/dp_15"  
47 - android:layout_toLeftOf="@id/tv_more"  
48 - android:src="@mipmap/link" />  
49 -  
50 - <TextView  
51 android:id="@+id/tv_name" 31 android:id="@+id/tv_name"
52 android:layout_width="@dimen/dp_207" 32 android:layout_width="@dimen/dp_207"
53 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
@@ -100,6 +80,7 @@ @@ -100,6 +80,7 @@
100 android:text="招聘职位(" 80 android:text="招聘职位("
101 android:textColor="#b0b0b0" 81 android:textColor="#b0b0b0"
102 android:textSize="15sp" /> 82 android:textSize="15sp" />
  83 +
103 <TextView 84 <TextView
104 android:id="@+id/job_count" 85 android:id="@+id/job_count"
105 android:layout_width="wrap_content" 86 android:layout_width="wrap_content"
@@ -110,6 +91,7 @@ @@ -110,6 +91,7 @@
110 android:text="36" 91 android:text="36"
111 android:textColor="#b0b0b0" 92 android:textColor="#b0b0b0"
112 android:textSize="15sp" /> 93 android:textSize="15sp" />
  94 +
113 <TextView 95 <TextView
114 android:id="@+id/aaa" 96 android:id="@+id/aaa"
115 android:layout_width="wrap_content" 97 android:layout_width="wrap_content"
@@ -125,24 +107,22 @@ @@ -125,24 +107,22 @@
125 android:id="@+id/xhx1" 107 android:id="@+id/xhx1"
126 android:layout_width="match_parent" 108 android:layout_width="match_parent"
127 android:layout_height="@dimen/dp_3" 109 android:layout_height="@dimen/dp_3"
128 - android:background="@color/color_ff5400" 110 + android:layout_below="@+id/tv_page"
129 android:layout_alignLeft="@+id/tv_page" 111 android:layout_alignLeft="@+id/tv_page"
130 android:layout_alignRight="@+id/tv_page" 112 android:layout_alignRight="@+id/tv_page"
131 - android:layout_below="@+id/tv_page"  
132 android:layout_marginTop="@dimen/dp_7" 113 android:layout_marginTop="@dimen/dp_7"
133 - /> 114 + android:background="@color/color_ff5400" />
134 115
135 <View 116 <View
136 android:id="@+id/xhx2" 117 android:id="@+id/xhx2"
137 android:layout_width="match_parent" 118 android:layout_width="match_parent"
138 android:layout_height="@dimen/dp_3" 119 android:layout_height="@dimen/dp_3"
139 - android:background="@color/color_ff5400" 120 + android:layout_below="@+id/tv_page"
140 android:layout_alignLeft="@+id/tv_require" 121 android:layout_alignLeft="@+id/tv_require"
141 android:layout_alignRight="@+id/aaa" 122 android:layout_alignRight="@+id/aaa"
142 - android:layout_below="@+id/tv_page"  
143 android:layout_marginTop="@dimen/dp_7" 123 android:layout_marginTop="@dimen/dp_7"
144 - android:visibility="gone"  
145 - /> 124 + android:background="@color/color_ff5400"
  125 + android:visibility="gone" />
146 126
147 <View 127 <View
148 android:id="@+id/line" 128 android:id="@+id/line"
@@ -150,10 +130,9 @@ @@ -150,10 +130,9 @@
150 android:layout_height="@dimen/dp_1" 130 android:layout_height="@dimen/dp_1"
151 android:layout_below="@id/tv_page" 131 android:layout_below="@id/tv_page"
152 android:layout_marginLeft="@dimen/dp_20" 132 android:layout_marginLeft="@dimen/dp_20"
153 - android:layout_marginRight="@dimen/dp_20"  
154 - android:background="#EDEDED"  
155 android:layout_marginTop="@dimen/dp_10" 133 android:layout_marginTop="@dimen/dp_10"
156 - /> 134 + android:layout_marginRight="@dimen/dp_20"
  135 + android:background="#EDEDED" />
157 136
158 <FrameLayout 137 <FrameLayout
159 android:id="@+id/frame" 138 android:id="@+id/frame"
@@ -15,9 +15,8 @@ @@ -15,9 +15,8 @@
15 android:id="@+id/lin_back" 15 android:id="@+id/lin_back"
16 android:layout_width="wrap_content" 16 android:layout_width="wrap_content"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 - android:layout_alignParentBottom="true"  
19 android:layout_marginLeft="@dimen/dp_15" 18 android:layout_marginLeft="@dimen/dp_15"
20 - android:layout_marginBottom="@dimen/dp_18" 19 + android:layout_centerVertical="true"
21 android:orientation="horizontal"> 20 android:orientation="horizontal">
22 21
23 <ImageView 22 <ImageView
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 android:layout_height="@dimen/dp_1" 48 android:layout_height="@dimen/dp_1"
49 android:layout_marginLeft="@dimen/dp_29" 49 android:layout_marginLeft="@dimen/dp_29"
50 android:layout_marginRight="@dimen/dp_29" 50 android:layout_marginRight="@dimen/dp_29"
51 - android:background="@color/color_333333" /> 51 + android:background="@color/color_d5d5d5" />
52 52
53 <!--<LinearLayout--> 53 <!--<LinearLayout-->
54 <!--android:layout_width="match_parent"--> 54 <!--android:layout_width="match_parent"-->
@@ -15,9 +15,8 @@ @@ -15,9 +15,8 @@
15 android:id="@+id/lin_back" 15 android:id="@+id/lin_back"
16 android:layout_width="wrap_content" 16 android:layout_width="wrap_content"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 - android:layout_alignParentBottom="true" 18 + android:layout_centerVertical="true"
19 android:layout_marginLeft="@dimen/dp_15" 19 android:layout_marginLeft="@dimen/dp_15"
20 - android:layout_marginBottom="@dimen/dp_18"  
21 android:orientation="horizontal"> 20 android:orientation="horizontal">
22 21
23 <ImageView 22 <ImageView
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 android:layout_marginLeft="@dimen/dp_29" 54 android:layout_marginLeft="@dimen/dp_29"
55 android:layout_marginTop="@dimen/dp_15" 55 android:layout_marginTop="@dimen/dp_15"
56 android:layout_marginRight="@dimen/dp_29" 56 android:layout_marginRight="@dimen/dp_29"
57 - android:background="#333333" /> 57 + android:background="#D5D5D5" />
58 58
59 <ImageView 59 <ImageView
60 android:id="@+id/img_message" 60 android:id="@+id/img_message"
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 android:layout_marginLeft="@dimen/dp_25" 56 android:layout_marginLeft="@dimen/dp_25"
57 android:layout_marginTop="@dimen/dp_15" 57 android:layout_marginTop="@dimen/dp_15"
58 android:layout_marginRight="@dimen/dp_25" 58 android:layout_marginRight="@dimen/dp_25"
59 - android:background="#333333" /> 59 + android:background="#D5D5D5" />
60 60
61 <ImageView 61 <ImageView
62 android:id="@+id/img_message" 62 android:id="@+id/img_message"
@@ -15,9 +15,8 @@ @@ -15,9 +15,8 @@
15 android:id="@+id/lin_back" 15 android:id="@+id/lin_back"
16 android:layout_width="wrap_content" 16 android:layout_width="wrap_content"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 - android:layout_alignParentBottom="true" 18 + android:layout_centerVertical="true"
19 android:layout_marginLeft="@dimen/dp_15" 19 android:layout_marginLeft="@dimen/dp_15"
20 - android:layout_marginBottom="@dimen/dp_18"  
21 android:orientation="horizontal"> 20 android:orientation="horizontal">
22 21
23 <ImageView 22 <ImageView
@@ -17,9 +17,8 @@ @@ -17,9 +17,8 @@
17 android:id="@+id/lin_back" 17 android:id="@+id/lin_back"
18 android:layout_width="wrap_content" 18 android:layout_width="wrap_content"
19 android:layout_height="wrap_content" 19 android:layout_height="wrap_content"
20 - android:layout_alignParentBottom="true" 20 + android:layout_centerVertical="true"
21 android:layout_marginLeft="@dimen/dp_15" 21 android:layout_marginLeft="@dimen/dp_15"
22 - android:layout_marginBottom="@dimen/dp_18"  
23 android:orientation="horizontal"> 22 android:orientation="horizontal">
24 23
25 <ImageView 24 <ImageView
@@ -15,8 +15,7 @@ @@ -15,8 +15,7 @@
15 <LinearLayout 15 <LinearLayout
16 android:id="@+id/lin_back" 16 android:id="@+id/lin_back"
17 android:layout_width="wrap_content" 17 android:layout_width="wrap_content"
18 - android:layout_height="match_parent"  
19 - android:layout_alignParentBottom="true" 18 + android:layout_height="wrap_content"
20 android:layout_marginLeft="@dimen/dp_15" 19 android:layout_marginLeft="@dimen/dp_15"
21 android:gravity="center_vertical" 20 android:gravity="center_vertical"
22 android:orientation="horizontal"> 21 android:orientation="horizontal">
@@ -15,9 +15,8 @@ @@ -15,9 +15,8 @@
15 android:id="@+id/lin_back" 15 android:id="@+id/lin_back"
16 android:layout_width="wrap_content" 16 android:layout_width="wrap_content"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 - android:layout_alignParentBottom="true" 18 + android:layout_centerVertical="true"
19 android:layout_marginLeft="@dimen/dp_15" 19 android:layout_marginLeft="@dimen/dp_15"
20 - android:layout_marginBottom="@dimen/dp_18"  
21 android:orientation="horizontal"> 20 android:orientation="horizontal">
22 21
23 <ImageView 22 <ImageView
@@ -15,9 +15,8 @@ @@ -15,9 +15,8 @@
15 android:id="@+id/lin_back" 15 android:id="@+id/lin_back"
16 android:layout_width="wrap_content" 16 android:layout_width="wrap_content"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 - android:layout_alignParentBottom="true" 18 + android:layout_centerVertical="true"
19 android:layout_marginLeft="@dimen/dp_15" 19 android:layout_marginLeft="@dimen/dp_15"
20 - android:layout_marginBottom="@dimen/dp_18"  
21 android:orientation="horizontal"> 20 android:orientation="horizontal">
22 21
23 <ImageView 22 <ImageView
@@ -15,9 +15,8 @@ @@ -15,9 +15,8 @@
15 android:id="@+id/lin_back" 15 android:id="@+id/lin_back"
16 android:layout_width="wrap_content" 16 android:layout_width="wrap_content"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 - android:layout_alignParentBottom="true" 18 + android:layout_centerVertical="true"
19 android:layout_marginLeft="@dimen/dp_15" 19 android:layout_marginLeft="@dimen/dp_15"
20 - android:layout_marginBottom="@dimen/dp_13"  
21 android:orientation="horizontal"> 20 android:orientation="horizontal">
22 21
23 <ImageView 22 <ImageView
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 android:layout_width="match_parent" 15 android:layout_width="match_parent"
16 android:layout_height="match_parent"> 16 android:layout_height="match_parent">
17 17
18 - <LinearLayout 18 + <RelativeLayout
19 android:id="@+id/lin_tab" 19 android:id="@+id/lin_tab"
20 android:layout_width="match_parent" 20 android:layout_width="match_parent"
21 android:layout_height="@dimen/dp_68" 21 android:layout_height="@dimen/dp_68"
@@ -23,21 +23,34 @@ @@ -23,21 +23,34 @@
23 android:orientation="horizontal"> 23 android:orientation="horizontal">
24 24
25 <ImageView 25 <ImageView
  26 + android:id="@+id/img1"
26 android:layout_width="@dimen/dp_15" 27 android:layout_width="@dimen/dp_15"
27 android:layout_height="@dimen/dp_30" 28 android:layout_height="@dimen/dp_30"
28 - android:layout_gravity="center_vertical" 29 + android:layout_centerVertical="true"
29 android:layout_marginLeft="@dimen/dp_15" 30 android:layout_marginLeft="@dimen/dp_15"
30 android:src="@mipmap/back" /> 31 android:src="@mipmap/back" />
31 32
32 <TextView 33 <TextView
  34 + android:id="@+id/tv_delete"
33 android:layout_width="wrap_content" 35 android:layout_width="wrap_content"
34 android:layout_height="wrap_content" 36 android:layout_height="wrap_content"
35 - android:layout_gravity="center_vertical" 37 + android:layout_centerVertical="true"
36 android:layout_marginLeft="@dimen/dp_10" 38 android:layout_marginLeft="@dimen/dp_10"
  39 + android:layout_toRightOf="@id/img1"
37 android:text="考试成绩" 40 android:text="考试成绩"
38 android:textColor="#232323" 41 android:textColor="#232323"
39 android:textSize="17sp" /> 42 android:textSize="17sp" />
40 - </LinearLayout> 43 +
  44 + <TextView
  45 + android:layout_width="wrap_content"
  46 + android:layout_height="wrap_content"
  47 + android:layout_centerVertical="true"
  48 + android:text="删除"
  49 + android:layout_alignParentRight="true"
  50 + android:layout_marginRight="@dimen/dp_20"
  51 + android:textColor="#666666"
  52 + android:textSize="12sp" />
  53 + </RelativeLayout>
41 54
42 <com.hh.xuetubao.Utils.WaveView 55 <com.hh.xuetubao.Utils.WaveView
43 android:id="@+id/waveview" 56 android:id="@+id/waveview"
@@ -14,9 +14,8 @@ @@ -14,9 +14,8 @@
14 android:id="@+id/lin_back" 14 android:id="@+id/lin_back"
15 android:layout_width="wrap_content" 15 android:layout_width="wrap_content"
16 android:layout_height="wrap_content" 16 android:layout_height="wrap_content"
17 - android:layout_alignParentBottom="true"  
18 android:layout_marginLeft="@dimen/dp_15" 17 android:layout_marginLeft="@dimen/dp_15"
19 - android:layout_marginBottom="@dimen/dp_18" 18 + android:layout_centerVertical="true"
20 android:orientation="horizontal"> 19 android:orientation="horizontal">
21 20
22 <ImageView 21 <ImageView
@@ -16,9 +16,8 @@ @@ -16,9 +16,8 @@
16 android:id="@+id/lin_back" 16 android:id="@+id/lin_back"
17 android:layout_width="wrap_content" 17 android:layout_width="wrap_content"
18 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
19 - android:layout_alignParentBottom="true" 19 + android:layout_centerVertical="true"
20 android:layout_marginLeft="@dimen/dp_15" 20 android:layout_marginLeft="@dimen/dp_15"
21 - android:layout_marginBottom="@dimen/dp_18"  
22 android:orientation="horizontal"> 21 android:orientation="horizontal">
23 22
24 <ImageView 23 <ImageView
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 android:id="@+id/tv_xinxi" 9 android:id="@+id/tv_xinxi"
10 android:layout_width="wrap_content" 10 android:layout_width="wrap_content"
11 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
12 - android:layout_marginLeft="@dimen/dp_20"  
13 android:layout_marginTop="@dimen/dp_20" 12 android:layout_marginTop="@dimen/dp_20"
14 android:text="基本信息" 13 android:text="基本信息"
15 android:textColor="#000000" 14 android:textColor="#000000"
@@ -20,7 +19,6 @@ @@ -20,7 +19,6 @@
20 android:layout_width="wrap_content" 19 android:layout_width="wrap_content"
21 android:layout_height="wrap_content" 20 android:layout_height="wrap_content"
22 android:layout_below="@+id/tv_xinxi" 21 android:layout_below="@+id/tv_xinxi"
23 - android:layout_marginLeft="@dimen/dp_20"  
24 android:layout_marginTop="@dimen/dp_20" 22 android:layout_marginTop="@dimen/dp_20"
25 android:text="公司性质:" 23 android:text="公司性质:"
26 android:textColor="#4C4C4C" 24 android:textColor="#4C4C4C"
@@ -42,7 +40,6 @@ @@ -42,7 +40,6 @@
42 android:layout_width="wrap_content" 40 android:layout_width="wrap_content"
43 android:layout_height="wrap_content" 41 android:layout_height="wrap_content"
44 android:layout_below="@+id/tv_xingzhi" 42 android:layout_below="@+id/tv_xingzhi"
45 - android:layout_marginLeft="@dimen/dp_20"  
46 android:layout_marginTop="@dimen/dp_5" 43 android:layout_marginTop="@dimen/dp_5"
47 android:text="公司规模:" 44 android:text="公司规模:"
48 android:textColor="#4C4C4C" 45 android:textColor="#4C4C4C"
@@ -65,7 +62,6 @@ @@ -65,7 +62,6 @@
65 android:layout_width="wrap_content" 62 android:layout_width="wrap_content"
66 android:layout_height="wrap_content" 63 android:layout_height="wrap_content"
67 android:layout_below="@+id/tv_guimo" 64 android:layout_below="@+id/tv_guimo"
68 - android:layout_marginLeft="@dimen/dp_20"  
69 android:layout_marginTop="@dimen/dp_5" 65 android:layout_marginTop="@dimen/dp_5"
70 android:text="公司地址:" 66 android:text="公司地址:"
71 android:textColor="#4C4C4C" 67 android:textColor="#4C4C4C"
@@ -88,7 +84,6 @@ @@ -88,7 +84,6 @@
88 android:layout_width="wrap_content" 84 android:layout_width="wrap_content"
89 android:layout_height="wrap_content" 85 android:layout_height="wrap_content"
90 android:layout_below="@+id/tv_dizhi" 86 android:layout_below="@+id/tv_dizhi"
91 - android:layout_marginLeft="@dimen/dp_20"  
92 android:layout_marginTop="@dimen/dp_5" 87 android:layout_marginTop="@dimen/dp_5"
93 android:text="公司网址:" 88 android:text="公司网址:"
94 android:textColor="#4C4C4C" 89 android:textColor="#4C4C4C"
@@ -120,7 +115,6 @@ @@ -120,7 +115,6 @@
120 android:layout_width="wrap_content" 115 android:layout_width="wrap_content"
121 android:layout_height="wrap_content" 116 android:layout_height="wrap_content"
122 android:layout_below="@id/line" 117 android:layout_below="@id/line"
123 - android:layout_marginLeft="@dimen/dp_20"  
124 android:layout_marginTop="@dimen/dp_20" 118 android:layout_marginTop="@dimen/dp_20"
125 android:text="公司介绍" 119 android:text="公司介绍"
126 android:textColor="#000000" 120 android:textColor="#000000"
@@ -141,7 +135,6 @@ @@ -141,7 +135,6 @@
141 android:id="@+id/tv_content" 135 android:id="@+id/tv_content"
142 android:layout_width="match_parent" 136 android:layout_width="match_parent"
143 android:layout_height="wrap_content" 137 android:layout_height="wrap_content"
144 - android:layout_marginLeft="@dimen/dp_20"  
145 android:layout_marginTop="@dimen/dp_20" 138 android:layout_marginTop="@dimen/dp_20"
146 android:layout_marginRight="@dimen/dp_20" 139 android:layout_marginRight="@dimen/dp_20"
147 android:layout_below="@id/tv_jieshao" 140 android:layout_below="@id/tv_jieshao"
@@ -162,7 +155,6 @@ @@ -162,7 +155,6 @@
162 android:layout_width="wrap_content" 155 android:layout_width="wrap_content"
163 android:layout_height="wrap_content" 156 android:layout_height="wrap_content"
164 android:layout_below="@id/line2" 157 android:layout_below="@id/line2"
165 - android:layout_marginLeft="@dimen/dp_20"  
166 android:layout_marginTop="@dimen/dp_20" 158 android:layout_marginTop="@dimen/dp_20"
167 android:text="公司地址" 159 android:text="公司地址"
168 android:textColor="#000000" 160 android:textColor="#000000"
@@ -173,7 +165,6 @@ @@ -173,7 +165,6 @@
173 android:layout_width="wrap_content" 165 android:layout_width="wrap_content"
174 android:layout_height="wrap_content" 166 android:layout_height="wrap_content"
175 android:layout_below="@id/tv_map" 167 android:layout_below="@id/tv_map"
176 - android:layout_marginLeft="@dimen/dp_20"  
177 android:layout_marginTop="@dimen/dp_20" 168 android:layout_marginTop="@dimen/dp_20"
178 android:text="北京市昌平区北七家镇创意空间211" 169 android:text="北京市昌平区北七家镇创意空间211"
179 android:textColor="#4C4C4C" 170 android:textColor="#4C4C4C"
@@ -192,7 +183,6 @@ @@ -192,7 +183,6 @@
192 <com.amap.api.maps.MapView 183 <com.amap.api.maps.MapView
193 android:id="@+id/map" 184 android:id="@+id/map"
194 android:layout_below="@id/tv_dingwei" 185 android:layout_below="@id/tv_dingwei"
195 - android:layout_marginLeft="@dimen/dp_20"  
196 android:layout_marginTop="@dimen/dp_15" 186 android:layout_marginTop="@dimen/dp_15"
197 android:layout_marginRight="@dimen/dp_20" 187 android:layout_marginRight="@dimen/dp_20"
198 android:layout_marginBottom="@dimen/dp_50" 188 android:layout_marginBottom="@dimen/dp_50"
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 android:layout_width="match_parent" 22 android:layout_width="match_parent"
23 android:layout_height="@dimen/dp_200" 23 android:layout_height="@dimen/dp_200"
24 android:layout_marginLeft="@dimen/dp_20" 24 android:layout_marginLeft="@dimen/dp_20"
25 - android:layout_marginTop="@dimen/dp_40" 25 + android:layout_marginTop="@dimen/dp_20"
26 android:layout_marginRight="@dimen/dp_20" 26 android:layout_marginRight="@dimen/dp_20"
27 android:src="@drawable/course_logo" /> 27 android:src="@drawable/course_logo" />
28 28
@@ -15,9 +15,8 @@ @@ -15,9 +15,8 @@
15 <LinearLayout 15 <LinearLayout
16 android:layout_width="wrap_content" 16 android:layout_width="wrap_content"
17 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
18 - android:layout_alignParentBottom="true" 18 + android:layout_centerVertical="true"
19 android:layout_marginLeft="@dimen/dp_15" 19 android:layout_marginLeft="@dimen/dp_15"
20 - android:layout_marginBottom="@dimen/dp_18"  
21 android:orientation="horizontal"> 20 android:orientation="horizontal">
22 21
23 <ImageView 22 <ImageView
@@ -52,10 +52,10 @@ @@ -52,10 +52,10 @@
52 android:background="#333333" /> 52 android:background="#333333" />
53 </LinearLayout> 53 </LinearLayout>
54 54
55 - <GridView 55 + <com.hh.xuetubao.Utils.GridViewNesting
56 android:id="@+id/grid_hotLesson" 56 android:id="@+id/grid_hotLesson"
57 android:layout_width="match_parent" 57 android:layout_width="match_parent"
58 - android:layout_height="@dimen/dp_400" 58 + android:layout_height="wrap_content"
59 android:layout_below="@+id/lin_title" 59 android:layout_below="@+id/lin_title"
60 android:layout_marginLeft="@dimen/dp_20" 60 android:layout_marginLeft="@dimen/dp_20"
61 android:layout_marginRight="@dimen/dp_20" 61 android:layout_marginRight="@dimen/dp_20"
@@ -73,6 +73,8 @@ @@ -73,6 +73,8 @@
73 android:background="@drawable/stroke_gray" 73 android:background="@drawable/stroke_gray"
74 android:gravity="center" 74 android:gravity="center"
75 android:text="查看更多" 75 android:text="查看更多"
  76 + android:layout_marginTop="@dimen/dp_30"
  77 +
76 android:textColor="#AAAAAA" 78 android:textColor="#AAAAAA"
77 android:textSize="12sp" 79 android:textSize="12sp"
78 /> 80 />
@@ -83,7 +85,7 @@ @@ -83,7 +85,7 @@
83 android:layout_height="@dimen/dp_10" 85 android:layout_height="@dimen/dp_10"
84 android:layout_below="@id/tv_more_ke" 86 android:layout_below="@id/tv_more_ke"
85 android:layout_marginTop="@dimen/dp_30" 87 android:layout_marginTop="@dimen/dp_30"
86 - android:background="#f1f1f1" /> 88 + android:background="#F5F5F5" />
87 89
88 <LinearLayout 90 <LinearLayout
89 android:id="@+id/lin_title1" 91 android:id="@+id/lin_title1"
@@ -132,7 +134,7 @@ @@ -132,7 +134,7 @@
132 android:layout_height="@dimen/dp_30" 134 android:layout_height="@dimen/dp_30"
133 android:layout_below="@+id/list_question" 135 android:layout_below="@+id/list_question"
134 android:layout_marginLeft="@dimen/dp_20" 136 android:layout_marginLeft="@dimen/dp_20"
135 - android:layout_marginTop="@dimen/dp_30" 137 + android:layout_marginTop="@dimen/dp_25"
136 android:layout_marginRight="@dimen/dp_20" 138 android:layout_marginRight="@dimen/dp_20"
137 android:background="@drawable/stroke_gray" 139 android:background="@drawable/stroke_gray"
138 android:gravity="center" 140 android:gravity="center"
@@ -146,7 +148,7 @@ @@ -146,7 +148,7 @@
146 android:layout_height="@dimen/dp_10" 148 android:layout_height="@dimen/dp_10"
147 android:layout_below="@id/tv_more_ti" 149 android:layout_below="@id/tv_more_ti"
148 android:layout_marginTop="@dimen/dp_30" 150 android:layout_marginTop="@dimen/dp_30"
149 - android:background="#f1f1f1" /> 151 + android:background="#F5F5F5" />
150 152
151 <LinearLayout 153 <LinearLayout
152 android:id="@+id/lin_title2" 154 android:id="@+id/lin_title2"
@@ -179,10 +181,10 @@ @@ -179,10 +181,10 @@
179 android:background="#333333" /> 181 android:background="#333333" />
180 </LinearLayout> 182 </LinearLayout>
181 183
182 - <ListView 184 + <com.hh.xuetubao.Utils.ListViewNesting
183 android:id="@+id/list_company" 185 android:id="@+id/list_company"
184 android:layout_width="match_parent" 186 android:layout_width="match_parent"
185 - android:layout_height="@dimen/dp_500" 187 + android:layout_height="wrap_content"
186 android:layout_below="@+id/lin_title2" 188 android:layout_below="@+id/lin_title2"
187 android:layout_marginTop="@dimen/dp_10" 189 android:layout_marginTop="@dimen/dp_10"
188 android:scrollbars="none" 190 android:scrollbars="none"
@@ -196,7 +198,7 @@ @@ -196,7 +198,7 @@
196 android:layout_height="30dp" 198 android:layout_height="30dp"
197 android:layout_below="@+id/list_company" 199 android:layout_below="@+id/list_company"
198 android:layout_marginLeft="@dimen/dp_20" 200 android:layout_marginLeft="@dimen/dp_20"
199 - android:layout_marginTop="@dimen/dp_30" 201 + android:layout_marginTop="@dimen/dp_10"
200 android:layout_marginRight="@dimen/dp_20" 202 android:layout_marginRight="@dimen/dp_20"
201 android:layout_marginBottom="@dimen/dp_30" 203 android:layout_marginBottom="@dimen/dp_30"
202 android:background="@drawable/stroke_gray" 204 android:background="@drawable/stroke_gray"
@@ -14,9 +14,8 @@ @@ -14,9 +14,8 @@
14 android:id="@+id/lin_back" 14 android:id="@+id/lin_back"
15 android:layout_width="wrap_content" 15 android:layout_width="wrap_content"
16 android:layout_height="wrap_content" 16 android:layout_height="wrap_content"
17 - android:layout_alignParentBottom="true" 17 + android:layout_centerVertical="true"
18 android:layout_marginLeft="@dimen/dp_15" 18 android:layout_marginLeft="@dimen/dp_15"
19 - android:layout_marginBottom="@dimen/dp_18"  
20 android:orientation="horizontal"> 19 android:orientation="horizontal">
21 20
22 <ImageView 21 <ImageView
@@ -17,9 +17,8 @@ @@ -17,9 +17,8 @@
17 android:id="@+id/lin_back" 17 android:id="@+id/lin_back"
18 android:layout_width="wrap_content" 18 android:layout_width="wrap_content"
19 android:layout_height="wrap_content" 19 android:layout_height="wrap_content"
20 - android:layout_alignParentBottom="true" 20 + android:layout_centerVertical="true"
21 android:layout_marginLeft="@dimen/dp_15" 21 android:layout_marginLeft="@dimen/dp_15"
22 - android:layout_marginBottom="@dimen/dp_18"  
23 android:orientation="horizontal"> 22 android:orientation="horizontal">
24 23
25 <ImageView 24 <ImageView
@@ -16,9 +16,8 @@ @@ -16,9 +16,8 @@
16 android:id="@+id/lin_back" 16 android:id="@+id/lin_back"
17 android:layout_width="wrap_content" 17 android:layout_width="wrap_content"
18 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
19 - android:layout_alignParentBottom="true" 19 + android:layout_centerVertical="true"
20 android:layout_marginLeft="@dimen/dp_15" 20 android:layout_marginLeft="@dimen/dp_15"
21 - android:layout_marginBottom="@dimen/dp_18"  
22 android:orientation="horizontal"> 21 android:orientation="horizontal">
23 22
24 <ImageView 23 <ImageView
@@ -8,25 +8,23 @@ @@ -8,25 +8,23 @@
8 8
9 <android.support.v7.widget.RecyclerView 9 <android.support.v7.widget.RecyclerView
10 android:id="@+id/rv_tab" 10 android:id="@+id/rv_tab"
11 - android:layout_marginTop="@dimen/dp_10"  
12 android:layout_width="match_parent" 11 android:layout_width="match_parent"
13 android:layout_height="wrap_content" 12 android:layout_height="wrap_content"
14 android:layout_alignParentTop="true" 13 android:layout_alignParentTop="true"
15 - android:layout_marginLeft="@dimen/dp_20"  
16 - android:layout_marginRight="@dimen/dp_20" /> 14 + android:layout_marginTop="@dimen/dp_10" />
17 15
18 16
19 <View 17 <View
20 - android:layout_marginTop="@dimen/dp_10"  
21 android:id="@+id/line" 18 android:id="@+id/line"
22 android:layout_width="match_parent" 19 android:layout_width="match_parent"
23 android:layout_height="@dimen/dp_1" 20 android:layout_height="@dimen/dp_1"
24 android:layout_below="@+id/rv_tab" 21 android:layout_below="@+id/rv_tab"
  22 + android:layout_marginTop="@dimen/dp_10"
25 android:background="#EDEDED" /> 23 android:background="#EDEDED" />
26 24
27 - <android.support.v7.widget.RecyclerView  
28 - android:id="@+id/rec_job"  
29 - android:layout_below="@id/line"  
30 - android:layout_width="match_parent"  
31 - android:layout_height="wrap_content"/> 25 + <android.support.v7.widget.RecyclerView
  26 + android:id="@+id/rec_job"
  27 + android:layout_width="match_parent"
  28 + android:layout_height="wrap_content"
  29 + android:layout_below="@id/line" />
32 </RelativeLayout> 30 </RelativeLayout>
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
33 android:layout_marginLeft="@dimen/dp_20" 33 android:layout_marginLeft="@dimen/dp_20"
34 android:layout_marginTop="@dimen/dp_20" 34 android:layout_marginTop="@dimen/dp_20"
35 android:layout_marginRight="@dimen/dp_20" 35 android:layout_marginRight="@dimen/dp_20"
  36 + android:divider="@null"
36 android:nestedScrollingEnabled="false" 37 android:nestedScrollingEnabled="false"
37 android:scrollbars="none" /> 38 android:scrollbars="none" />
38 39
@@ -192,19 +192,11 @@ @@ -192,19 +192,11 @@
192 android:src="@mipmap/into" /> 192 android:src="@mipmap/into" />
193 193
194 <View 194 <View
195 - android:id="@+id/line4"  
196 - android:layout_width="match_parent"  
197 - android:layout_height="@dimen/dp_0_5"  
198 - android:layout_below="@+id/job"  
199 - android:layout_marginTop="@dimen/dp_20"  
200 - android:background="#D7D7D7"  
201 - android:visibility="gone" />  
202 -  
203 - <View 195 + android:id="@+id/line"
204 android:layout_width="match_parent" 196 android:layout_width="match_parent"
205 android:layout_height="@dimen/dp_1" 197 android:layout_height="@dimen/dp_1"
206 android:background="#d7d7d7" 198 android:background="#d7d7d7"
207 - android:layout_below="@+id/line4" 199 + android:layout_below="@+id/tv1"
208 android:layout_marginTop="@dimen/dp_15" 200 android:layout_marginTop="@dimen/dp_15"
209 /> 201 />
210 202
@@ -24,23 +24,14 @@ @@ -24,23 +24,14 @@
24 android:textColor="#363636" 24 android:textColor="#363636"
25 android:textSize="15sp" /> 25 android:textSize="15sp" />
26 26
27 - <TextView  
28 - android:id="@+id/time"  
29 - android:layout_width="wrap_content"  
30 - android:layout_height="wrap_content"  
31 - android:layout_below="@id/title"  
32 - android:layout_marginLeft="@dimen/dp_20"  
33 - android:layout_marginTop="@dimen/dp_10"  
34 - android:text="更新时间：2019-10-20 16:00"  
35 - android:textColor="#AAAAAA"  
36 - android:textSize="12sp" />  
37 27
38 <View 28 <View
  29 + android:id="@+id/line"
39 android:layout_width="match_parent" 30 android:layout_width="match_parent"
40 android:layout_height="@dimen/dp_1" 31 android:layout_height="@dimen/dp_1"
41 android:background="#e4e8f0" 32 android:background="#e4e8f0"
42 android:layout_marginTop="@dimen/dp_14" 33 android:layout_marginTop="@dimen/dp_14"
43 - android:layout_below="@+id/time" 34 + android:layout_below="@+id/title"
44 /> 35 />
45 36
46 </RelativeLayout> 37 </RelativeLayout>
@@ -82,9 +82,9 @@ @@ -82,9 +82,9 @@
82 android:layout_below="@id/list_label" 82 android:layout_below="@id/list_label"
83 android:layout_centerHorizontal="true" 83 android:layout_centerHorizontal="true"
84 android:layout_gravity="center_horizontal" 84 android:layout_gravity="center_horizontal"
85 - android:layout_marginLeft="@dimen/dp_30" 85 + android:layout_marginLeft="@dimen/dp_50"
86 android:layout_marginTop="@dimen/dp_10" 86 android:layout_marginTop="@dimen/dp_10"
87 - android:layout_marginRight="@dimen/dp_30" 87 + android:layout_marginRight="@dimen/dp_50"
88 android:layout_marginBottom="@dimen/dp_10" 88 android:layout_marginBottom="@dimen/dp_10"
89 android:orientation="horizontal"> 89 android:orientation="horizontal">
90 90
@@ -8,7 +8,6 @@ @@ -8,7 +8,6 @@
8 android:id="@+id/job" 8 android:id="@+id/job"
9 android:layout_width="wrap_content" 9 android:layout_width="wrap_content"
10 android:layout_height="wrap_content" 10 android:layout_height="wrap_content"
11 - android:layout_marginLeft="@dimen/dp_20"  
12 android:layout_marginTop="@dimen/dp_20" 11 android:layout_marginTop="@dimen/dp_20"
13 android:text="销售工程师" 12 android:text="销售工程师"
14 android:textColor="#232323" 13 android:textColor="#232323"
@@ -31,7 +30,6 @@ @@ -31,7 +30,6 @@
31 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
32 android:layout_below="@id/job" 31 android:layout_below="@id/job"
33 android:orientation="horizontal" 32 android:orientation="horizontal"
34 - android:layout_marginLeft="@dimen/dp_20"  
35 android:layout_marginTop="@dimen/dp_20" 33 android:layout_marginTop="@dimen/dp_20"
36 > 34 >
37 35
@@ -39,14 +37,13 @@ @@ -39,14 +37,13 @@
39 android:id="@+id/year" 37 android:id="@+id/year"
40 android:layout_width="wrap_content" 38 android:layout_width="wrap_content"
41 android:layout_height="wrap_content" 39 android:layout_height="wrap_content"
42 - android:background="@drawable/circle_f8f8f8_3"  
43 android:paddingLeft="@dimen/dp_5" 40 android:paddingLeft="@dimen/dp_5"
44 android:paddingTop="@dimen/dp_3" 41 android:paddingTop="@dimen/dp_3"
45 android:paddingRight="@dimen/dp_5" 42 android:paddingRight="@dimen/dp_5"
46 android:paddingBottom="@dimen/dp_3" 43 android:paddingBottom="@dimen/dp_3"
47 android:text="1-3年" 44 android:text="1-3年"
48 - android:textColor="#a9a9a9"  
49 - android:textSize="@dimen/sp_11" /> 45 + android:textColor="#232323"
  46 + android:textSize="14sp" />
50 47
51 <TextView 48 <TextView
52 android:id="@+id/education" 49 android:id="@+id/education"
@@ -55,14 +52,13 @@ @@ -55,14 +52,13 @@
55 android:layout_below="@id/job" 52 android:layout_below="@id/job"
56 android:layout_marginLeft="@dimen/dp_10" 53 android:layout_marginLeft="@dimen/dp_10"
57 android:layout_toRightOf="@+id/year" 54 android:layout_toRightOf="@+id/year"
58 - android:background="@drawable/circle_f8f8f8_3"  
59 android:paddingLeft="@dimen/dp_5" 55 android:paddingLeft="@dimen/dp_5"
60 android:paddingTop="@dimen/dp_3" 56 android:paddingTop="@dimen/dp_3"
61 android:paddingRight="@dimen/dp_5" 57 android:paddingRight="@dimen/dp_5"
62 android:paddingBottom="@dimen/dp_3" 58 android:paddingBottom="@dimen/dp_3"
63 android:text="本科" 59 android:text="本科"
64 - android:textColor="#a9a9a9"  
65 - android:textSize="@dimen/sp_11" /> 60 + android:textColor="#232323"
  61 + android:textSize="14sp" />
66 62
67 <TextView 63 <TextView
68 android:id="@+id/address" 64 android:id="@+id/address"
@@ -70,17 +66,14 @@ @@ -70,17 +66,14 @@
70 android:layout_height="wrap_content" 66 android:layout_height="wrap_content"
71 android:layout_below="@id/job" 67 android:layout_below="@id/job"
72 android:layout_marginLeft="@dimen/dp_10" 68 android:layout_marginLeft="@dimen/dp_10"
73 - android:layout_toRightOf="@+id/education"  
74 - android:background="@drawable/circle_f8f8f8_3" 69 + android:layout_toRightOf="@+id/year"
75 android:paddingLeft="@dimen/dp_5" 70 android:paddingLeft="@dimen/dp_5"
76 android:paddingTop="@dimen/dp_3" 71 android:paddingTop="@dimen/dp_3"
77 android:paddingRight="@dimen/dp_5" 72 android:paddingRight="@dimen/dp_5"
78 android:paddingBottom="@dimen/dp_3" 73 android:paddingBottom="@dimen/dp_3"
79 android:text="北京" 74 android:text="北京"
80 - android:textColor="#a9a9a9"  
81 - android:textSize="@dimen/sp_11"  
82 - android:visibility="gone"  
83 - /> 75 + android:textColor="#232323"
  76 + android:textSize="14sp" />
84 77
85 </LinearLayout> 78 </LinearLayout>
86 79
@@ -102,8 +95,6 @@ @@ -102,8 +95,6 @@
102 android:layout_width="match_parent" 95 android:layout_width="match_parent"
103 android:layout_height="@dimen/dp_1" 96 android:layout_height="@dimen/dp_1"
104 android:layout_below="@+id/view" 97 android:layout_below="@+id/view"
105 - android:layout_marginLeft="@dimen/dp_20"  
106 - android:layout_marginRight="@dimen/dp_20"  
107 android:background="#EEEEEE" /> 98 android:background="#EEEEEE" />
108 99
109 </RelativeLayout> 100 </RelativeLayout>