作者 qin

bug修改

正在显示 53 个修改的文件 包含 503 行增加210 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MarkdownExportedFiles">
<htmlFiles />
<imageFiles />
<otherFiles />
</component>
</project>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MarkdownProjectSettings" wasCopied="false">
<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">
<PanelProvider>
<provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
</PanelProvider>
</PreviewSettings>
<ParserSettings gitHubSyntaxChange="false" emojiShortcuts="1" emojiImages="0">
<PegdownExtensions>
<option name="ABBREVIATIONS" value="false" />
<option name="ANCHORLINKS" value="true" />
<option name="ASIDE" value="false" />
<option name="ATXHEADERSPACE" value="true" />
<option name="AUTOLINKS" value="true" />
<option name="DEFINITIONS" value="false" />
<option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
<option name="FENCED_CODE_BLOCKS" value="true" />
<option name="FOOTNOTES" value="false" />
<option name="HARDWRAPS" value="false" />
<option name="HTML_DEEP_PARSER" value="false" />
<option name="INSERTED" value="false" />
<option name="QUOTES" value="false" />
<option name="RELAXEDHRULES" value="true" />
<option name="SMARTS" value="false" />
<option name="STRIKETHROUGH" value="true" />
<option name="SUBSCRIPT" value="false" />
<option name="SUPERSCRIPT" value="false" />
<option name="SUPPRESS_HTML_BLOCKS" value="false" />
<option name="SUPPRESS_INLINE_HTML" value="false" />
<option name="TABLES" value="true" />
<option name="TASKLISTITEMS" value="true" />
<option name="TOC" value="false" />
<option name="WIKILINKS" value="false" />
</PegdownExtensions>
<ParserOptions>
<option name="ADMONITION_EXT" value="false" />
<option name="ATTRIBUTES_EXT" value="false" />
<option name="COMMONMARK_LISTS" value="true" />
<option name="DUMMY" value="false" />
<option name="EMOJI_SHORTCUTS" value="true" />
<option name="ENUMERATED_REFERENCES_EXT" value="false" />
<option name="FLEXMARK_FRONT_MATTER" value="false" />
<option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
<option name="GFM_TABLE_RENDERING" value="true" />
<option name="GITBOOK_URL_ENCODING" value="false" />
<option name="GITHUB_LISTS" value="false" />
<option name="GITHUB_WIKI_LINKS" value="false" />
<option name="GITLAB_EXT" value="false" />
<option name="GITLAB_MATH_EXT" value="false" />
<option name="GITLAB_MERMAID_EXT" value="false" />
<option name="HEADER_ID_NON_ASCII_TO_LOWERCASE" value="false" />
<option name="HEADER_ID_NO_DUPED_DASHES" value="false" />
<option name="JEKYLL_FRONT_MATTER" value="false" />
<option name="MACROS_EXT" value="false" />
<option name="NO_TEXT_ATTRIBUTES" value="false" />
<option name="PARSE_HTML_ANCHOR_ID" value="false" />
<option name="PLANTUML_FENCED_CODE" value="false" />
<option name="PUML_FENCED_CODE" value="false" />
<option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
</ParserOptions>
</ParserSettings>
<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">
<GeneratorProvider>
<provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
</GeneratorProvider>
<headerTop />
<headerBottom />
<bodyTop />
<bodyBottom />
</HtmlSettings>
<CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
<StylesheetProvider>
<provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
</StylesheetProvider>
<ScriptProviders />
<cssText />
<cssUriHistory />
</CssSettings>
<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" />
<LinkMapSettings>
<textMaps />
</LinkMapSettings>
</component>
</project>
\ No newline at end of file
... ...
<component name="MarkdownNavigator.ProfileManager">
<settings default="" pdf-export="" />
</component>
\ No newline at end of file
... ...
... ... @@ -137,6 +137,15 @@
<activity
android:name=".activity.pratice.AnswerWrongActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.pratice.a"
android:screenOrientation="portrait" />
<activity
android:name=".activity.pratice.b"
android:screenOrientation="portrait" />
<activity
android:name=".activity.pratice.c"
android:screenOrientation="portrait" />
<!-- 微信 -->
<activity
... ...
... ... @@ -6,7 +6,6 @@ import android.support.v4.app.FragmentTransaction;
import android.view.View;
import android.widget.RadioButton;
import com.hh.xuetubao.Utils.SharedPrefrenceUtils;
import com.hh.xuetubao.activity.pratice.PracticeActivity;
import com.hh.xuetubao.activity.study.StudyActivity;
import com.hh.xuetubao.activity.work.JobHuntActivity;
... ... @@ -53,8 +52,6 @@ public class MainActivity extends BaseMvpActivity<CommonPresenter, MainModel> im
getWindow().setNavigationBarColor(Color.parseColor("#fcfcfc"));
//状态栏颜色
getWindow().setStatusBarColor(Color.parseColor("#fcfcfc"));*/
homeFragment = new HomeFragment();
wrongFragment = new PraticeWrongFragment();
... ... @@ -145,7 +142,7 @@ public class MainActivity extends BaseMvpActivity<CommonPresenter, MainModel> im
MainActivity.this.finish();
break;
case R.id.rl_mine:
transaction.replace(R.id.frame, mineFragment);
transaction.replace(R.id.frame, mineFragment, "1");
transaction.commit();
rlMine.setChecked(true);
selectTag = 4;
... ...
... ... @@ -547,4 +547,13 @@ public interface MyServer {
@GET("GetRandomQuestions")
Observable<AnswerBean> GetRandomQuestions(@Query("catalogOid") String catalogOid, @Query("randomNum") int randomNum, @Query("accountOid") String accountOid);
/**
* 删除成绩接口
*
* @param oid 当前目录ID
* @return
*/
@GET("DeleteExamRecordInfo")
Observable<UserBean> DeleteExamRecordInfo(@Query("oid") String oid);
}
\ No newline at end of file
... ...
package com.hh.xuetubao.Utils;
import android.content.Context;
import android.content.Intent;
import android.util.AttributeSet;
import android.widget.GridView;
/**
* Time: 11/22/2019 9:28
* Author: 秦小飞
* Description:
*/
public class GridViewNesting extends GridView {
public GridViewNesting(Context context) {
super(context);
}
public GridViewNesting(Context context, AttributeSet attrs) {
super(context, attrs);
}
public GridViewNesting(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
public GridViewNesting(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2,
MeasureSpec.AT_MOST);
super.onMeasure(widthMeasureSpec, expandSpec);
}
}
... ...
... ... @@ -6,15 +6,16 @@ import android.os.Build;
import android.os.Bundle;
import android.support.annotation.RequiresApi;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.hh.xuetubao.R;
import com.hh.xuetubao.Utils.SharedPrefrenceUtils;
import com.hh.xuetubao.Utils.WaveView;
import com.hh.xuetubao.bean.UserBean;
import com.hh.xuetubao.model.ExerciseModel;
import com.hh.xuetubao.mvp.BaseMvpActivity;
import com.hh.xuetubao.mvp.CommonPresenter;
... ... @@ -35,7 +36,7 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
@BindView(R.id.tv_title)
TextView tvTitle;
@BindView(R.id.lin_tab)
LinearLayout linTab;
RelativeLayout linTab;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.tv3)
... ... @@ -62,6 +63,8 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
RelativeLayout rlAllWrong;
@BindView(R.id.rl_reStart)
RelativeLayout rlReStart;
@BindView(R.id.tv_delete)
TextView tvDelete;
private String catalogOid;
private Intent intent;
private String thisCatalogOid;
... ... @@ -107,7 +110,7 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
linTab.setOnClickListener(this);
rlAllWrong.setOnClickListener(this);
rlReStart.setOnClickListener(this);
tvDelete.setOnClickListener(this);
thisCatalogOid = SharedPrefrenceUtils.getString(this, "thisCatalogOid");
}
... ... @@ -134,7 +137,9 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
@Override
public void getData(Object o, int api, int intent) {
if (api == 9 && intent == 1) {
UserBean bean = (UserBean) o;
}
}
@Override
... ... @@ -178,7 +183,7 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
finish();
break;
case R.id.rl_allWrong:
intent = new Intent(this,c.class);
intent = new Intent(this, c.class);
intent.putExtra("catalogOid", catalogOid);
startActivity(intent);
break;
... ... @@ -187,6 +192,10 @@ public class TestScoreActivity extends BaseMvpActivity<CommonPresenter, Exercise
intent.putExtra("catalogOid", catalogOid);
startActivity(intent);
break;
case R.id.tv_delete:
Toast.makeText(this,"1",Toast.LENGTH_SHORT).show();
mPresenter.getPresenter(9, 1, thisCatalogOid);
break;
}
}
... ...
... ... @@ -4,6 +4,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.support.annotation.RequiresApi;
import android.text.TextUtils;
import android.util.Log;
... ... @@ -72,18 +73,20 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
LinearLayout linTab;
@BindView(R.id.rl_card)
RelativeLayout rlCard;
@BindView(R.id.right_select)
TextView rightSelect;
@BindView(R.id.right_answer)
TextView rightAnswerText;
@BindView(R.id.rl_answer)
RelativeLayout rlAnswer;
// @BindView(R.id.right_select)
// TextView rightSelect;
// @BindView(R.id.right_answer)
// TextView rightAnswerText;
// @BindView(R.id.rl_answer)
// RelativeLayout rlAnswer;
@BindView(R.id.commit)
LinearLayout commit;
@BindView(R.id.tv2)
TextView tv2;
// @BindView(R.id.tv2)
// TextView tv2;
@BindView(R.id.tv_show_card)
TextView tvShowCard;
@BindView(R.id.tv_second)
TextView tvSecond;
private String catalogOid;
private String accountOid;
... ... @@ -115,6 +118,9 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
private double danxuan;
private double duoxuan;
private double panduan;
private int longTime;
private int thisTime;
private CountDownTimer timer;
@Override
... ... @@ -292,7 +298,8 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
@Override
public int initLayout() {
// return R.layout.activity_answer;
return R.layout.activity_answer_sheet;
// return R.layout.activity_answer_sheet;
return R.layout.activity_answer;
}
@Override
... ... @@ -311,6 +318,13 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
return new ExerciseModel();
}
@Override
protected void onDestroy() {
super.onDestroy();
timer.cancel();
}
@Override
public void getData(Object o, int api, int intent) {
if (api == 4 && intent == 1) {
... ... @@ -335,9 +349,9 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
type = questionLstBeans.get(listIndex).getQuestionTypeName();
tvRadio.setText(type);
rightAnswer = questionLstBeans.get(listIndex).getAnswer();
rightSelect.setText(questionLstBeans.get(listIndex).getAnswer());
// rightSelect.setText(questionLstBeans.get(listIndex).getAnswer());
if (!TextUtils.isEmpty(questionLstBeans.get(listIndex).getAnswer())) {
rightAnswerText.setText(questionLstBeans.get(listIndex).getWrongAnaly());
// rightAnswerText.setText(questionLstBeans.get(listIndex).getWrongAnaly());
}
optionsAdapter = new ListAnswerAdapter(questionLst.get(listIndex).getOptionsLst(), this);
listAnswer.setAdapter(optionsAdapter);
... ... @@ -348,6 +362,60 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
}
sheetGridAdapter = new AnswerSheetGridAdapter(statusList, this);
longTime = bean.getExamMinute() * 60;
thisTime = longTime;
timer = new CountDownTimer(thisTime * 1000, 1000) {
private Intent intent;
@Override
public void onTick(long millisUntilFinished) {
thisTime--;
tvSecond.setText(String.valueOf(thisTime));
}
@Override
public void onFinish() {
if (listIndex == 0) {
intent = new Intent(b.this, TestScoreActivity.class);
intent.putExtra("catalogOid", catalogOid);
intent.putExtra("danxuanCount", danxuanCount);
intent.putExtra("duoxuanCount", duoxuanCount);
intent.putExtra("panduanCount", panduanCount);
intent.putExtra("danxuanWrong", danxuanCount);
intent.putExtra("panduanWrong", panduanCount);
intent.putExtra("duoxuanWrong", duoxuanCount);
intent.putExtra("totalScore", totalScore);
startActivity(intent);
b.this.finish();
} else {
for (int i = listIndex + 1; i < questionLst.size(); i++) {
if (questionLst.get(i).getQuestionTypeName().contains("单选")) {
danxuanWrong++;
} else if (questionLst.get(i).getQuestionTypeName().contains("多选")) {
duoxuanWrong++;
} else if (questionLst.get(i).getQuestionTypeName().contains("判断")) {
panduanWrong++;
}
}
intent = new Intent(b.this, TestScoreActivity.class);
intent.putExtra("catalogOid", catalogOid);
intent.putExtra("danxuanCount", danxuanCount);
intent.putExtra("duoxuanCount", duoxuanCount);
intent.putExtra("panduanCount", panduanCount);
intent.putExtra("danxuanWrong", danxuanWrong);
intent.putExtra("panduanWrong", panduanWrong);
intent.putExtra("duoxuanWrong", duoxuanWrong);
intent.putExtra("totalScore", totalScore);
startActivity(intent);
b.this.finish();
}
}
}.start();
}
}
... ... @@ -367,10 +435,10 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
tvRadio.setText(type);
index.setText(String.valueOf(listIndex + 1));
rightAnswer = questionLst.get(listIndex).getAnswer();
rightSelect.setText(questionLst.get(listIndex).getAnswer());
// rightSelect.setText(questionLst.get(listIndex).getAnswer());
if (!TextUtils.isEmpty(questionLst.get(listIndex).getWrongAnaly()))
rightAnswerText.setText(questionLst.get(listIndex).getWrongAnaly());
rlAnswer.setVisibility(View.GONE);
// rightAnswerText.setText(questionLst.get(listIndex).getWrongAnaly());
// rlAnswer.setVisibility(View.GONE);
optionsAdapter = new ListAnswerAdapter(questionLst.get(listIndex).getOptionsLst(), this);
listAnswer.setAdapter(optionsAdapter);
... ... @@ -532,7 +600,7 @@ public class b extends BaseMvpActivity<CommonPresenter, ExerciseModel> implement
this.finish();
break;
case R.id.tv_look:
rlAnswer.setVisibility(View.VISIBLE);
// rlAnswer.setVisibility(View.VISIBLE);
break;
case R.id.commit:
if (listIndex > historyAnswer.size()) {
... ...
... ... @@ -39,7 +39,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 模拟练习页面
* 错题练习页面
*/
public class c extends BaseMvpActivity<CommonPresenter, ExerciseModel> implements ICommonView, View.OnClickListener {
... ...
... ... @@ -42,12 +42,13 @@ public class CertificationCourseContentAdapter extends BaseAdapter {
TextView title = (TextView) view.findViewById(R.id.title);
View line = view.findViewById(R.id.line);
if (list.get(position).getCatalogName() != null)
if (list.get(position).getCatalogName() != null) {
title.setText(list.get(position).getCatalogName());
}
if (position == list.size() - 1) {
line.setVisibility(View.VISIBLE);
line.setVisibility(View.GONE);
} else {
line.setVisibility(View.INVISIBLE);
line.setVisibility(View.VISIBLE);
}
return view;
}
... ...
... ... @@ -29,7 +29,11 @@ public class GridHomeHotAdapter extends BaseAdapter {
@Override
public int getCount() {
return list.size();
if (list.size() > 4) {
return 4;
} else {
return list.size();
}
}
@Override
... ...
package com.hh.xuetubao.adapter;
import android.content.Context;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
... ... @@ -25,7 +27,11 @@ public class HomeCompanyAdapter extends BaseAdapter {
@Override
public int getCount() {
return list.size();
if (list.size() > 3) {
return 3;
} else {
return list.size();
}
}
@Override
... ... @@ -48,6 +54,17 @@ public class HomeCompanyAdapter extends BaseAdapter {
TextView address = (TextView) view.findViewById(R.id.address);
TextView job = (TextView) view.findViewById(R.id.job);
TextView count = (TextView) view.findViewById(R.id.job_count);
RecyclerView rec = (RecyclerView) view.findViewById(R.id.list_label);
View line = (View) view.findViewById(R.id.line);
LinearLayoutManager manager = new LinearLayoutManager(context);
manager.setOrientation(LinearLayoutManager.HORIZONTAL);
rec.setLayoutManager(manager);
List<CompanyBean.CompanyListBean.IndustryListBean> industryList = list.get(position).getIndustryList();
ListLabelAdapter adapter = new ListLabelAdapter(industryList, context);
rec.setAdapter(adapter);
count.setText(String.valueOf(list.get(position).getJobCount()));
if (list.get(position).getCompanyLogo() != null)
... ... @@ -59,13 +76,30 @@ public class HomeCompanyAdapter extends BaseAdapter {
if (list.get(position).getPopularJobName() != null)
job.setText(list.get(position).getPopularJobName());
job.setOnClickListener(new View.OnClickListener() {
if (list.size() > 3) {
if (position == 2) {
line.setVisibility(View.GONE);
} else {
line.setVisibility(View.VISIBLE);
}
} else {
if (position == list.size() - 1) {
line.setVisibility(View.GONE);
} else {
line.setVisibility(View.VISIBLE);
}
}
/*job.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
}
});
return view;
*/
return view;
}
}
... ...
... ... @@ -29,7 +29,11 @@ public class HomeQuestionAdapter extends BaseAdapter {
@Override
public int getCount() {
return list.size();
if (list.size() > 3) {
return 3;
} else {
return list.size();
}
}
@Override
... ... @@ -55,12 +59,27 @@ public class HomeQuestionAdapter extends BaseAdapter {
ImageView img = (ImageView) view.findViewById(R.id.img);
TextView title = (TextView) view.findViewById(R.id.title);
TextView time = (TextView) view.findViewById(R.id.time);
View line = view.findViewById(R.id.line);
if (list.get(position).getCatalogName() != null)
title.setText(list.get(position).getCatalogName());
if (list.get(position).getConverUrl() != null)
Glide.with(context).load(list.get(position).getConverUrl()).apply(coverRequestOptions).into(img);
if (list.size() > 3) {
if (position == 2) {
line.setVisibility(View.GONE);
} else {
line.setVisibility(View.VISIBLE);
}
} else {
if (position == list.size() - 1) {
line.setVisibility(View.GONE);
} else {
line.setVisibility(View.VISIBLE);
}
}
return view;
}
... ...
... ... @@ -70,7 +70,7 @@ public class JobHuntCompanyAdapter extends RecyclerView.Adapter<JobHuntCompanyAd
holder.hotJob.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if(turn != null){
if (turn != null) {
turn.turnToZw(list.get(position).getPopularJobOid());
}
}
... ... @@ -80,7 +80,11 @@ public class JobHuntCompanyAdapter extends RecyclerView.Adapter<JobHuntCompanyAd
@Override
public int getItemCount() {
return 3;
if (list.size() > 3) {
return 3;
} else {
return list.size();
}
}
public class ViewHolder extends RecyclerView.ViewHolder {
... ... @@ -114,6 +118,7 @@ public class JobHuntCompanyAdapter extends RecyclerView.Adapter<JobHuntCompanyAd
public interface Turn {
void turnTo(String CompanyOid);
void turnToZw(String id);
}
... ...
... ... @@ -59,7 +59,7 @@ public class JobHuntWorkAdapter extends RecyclerView.Adapter<JobHuntWorkAdapter.
@Override
public int getItemCount() {
return 3;
return list.size();
}
public class ViewHolder extends RecyclerView.ViewHolder {
... ...
... ... @@ -4,6 +4,7 @@ import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
... ... @@ -46,12 +47,8 @@ public class RecruitmentRecAdapter extends RecyclerView.Adapter<RecruitmentRecAd
holder.year.setText(list.get(position).getExprience());
if (list.get(position).getEducation() != null)
holder.education.setText(list.get(position).getEducation());
if (list.get(position).getAddress() != null && !list.get(position).getAddress().equals("")) {
holder.address.setVisibility(View.VISIBLE);
if (!TextUtils.isEmpty(list.get(position).getAddress())) {
holder.address.setText(list.get(position).getAddress());
Log.e("address111", list.get(position).getAddress().toString().trim());
}else {
holder.address.setVisibility(View.GONE);
}
LinearLayoutManager manager = new LinearLayoutManager(context);
... ...
... ... @@ -4,10 +4,10 @@ package com.hh.xuetubao.fragment;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.amap.api.maps.AMap;
... ... @@ -17,7 +17,6 @@ import com.amap.api.maps.MapView;
import com.amap.api.maps.model.CameraPosition;
import com.amap.api.maps.model.LatLng;
import com.amap.api.maps.model.MyLocationStyle;
import com.bumptech.glide.Glide;
import com.hh.xuetubao.MyServer;
import com.hh.xuetubao.R;
import com.hh.xuetubao.Utils.BaseObsever;
... ... @@ -46,7 +45,7 @@ public class CompanyMainFragment extends Fragment {
TextView address;
@BindView(R.id.web)
TextView web;
// @BindView(R.id.img_hotel)
// @BindView(R.id.img_hotel)
// ImageView imgHotel;
@BindView(R.id.tv_content)
TextView tvContent;
... ... @@ -125,11 +124,10 @@ public class CompanyMainFragment extends Fragment {
web.setText(bean.getWebSite());
if (bean.getCompanyLogoPic() != null)
// Glide.with(getActivity()).load(bean.getCompanyLogoPic()).into(imgHotel);
if (bean.getIntroduction() != null)
tvContent.setText(bean.getIntroduction());
if (bean.getIntroduction() != null)
tvContent.setText(Html.fromHtml(bean.getIntroduction()));
if (bean.getFullAddress() != null)
tvDingwei.setText(bean.getFullAddress());
}
});
... ...
... ... @@ -10,15 +10,21 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.GridView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import com.hh.xuetubao.MyServer;
import com.hh.xuetubao.R;
import com.hh.xuetubao.Utils.BaseObsever;
import com.hh.xuetubao.Utils.GridViewNesting;
import com.hh.xuetubao.Utils.HttpUtils;
import com.hh.xuetubao.Utils.ListViewNesting;
import com.hh.xuetubao.Utils.NetConfig;
import com.hh.xuetubao.Utils.SharedPrefrenceUtils;
import com.hh.xuetubao.activity.pratice.PracticeActivity;
import com.hh.xuetubao.activity.pratice.PriacticeDistActivity;
import com.hh.xuetubao.activity.study.CourseDetailActivity_Video;
import com.hh.xuetubao.activity.study.StudyActivity;
import com.hh.xuetubao.activity.work.CompanyActivity;
... ... @@ -26,6 +32,7 @@ import com.hh.xuetubao.activity.work.CompanyDetailActivity;
import com.hh.xuetubao.adapter.GridHomeHotAdapter;
import com.hh.xuetubao.adapter.HomeCompanyAdapter;
import com.hh.xuetubao.adapter.HomeQuestionAdapter;
import com.hh.xuetubao.bean.AnswerBean;
import com.hh.xuetubao.bean.CompanyBean;
import com.hh.xuetubao.bean.FreeCourseBean;
import com.hh.xuetubao.bean.QuestionBankLstBean;
... ... @@ -46,6 +53,8 @@ import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
/**
* 首页
... ... @@ -55,11 +64,10 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
@BindView(R.id.grid_hotLesson)
GridView gridHotLesson;
GridViewNesting gridHotLesson;
@BindView(R.id.list_question)
ListViewNesting listQuestion;
@BindView(R.id.list_company)
ListView listCompany;
@BindView(R.id.img_top)
Banner banner;
@BindView(R.id.tv_more_ke)
... ... @@ -70,6 +78,8 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
TextView tvMoreTi;
@BindView(R.id.lin_title)
LinearLayout linTitle;
@BindView(R.id.list_company)
ListViewNesting listCompany;
private Unbinder unbinder;
private List<FreeCourseBean.bean> hotList = new ArrayList<>();
private List<QuestionBankLstBean.QuestionBankbean> questionList = new ArrayList<>();
... ... @@ -79,6 +89,7 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
private HomeCompanyAdapter companyAdapter;
private Intent intent;
private List<Drawable> imageList = new ArrayList<>();
private String accountOid;
@Override
public int getLayoutId() {
... ... @@ -94,6 +105,8 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
linTitle.setFocusableInTouchMode(true);
linTitle.requestFocus();
accountOid = SharedPrefrenceUtils.getString(getActivity(), "AccountOid");
hotAdapter = new GridHomeHotAdapter(hotList, getActivity());
gridHotLesson.setAdapter(hotAdapter);
gridHotLesson.setOnItemClickListener(new AdapterView.OnItemClickListener() {
... ... @@ -110,9 +123,11 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
listQuestion.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
intent = new Intent(getActivity(), PracticeActivity.class);
/*intent = new Intent(getActivity(), PracticeActivity.class);
intent.putExtra("catalogOid", questionList.get(position).getCatalogOid());
startActivity(intent);
startActivity(intent);*/
doRequestTwo(questionList.get(position).getCatalogOid(),accountOid,questionList.get(position).getCatalogName());
}
});
... ... @@ -143,13 +158,13 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
@Override
public void OnBannerClick(int position) {
switch (position) {
case 0: // 题库
Intent intent = new Intent(getActivity(),PracticeActivity.class);
intent.putExtra("tag","1");
case 0: // 题库
Intent intent = new Intent(getActivity(), PracticeActivity.class);
intent.putExtra("tag", "1");
startActivity(intent);
break;
case 1:
Intent intent1 = new Intent(getActivity(),StudyActivity.class);
Intent intent1 = new Intent(getActivity(), StudyActivity.class);
startActivity(intent1);
break;
}
... ... @@ -168,6 +183,30 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
}
private void doRequestTwo(final String catalogOid, String accountOid, final String title) {
MyServer mServers = HttpUtils.getInstance().getServer(NetConfig.shuaTiUrl);
mServers.GetRandomQuestions(catalogOid, Integer.valueOf(10), accountOid)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObsever() {
@Override
public void onNext(Object value) {
super.onNext(value);
AnswerBean bean = (AnswerBean) value;
if (bean.isIsSuccess()) {
Intent intent = new Intent(getActivity(), PriacticeDistActivity.class);
intent.putExtra("CatalogOid", catalogOid);
SharedPrefrenceUtils.saveString(getActivity(), "PraticeTitle", title);
getActivity().startActivity(intent);
} else {
Toast.makeText(getActivity(), "当前账号无权限,请拨打电话xxxxxxxxxx", Toast.LENGTH_SHORT).show();
}
}
});
}
@Override
public void initData() {
LearnModel model = new LearnModel();
... ... @@ -198,6 +237,12 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
List<FreeCourseBean.bean> beanLessonLst = bean.getLessonLst();
hotList.addAll(beanLessonLst);
hotAdapter.notifyDataSetChanged();
if(beanLessonLst.size()>4){
tvMoreKe.setVisibility(View.VISIBLE);
}else{
tvMoreKe.setVisibility(View.GONE);
}
}
if (api == 2 && intent == 1) {
QuestionBankLstBean bean = (QuestionBankLstBean) o;
... ... @@ -206,7 +251,7 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
questionList.addAll(bankLst);
questionAdapter.notifyDataSetChanged();
if (bankLst.size() > 4) {
if (bankLst.size() > 3) {
tvMoreTi.setVisibility(View.VISIBLE);
} else {
tvMoreTi.setVisibility(View.GONE);
... ... @@ -218,7 +263,7 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
companyList.addAll(companyListBeans);
companyAdapter.notifyDataSetChanged();
if (companyListBeans.size() > 4) {
if (companyListBeans.size() > 3) {
tvMoreQiye.setVisibility(View.VISIBLE);
} else {
tvMoreQiye.setVisibility(View.GONE);
... ...
... ... @@ -3,7 +3,6 @@ package com.hh.xuetubao.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
... ... @@ -12,7 +11,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.hh.xuetubao.MainActivity;
import com.hh.xuetubao.R;
import com.hh.xuetubao.Utils.RecyclerViewSpacesItemDecoration;
import com.hh.xuetubao.activity.personal.DeliveryActivity;
... ... @@ -35,7 +33,6 @@ import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder;
/**
... ... @@ -63,7 +60,7 @@ public class JobHuntFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMod
private JobHuntWorkAdapter workAdapter;
private List<CompanyBean.CompanyListBean> companyList = new ArrayList<>();
private List<HotJobBean.JobListBean> jobList = new ArrayList<>();
// private OfficeFragment officeFragment;
// private OfficeFragment officeFragment;
// private FragmentTransaction transaction;
private Intent intent;
... ... @@ -128,6 +125,12 @@ public class JobHuntFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMod
companyList.addAll(companyListBeans);
adapter.notifyDataSetChanged();
if (companyList.size() > 3) {
linMoreCompany.setVisibility(View.VISIBLE);
} else {
linMoreCompany.setVisibility(View.GONE);
}
}
if (api == 3 && intent == 2) {
HotJobBean bean = (HotJobBean) o;
... ... @@ -174,7 +177,7 @@ public class JobHuntFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMod
case R.id.img_zhiwei:
Intent intent1 = new Intent(getActivity(), JobHuntActivity.class);
intent1.putExtra("jobTag","1");
intent1.putExtra("jobTag", "1");
startActivity(intent1);
getActivity().finish();
... ...
... ... @@ -66,6 +66,8 @@ public class MineFragment extends BaseMvpFragment<CommonPresenter, PersonalModel
RelativeLayout rlEnd;
@BindView(R.id.lin_back)
LinearLayout linBack;
@BindView(R.id.rl_top)
RelativeLayout rlTop;
private Intent intent;
private FragmentTransaction transaction;
// private PraticeWrongFragment wrongFragment;
... ... @@ -81,6 +83,13 @@ public class MineFragment extends BaseMvpFragment<CommonPresenter, PersonalModel
public void initView(@Nullable Bundle savedInstanceState) {
accountOid = SharedPrefrenceUtils.getString(getActivity(), "AccountOid");
String tag = getTag();
if (tag.equals("1")) {
rlTop.setVisibility(View.GONE);
} else {
rlTop.setVisibility(View.VISIBLE);
}
rlXinxi.setOnClickListener(this);
rlJianli.setOnClickListener(this);
rlMessage.setOnClickListener(this);
... ...
... ... @@ -48,6 +48,24 @@ public class ExerciseModel implements ICommonModel {
if (api == 8 && intent == 1)
GetRandomQuestions(commonView, api, intent, params);
if (api == 9 && intent == 1)
DeleteExamRecordInfo(commonView, api, intent, params);
}
private void DeleteExamRecordInfo(final ICommonView commonView, final int api, final int intent, String... params) {
if (api == 9 && intent == 1)
mServers.DeleteExamRecordInfo(params[0])
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObsever() {
@Override
public void onNext(Object value) {
super.onNext(value);
commonView.getData(value, api, intent);
}
});
}
private void RemoveWrongQuestion(final ICommonView commonView, final int api, final int intent, String... params) {
... ...
... ... @@ -15,9 +15,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:layout_centerVertical="true"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -137,12 +137,6 @@
</RelativeLayout>
<com.hh.xuetubao.Utils.WaveView
android:id="@+id/waveview"
android:layout_width="@dimen/dp_90"
android:layout_height="@dimen/dp_90"
android:layout_below="@id/lin_tab"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_50" />
</RelativeLayout>
\ No newline at end of file
... ...
... ... @@ -64,7 +64,7 @@
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_25"
android:background="#333333" />
android:background="#D5D5D5" />
<ImageView
android:id="@+id/img_message"
... ...
... ... @@ -18,7 +18,7 @@
android:layout_width="@dimen/dp_30"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_35">
android:layout_marginTop="@dimen/dp_20">
<ImageView
android:layout_width="@dimen/dp_15"
... ... @@ -28,26 +28,6 @@
<TextView
android:id="@+id/tv_more"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_alignTop="@id/img_back"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_15"
android:text="···"
android:textColor="#333333"
android:textSize="20sp" />
<ImageView
android:id="@+id/img_more"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:layout_alignTop="@id/img_back"
android:layout_marginRight="@dimen/dp_15"
android:layout_toLeftOf="@id/tv_more"
android:src="@mipmap/link" />
<TextView
android:id="@+id/tv_name"
android:layout_width="@dimen/dp_207"
android:layout_height="wrap_content"
... ... @@ -100,6 +80,7 @@
android:text="招聘职位("
android:textColor="#b0b0b0"
android:textSize="15sp" />
<TextView
android:id="@+id/job_count"
android:layout_width="wrap_content"
... ... @@ -110,6 +91,7 @@
android:text="36"
android:textColor="#b0b0b0"
android:textSize="15sp" />
<TextView
android:id="@+id/aaa"
android:layout_width="wrap_content"
... ... @@ -125,24 +107,22 @@
android:id="@+id/xhx1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_3"
android:background="@color/color_ff5400"
android:layout_below="@+id/tv_page"
android:layout_alignLeft="@+id/tv_page"
android:layout_alignRight="@+id/tv_page"
android:layout_below="@+id/tv_page"
android:layout_marginTop="@dimen/dp_7"
/>
android:background="@color/color_ff5400" />
<View
android:id="@+id/xhx2"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_3"
android:background="@color/color_ff5400"
android:layout_below="@+id/tv_page"
android:layout_alignLeft="@+id/tv_require"
android:layout_alignRight="@+id/aaa"
android:layout_below="@+id/tv_page"
android:layout_marginTop="@dimen/dp_7"
android:visibility="gone"
/>
android:background="@color/color_ff5400"
android:visibility="gone" />
<View
android:id="@+id/line"
... ... @@ -150,10 +130,9 @@
android:layout_height="@dimen/dp_1"
android:layout_below="@id/tv_page"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="#EDEDED"
android:layout_marginTop="@dimen/dp_10"
/>
android:layout_marginRight="@dimen/dp_20"
android:background="#EDEDED" />
<FrameLayout
android:id="@+id/frame"
... ...
... ... @@ -15,9 +15,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:layout_centerVertical="true"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -48,7 +48,7 @@
android:layout_height="@dimen/dp_1"
android:layout_marginLeft="@dimen/dp_29"
android:layout_marginRight="@dimen/dp_29"
android:background="@color/color_333333" />
android:background="@color/color_d5d5d5" />
<!--<LinearLayout-->
<!--android:layout_width="match_parent"-->
... ...
... ... @@ -15,9 +15,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -54,7 +54,7 @@
android:layout_marginLeft="@dimen/dp_29"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_29"
android:background="#333333" />
android:background="#D5D5D5" />
<ImageView
android:id="@+id/img_message"
... ...
... ... @@ -56,7 +56,7 @@
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_25"
android:background="#333333" />
android:background="#D5D5D5" />
<ImageView
android:id="@+id/img_message"
... ...
... ... @@ -15,9 +15,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -17,9 +17,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -15,8 +15,7 @@
<LinearLayout
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:gravity="center_vertical"
android:orientation="horizontal">
... ...
... ... @@ -15,9 +15,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -15,9 +15,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -15,9 +15,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_13"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
<RelativeLayout
android:id="@+id/lin_tab"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_68"
... ... @@ -23,21 +23,34 @@
android:orientation="horizontal">
<ImageView
android:id="@+id/img1"
android:layout_width="@dimen/dp_15"
android:layout_height="@dimen/dp_30"
android:layout_gravity="center_vertical"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:src="@mipmap/back" />
<TextView
android:id="@+id/tv_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@id/img1"
android:text="考试成绩"
android:textColor="#232323"
android:textSize="17sp" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="删除"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_20"
android:textColor="#666666"
android:textSize="12sp" />
</RelativeLayout>
<com.hh.xuetubao.Utils.WaveView
android:id="@+id/waveview"
... ...
... ... @@ -14,9 +14,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:layout_centerVertical="true"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -16,9 +16,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -9,7 +9,6 @@
android:id="@+id/tv_xinxi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:text="基本信息"
android:textColor="#000000"
... ... @@ -20,7 +19,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_xinxi"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:text="公司性质:"
android:textColor="#4C4C4C"
... ... @@ -42,7 +40,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_xingzhi"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_5"
android:text="公司规模:"
android:textColor="#4C4C4C"
... ... @@ -65,7 +62,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_guimo"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_5"
android:text="公司地址:"
android:textColor="#4C4C4C"
... ... @@ -88,7 +84,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_dizhi"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_5"
android:text="公司网址:"
android:textColor="#4C4C4C"
... ... @@ -120,7 +115,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/line"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:text="公司介绍"
android:textColor="#000000"
... ... @@ -141,7 +135,6 @@
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_below="@id/tv_jieshao"
... ... @@ -162,7 +155,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/line2"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:text="公司地址"
android:textColor="#000000"
... ... @@ -173,7 +165,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_map"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:text="北京市昌平区北七家镇创意空间211"
android:textColor="#4C4C4C"
... ... @@ -192,7 +183,6 @@
<com.amap.api.maps.MapView
android:id="@+id/map"
android:layout_below="@id/tv_dingwei"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_50"
... ...
... ... @@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_200"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:src="@drawable/course_logo" />
... ...
... ... @@ -15,9 +15,8 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -52,10 +52,10 @@
android:background="#333333" />
</LinearLayout>
<GridView
<com.hh.xuetubao.Utils.GridViewNesting
android:id="@+id/grid_hotLesson"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_400"
android:layout_height="wrap_content"
android:layout_below="@+id/lin_title"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
... ... @@ -73,6 +73,8 @@
android:background="@drawable/stroke_gray"
android:gravity="center"
android:text="查看更多"
android:layout_marginTop="@dimen/dp_30"
android:textColor="#AAAAAA"
android:textSize="12sp"
/>
... ... @@ -83,7 +85,7 @@
android:layout_height="@dimen/dp_10"
android:layout_below="@id/tv_more_ke"
android:layout_marginTop="@dimen/dp_30"
android:background="#f1f1f1" />
android:background="#F5F5F5" />
<LinearLayout
android:id="@+id/lin_title1"
... ... @@ -132,7 +134,7 @@
android:layout_height="@dimen/dp_30"
android:layout_below="@+id/list_question"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginRight="@dimen/dp_20"
android:background="@drawable/stroke_gray"
android:gravity="center"
... ... @@ -146,7 +148,7 @@
android:layout_height="@dimen/dp_10"
android:layout_below="@id/tv_more_ti"
android:layout_marginTop="@dimen/dp_30"
android:background="#f1f1f1" />
android:background="#F5F5F5" />
<LinearLayout
android:id="@+id/lin_title2"
... ... @@ -179,10 +181,10 @@
android:background="#333333" />
</LinearLayout>
<ListView
<com.hh.xuetubao.Utils.ListViewNesting
android:id="@+id/list_company"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_500"
android:layout_height="wrap_content"
android:layout_below="@+id/lin_title2"
android:layout_marginTop="@dimen/dp_10"
android:scrollbars="none"
... ... @@ -196,7 +198,7 @@
android:layout_height="30dp"
android:layout_below="@+id/list_company"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_30"
android:background="@drawable/stroke_gray"
... ...
... ... @@ -14,9 +14,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -17,9 +17,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -16,9 +16,8 @@
android:id="@+id/lin_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_18"
android:orientation="horizontal">
<ImageView
... ...
... ... @@ -8,25 +8,23 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_tab"
android:layout_marginTop="@dimen/dp_10"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20" />
android:layout_marginTop="@dimen/dp_10" />
<View
android:layout_marginTop="@dimen/dp_10"
android:id="@+id/line"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_below="@+id/rv_tab"
android:layout_marginTop="@dimen/dp_10"
android:background="#EDEDED" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rec_job"
android:layout_below="@id/line"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/rec_job"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/line" />
</RelativeLayout>
\ No newline at end of file
... ...
... ... @@ -33,6 +33,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:divider="@null"
android:nestedScrollingEnabled="false"
android:scrollbars="none" />
... ...
... ... @@ -192,19 +192,11 @@
android:src="@mipmap/into" />
<View
android:id="@+id/line4"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_0_5"
android:layout_below="@+id/job"
android:layout_marginTop="@dimen/dp_20"
android:background="#D7D7D7"
android:visibility="gone" />
<View
android:id="@+id/line"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="#d7d7d7"
android:layout_below="@+id/line4"
android:layout_below="@+id/tv1"
android:layout_marginTop="@dimen/dp_15"
/>
... ...
... ... @@ -24,23 +24,14 @@
android:textColor="#363636"
android:textSize="15sp" />
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:text="更新时间:2019-10-20 16:00"
android:textColor="#AAAAAA"
android:textSize="12sp" />
<View
android:id="@+id/line"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="#e4e8f0"
android:layout_marginTop="@dimen/dp_14"
android:layout_below="@+id/time"
android:layout_below="@+id/title"
/>
</RelativeLayout>
... ...
... ... @@ -82,9 +82,9 @@
android:layout_below="@id/list_label"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_50"
android:layout_marginBottom="@dimen/dp_10"
android:orientation="horizontal">
... ...
... ... @@ -8,7 +8,6 @@
android:id="@+id/job"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:text="销售工程师"
android:textColor="#232323"
... ... @@ -31,7 +30,6 @@
android:layout_height="wrap_content"
android:layout_below="@id/job"
android:orientation="horizontal"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
>
... ... @@ -39,14 +37,13 @@
android:id="@+id/year"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/circle_f8f8f8_3"
android:paddingLeft="@dimen/dp_5"
android:paddingTop="@dimen/dp_3"
android:paddingRight="@dimen/dp_5"
android:paddingBottom="@dimen/dp_3"
android:text="1-3年"
android:textColor="#a9a9a9"
android:textSize="@dimen/sp_11" />
android:textColor="#232323"
android:textSize="14sp" />
<TextView
android:id="@+id/education"
... ... @@ -55,14 +52,13 @@
android:layout_below="@id/job"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/year"
android:background="@drawable/circle_f8f8f8_3"
android:paddingLeft="@dimen/dp_5"
android:paddingTop="@dimen/dp_3"
android:paddingRight="@dimen/dp_5"
android:paddingBottom="@dimen/dp_3"
android:text="本科"
android:textColor="#a9a9a9"
android:textSize="@dimen/sp_11" />
android:textColor="#232323"
android:textSize="14sp" />
<TextView
android:id="@+id/address"
... ... @@ -70,17 +66,14 @@
android:layout_height="wrap_content"
android:layout_below="@id/job"
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/education"
android:background="@drawable/circle_f8f8f8_3"
android:layout_toRightOf="@+id/year"
android:paddingLeft="@dimen/dp_5"
android:paddingTop="@dimen/dp_3"
android:paddingRight="@dimen/dp_5"
android:paddingBottom="@dimen/dp_3"
android:text="北京"
android:textColor="#a9a9a9"
android:textSize="@dimen/sp_11"
android:visibility="gone"
/>
android:textColor="#232323"
android:textSize="14sp" />
</LinearLayout>
... ... @@ -102,8 +95,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_below="@+id/view"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="#EEEEEE" />
</RelativeLayout>
... ...