张涛 / huahang_project · 提交

转到一个项目

作者 zhangtao
提交 2654c3c33f157408033224ba9762c3613fa37c69 2 个父辈 d5acafcd 3f0e7a86

Merge branch 'master' into zhangtao

内嵌 并排对比
正在显示 84 个修改的文件 包含 1162 行增加 和 440 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>
\ No newline at end of file
... ...
... ... @@ -29,6 +29,8 @@
</value>
</option>
</component>
=======
>>>>>>> liming
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
... ...
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="7">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="6">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
</list>
</value>
</option>
</component>
=======
>>>>>>> liming
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="7">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="6">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GitSharedSettings">
<option name="FORCE_PUSH_PROHIBITED_PATTERNS">
<list>
<option value="liming" />
</list>
</option>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
... ...
apply plugin: 'com.android.application'
android {
/* signingConfigs {
release {
keyAlias 'FireControl'
keyPassword '11111111'
storeFile file('./FireControl.jks')
storePassword '11111111'
}
}*/
compileSdkVersion 28
defaultConfig {
applicationId "com.hh.xuetubao"
... ... @@ -81,6 +93,7 @@ dependencies {
implementation 'fm.jiecao:jiecaovideoplayer:5.5'
implementation 'org.greenrobot:eventbus:3.1.1'
implementation files('libs/AMap3DMap_7.1.0_AMapSearch_7.1.0_AMapLocation_4.7.2_20191030.jar')
implementation 'com.youth.banner:banner:1.4.10'
}
... ...
... ... @@ -157,6 +157,11 @@
-keep class com.amap.api.navi.**{*;}
-keep class com.autonavi.**{*;}
# banner 的混淆代码
-keep class com.youth.banner.** {
*;
}
... ...
不能预览此文件类型
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
... ...
... ... @@ -2,6 +2,7 @@ package com.hh.xuetubao;
import com.hh.xuetubao.bean.AddressBean;
import com.hh.xuetubao.bean.AnswerBean;
import com.hh.xuetubao.bean.BdPhoneBean;
import com.hh.xuetubao.bean.CertListBean;
import com.hh.xuetubao.bean.ChapterLstBean;
import com.hh.xuetubao.bean.CompanyBean;
... ... @@ -25,6 +26,8 @@ import com.hh.xuetubao.bean.UserBean;
import io.reactivex.Observable;
import retrofit2.http.Body;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.Query;
... ... @@ -147,6 +150,22 @@ public interface MyServer {
Observable<UserBean> mobileLogin(@Query("mobileNumber") String mobileNumber, @Query("verCode") String verCode);
/**
<<<<<<< HEAD
=======
* 微信绑定手机
*
* @param OpenId
* @param phone
* @param verCode
* @return
*/
@FormUrlEncoded
@POST("SaveWxBinding")
Observable<BdPhoneBean> bd_phone(@Field("wxOpenId") String OpenId, @Field("mobileNumber") String phone, @Field("verCode") String verCode);
/**
>>>>>>> liming
* 微信登录接口
*
* @param wxOpenId 微信用户的OpenId
... ...
package com.hh.xuetubao.activity.login;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import com.hh.xuetubao.R;
import com.hh.xuetubao.bean.UserBean;
import com.hh.xuetubao.model.AccountModel;
import com.hh.xuetubao.mvp.BaseMvpActivity;
import com.hh.xuetubao.mvp.CommonPresenter;
import com.hh.xuetubao.mvp.ICommonView;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
public class BdsjActivity extends BaseMvpActivity<CommonPresenter, AccountModel> implements ICommonView {
@BindView(R.id.ed_phone)
EditText edPhone;
@BindView(R.id.ed_code)
EditText edCode;
@BindView(R.id.tv_yanzheng)
TextView tvYanzheng;
@BindView(R.id.bdsj_sure)
TextView bdsjSure;
@BindView(R.id.bdsj_fhdl)
TextView bdsjFhdl;
private CountDownTimer timer;
private int time = 60;
@Override
public void initView() {
}
@Override
public int initLayout() {
return R.layout.activity_bdsj;
}
@Override
public void initData() {
}
@Override
public CommonPresenter getPresenter() {
return new CommonPresenter();
}
@Override
public AccountModel getModel() {
return new AccountModel();
}
@Override
public void getData(Object o, int api, int intent) {
switch (intent) {
case 1: // 验证码
UserBean bean = (UserBean) o;
if (bean.getSuccess()) {
Toast.makeText(this, "验证码发送成功", Toast.LENGTH_LONG).show();
timer = new CountDownTimer(60000, 1000) {
@Override
public void onTick(long millisUntilFinished) {
time--;
try {
tvYanzheng.setText(String.valueOf(time) + "s");
tvYanzheng.setFocusable(false);
} catch (Exception e) {
Log.e("zhangtao", e.toString());
}
}
@Override
public void onFinish() {
tvYanzheng.setText("获取验证码");
tvYanzheng.setFocusable(true);
time = 60;
}
}.start();
} else {
Toast.makeText(this, "验证码发送失败", Toast.LENGTH_LONG).show();
}
break;
case 3: // 绑定
break;
}
}
@Override
public void onComplete(int api) {
}
@Override
public void onError(Throwable e, int api) {
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ButterKnife.bind(this);
}
@OnClick({R.id.tv_yanzheng, R.id.bdsj_sure, R.id.bdsj_fhdl})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_yanzheng: // - > 验证码
if (isCellphone(edPhone.getText().toString()))
mPresenter.getPresenter(1, 1, edPhone.getText().toString(), String.valueOf(1)); // 1 -> 微信或手机号码绑定时发送
else
Toast.makeText(this, "请输入正确的手机号码", Toast.LENGTH_LONG).show();
break;
case R.id.bdsj_sure: // - > 确定
if (isCellphone(edPhone.getText().toString())) {
Toast.makeText(this, "请输入正确的手机号码", Toast.LENGTH_LONG).show();
return;
} else if (edPhone.getText().length() > 0 && edCode.getText().length() > 0) {
Toast.makeText(this, "手机号和验证码不可为空", Toast.LENGTH_LONG).show();
return;
} else {
mPresenter.getPresenter(1, 3, edPhone.getText().toString().trim(), edCode.getText().toString().trim()); // - > 绑定
}
break;
case R.id.bdsj_fhdl: // - > 返回登录
this.finish();
break;
}
}
public static boolean isCellphone(String str) {
Pattern pattern = Pattern.compile("^((13[0-9])|(14[5,7,9])|(15[^4])|(18[0-9])|(17[0,1,3,5,6,7,8]))\\d{8}$");
Matcher matcher = pattern.matcher(str);
return matcher.matches();
}
}
... ...
... ... @@ -4,6 +4,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
... ... @@ -30,7 +31,6 @@ import butterknife.ButterKnife;
*/
public class LoginActivity extends BaseMvpActivity<CommonPresenter, AccountModel> implements ICommonView, View.OnClickListener {
@BindView(R.id.login)
TextView login;
@BindView(R.id.ed_phone)
... ... @@ -96,6 +96,12 @@ public class LoginActivity extends BaseMvpActivity<CommonPresenter, AccountModel
tvYanzheng.setFocusable(false);
tvYanzheng.setFocusableInTouchMode(false);
tvYanzheng.setClickable(false);
try {
tvYanzheng.setText(String.valueOf(time) + "s");
tvYanzheng.setFocusable(false);
} catch (Exception e) {
Log.e("zhangtao", e.toString());
}
}
@Override
... ... @@ -104,6 +110,7 @@ public class LoginActivity extends BaseMvpActivity<CommonPresenter, AccountModel
tvYanzheng.setFocusable(true);
tvYanzheng.setFocusableInTouchMode(true);
tvYanzheng.setClickable(true);
time = 60;
}
}.start();
} else {
... ... @@ -120,6 +127,7 @@ public class LoginActivity extends BaseMvpActivity<CommonPresenter, AccountModel
this.finish();
} else {
Toast.makeText(this, bean.getErrorMsg(), Toast.LENGTH_LONG).show();
Toast.makeText(this, "登录失败", Toast.LENGTH_LONG).show();
}
}
... ... @@ -151,8 +159,9 @@ public class LoginActivity extends BaseMvpActivity<CommonPresenter, AccountModel
else
Toast.makeText(this, "请输入正确的手机号码", Toast.LENGTH_LONG).show();
break;
case R.id.tv_yanzheng:
if (isCellphone(edPhone.getText().toString()) && !TextUtils.isEmpty(edPhone.getText().toString()))
if (isCellphone(edPhone.getText().toString()))
mPresenter.getPresenter(1, 1, edPhone.getText().toString(), String.valueOf(0));
else
Toast.makeText(this, "请输入正确的手机号码", Toast.LENGTH_LONG).show();
... ...
... ... @@ -42,6 +42,8 @@ public class DeliveryActivity extends BaseMvpActivity<CommonPresenter, ZhaopinMo
LinearLayout linBack;
@BindView(R.id.tv_none)
TextView tvNone;
@BindView(R.id.toudi_none)
ImageView toudiNone;
private int pageIndex = 1;
private int pageSize = 10;
private boolean isRefresh = false;
... ... @@ -58,9 +60,8 @@ public class DeliveryActivity extends BaseMvpActivity<CommonPresenter, ZhaopinMo
if (reallHeader != null && reallHeader != "") {
Glide.with(this).load(reallHeader).into(imgUser);
} else {
if (headPic != null)
Glide.with(this).load(headPic).into(imgUser);
} else if (headPic != null && headPic != "") {
Glide.with(this).load(headPic).into(imgUser);
}
if (userName != null) {
tvUser.setText(userName);
... ... @@ -103,10 +104,12 @@ public class DeliveryActivity extends BaseMvpActivity<CommonPresenter, ZhaopinMo
if (api == 1 && intent == 1) {
ResumedJobListBean bean = (ResumedJobListBean) o;
List<ResumedJobListBean.JobListBean> jobList = bean.getJobList();
if (jobList == null) {
if (jobList.size() == 0) {
tvNone.setVisibility(View.VISIBLE);
toudiNone.setVisibility(View.VISIBLE);
} else {
tvNone.setVisibility(View.GONE);
toudiNone.setVisibility(View.GONE);
}
if (isRefresh) {
list.clear();
... ...
... ... @@ -2,6 +2,7 @@ package com.hh.xuetubao.activity.personal;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
... ... @@ -10,8 +11,9 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import com.amap.api.maps.MapView;
import com.bumptech.glide.Glide;
import com.hh.xuetubao.R;
import com.hh.xuetubao.Utils.CircleImageView;
import com.hh.xuetubao.Utils.SharedPrefrenceUtils;
import com.hh.xuetubao.bean.UserBean;
import com.hh.xuetubao.model.PersonalModel;
... ... @@ -43,12 +45,21 @@ public class InfromationActivity extends BaseMvpActivity<CommonPresenter, Person
TextView tvUser;
@BindView(R.id.lin_back)
LinearLayout linBack;
@BindView(R.id.img_user)
CircleImageView imgUser;
private int level = 0;
private String resumeOid;
@Override
public void initView() {
resumeOid = SharedPrefrenceUtils.getString(this, "AccountOid");
String reallHeader = SharedPrefrenceUtils.getString(this, "ReallHeader");
String headPic = SharedPrefrenceUtils.getString(this, "HeadPic");
if (!TextUtils.isEmpty(headPic)) {
Glide.with(this).load(headPic).into(imgUser);
} else if (!TextUtils.isEmpty(reallHeader)) {
Glide.with(this).load(reallHeader).into(imgUser);
}
tvName.addTextChangedListener(new TextWatcher() {
@Override
... ...
... ... @@ -3,6 +3,8 @@ package com.hh.xuetubao.activity.personal;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
... ... @@ -35,8 +37,6 @@ public class MessageActivity extends BaseMvpActivity<CommonPresenter, PersonalMo
ImageView imgUser;
@BindView(R.id.tv_user)
TextView tvUser;
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_system)
TextView tvSystem;
@BindView(R.id.tv_hudong)
... ... @@ -94,15 +94,17 @@ public class MessageActivity extends BaseMvpActivity<CommonPresenter, PersonalMo
public void getData(Object o, int api, int intent) {
if (api == 2 && intent == 1) {
UserBean bean = (UserBean) o;
if (bean.getUserName() != null)
tvName.setText(bean.getUserName());
if (bean.getLoginName() != null)
if (!TextUtils.isEmpty(bean.getLoginName())) {
tvUser.setText(bean.getLoginName());
if (bean.getHeadPic() != null) {
} else if (!TextUtils.isEmpty(bean.getUserName())) {
tvUser.setText(bean.getUserName());
}
Log.e("zhangtao:name", bean.getLoginName());
if (!TextUtils.isEmpty(bean.getHeadPic())) {
Glide.with(this).load(bean.getHeadPic()).into(imgUser);
} else {
String headPic = SharedPrefrenceUtils.getString(this, "HeadPic");
if (headPic != null)
if (!TextUtils.isEmpty(headPic))
Glide.with(this).load(headPic).into(imgUser);
}
}
... ... @@ -157,8 +159,8 @@ public class MessageActivity extends BaseMvpActivity<CommonPresenter, PersonalMo
case R.id.tv_system:
type = 1;
tvSystem.setTextColor(getResources().getColor(R.color.color_ffffff));
tvHudong.setTextColor(getResources().getColor(R.color.color_349dfe));
tvSystem.setBackgroundResource(R.drawable.circle_coners_left_blue);
tvHudong.setTextColor(getResources().getColor(R.color.color_ff5400));
tvSystem.setBackgroundResource(R.drawable.circle_coners_left_orange);
tvHudong.setBackgroundResource(R.drawable.circle_coners_right);
list.clear();
pageIndex = 1;
... ... @@ -166,10 +168,10 @@ public class MessageActivity extends BaseMvpActivity<CommonPresenter, PersonalMo
break;
case R.id.tv_hudong:
type = 2;
tvSystem.setTextColor(getResources().getColor(R.color.color_349dfe));
tvSystem.setTextColor(getResources().getColor(R.color.color_ff5400));
tvHudong.setTextColor(getResources().getColor(R.color.color_ffffff));
tvSystem.setBackgroundResource(R.drawable.circle_coners_left);
tvHudong.setBackgroundResource(R.drawable.circle_coners_right_blue);
tvHudong.setBackgroundResource(R.drawable.circle_coners_right_orange);
list.clear();
pageIndex = 1;
mPresenter.getPresenter(5, 2, resumeOid, "Interaction", String.valueOf(pageIndex), String.valueOf(pageSize));
... ...
... ... @@ -2,6 +2,7 @@ package com.hh.xuetubao.activity.personal;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
... ... @@ -44,11 +45,10 @@ public class MoneyActivity extends BaseMvpActivity<CommonPresenter, PersonalMode
String reallHeader = SharedPrefrenceUtils.getString(this, "ReallHeader");
String headPic = SharedPrefrenceUtils.getString(this, "HeadPic");
String userName = SharedPrefrenceUtils.getString(this, "UserName");
if (reallHeader != null) {
if (!TextUtils.isEmpty(reallHeader)) {
Glide.with(this).load(reallHeader).into(imgUser);
} else {
if (headPic != null)
Glide.with(this).load(headPic).into(imgUser);
} else if (!TextUtils.isEmpty(headPic)) {
Glide.with(this).load(headPic).into(imgUser);
}
if (userName != null) {
tvUser.setText(userName);
... ...
... ... @@ -7,7 +7,7 @@ import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.hh.xuetubao.R;
... ... @@ -40,10 +40,10 @@ public class CourseDetailActivity extends BaseMvpActivity<CommonPresenter, Learn
@BindView(R.id.viewPager)
FrameLayout viewPager;
@BindView(R.id.lin_introduce)
LinearLayout linIntroduce;
@BindView(R.id.lin_list)
LinearLayout linList;
@BindView(R.id.tv_introduce)
TextView linIntroduce;
@BindView(R.id.tv_list)
TextView linList;
@BindView(R.id.jiecao_Player)
JCVideoPlayerStandard jiecaoPlayer;
private IntroduceFragment introduceFragment;
... ... @@ -148,7 +148,6 @@ public class CourseDetailActivity extends BaseMvpActivity<CommonPresenter, Learn
ChapterLstBean bean = (ChapterLstBean) o;
String playUrl = bean.getChapterLst().get(0).getSectionLst().get(0).getResourceLst().get(0).getPlayUrl();
jiecaoPlayer.setUp(playUrl, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL);
Log.e("zhangtao:playUrl", bean.getChapterLst().get(0).getSectionLst().get(0).getResourceLst().get(0).getPlayUrl());
// onSendPlayUrl(bean.getChapterLst().get(0).getSectionLst().get(0).getResourceLst().get(0).getPlayUrl());
// Bitmap videoBitmap = getNetVideoBitmap(playUrl);
// Glide.with(this).load(videoBitmap).into(jiecaoPlayer.thumbImageView);
... ... @@ -179,11 +178,15 @@ public class CourseDetailActivity extends BaseMvpActivity<CommonPresenter, Learn
listFragment = new ListFragment();
switch (v.getId()) {
case R.id.lin_introduce:
case R.id.tv_introduce:
linIntroduce.setTextColor(getResources().getColor(R.color.color_ff5400));
linList.setTextColor(getResources().getColor(R.color.color_616161));
transaction.replace(R.id.viewPager, introduceFragment, lessonOid);
transaction.commit();
break;
case R.id.lin_list:
case R.id.tv_list:
linList.setTextColor(getResources().getColor(R.color.color_ff5400));
linIntroduce.setTextColor(getResources().getColor(R.color.color_616161));
transaction.replace(R.id.viewPager, listFragment, lessonOid);
transaction.commit();
break;
... ...
... ... @@ -46,7 +46,7 @@ public class StudyActivity extends AppCompatActivity implements View.OnClickList
setContentView(R.layout.activity_main);
ButterKnife.bind(this);
this.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
// this.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
// this.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
FragmentManager supportFragmentManager = getSupportFragmentManager();
... ...
... ... @@ -63,6 +63,8 @@ public class StudyNoteActivity extends BaseMvpActivity<CommonPresenter, LearnMod
LinearLayout linBack;
@BindView(R.id.rl_user)
RelativeLayout rlUser;
@BindView(R.id.rl_body)
RelativeLayout rlBody;
private StudyXrecAdapter adapter;
private StudyTimeXrcAdapter xrcAdapter;
private int pageIndex = 1;
... ... @@ -102,6 +104,7 @@ public class StudyNoteActivity extends BaseMvpActivity<CommonPresenter, LearnMod
linBack.setOnClickListener(this);
rlUser.setOnClickListener(this);
imgUser.setOnClickListener(this);
rlBody.setOnClickListener(this);
}
... ... @@ -133,8 +136,13 @@ public class StudyNoteActivity extends BaseMvpActivity<CommonPresenter, LearnMod
MyLearningInfoBean bean = (MyLearningInfoBean) o;
if (bean.getUserName() != null)
tvUser.setText(bean.getUserName());
if (bean.getHeadPic() != null)
if (bean.getHeadPic() != null && bean.getHeadPic() != "") {
Glide.with(this).load(bean.getHeadPic()).into(imgUser);
} else {
String headPic = SharedPrefrenceUtils.getString(this, "HeadPic");
Glide.with(this).load(headPic).into(imgUser);
}
if (bean.getTodayDuration() != null)
todayStudy.setText(bean.getTodayDuration());
if (bean.getMaxDuration() != null)
... ... @@ -228,6 +236,7 @@ public class StudyNoteActivity extends BaseMvpActivity<CommonPresenter, LearnMod
break;
case R.id.img_user:
case R.id.rl_user:
case R.id.rl_body:
startActivity(new Intent(this, InfromationActivity.class));
break;
}
... ...
... ... @@ -78,6 +78,8 @@ public class OfficeDetailActivity extends BaseMvpActivity<CommonPresenter, Zhaop
LinearLayout imgBack;
@BindView(R.id.map)
MapView map;
@BindView(R.id.tv_look_all)
TextView tvLookAll;
private String jobOid;
private List<OfficeDetailBean.LabelListBean> labelList = new ArrayList<>();
private List<OfficeDetailBean.SimiliarJobListBean> similiarList = new ArrayList<>();
... ... @@ -110,6 +112,7 @@ public class OfficeDetailActivity extends BaseMvpActivity<CommonPresenter, Zhaop
rlDelivery.setOnClickListener(this);
rlShare.setOnClickListener(this);
imgBack.setOnClickListener(this);
tvLookAll.setOnClickListener(this);
}
@Override
... ... @@ -248,6 +251,9 @@ public class OfficeDetailActivity extends BaseMvpActivity<CommonPresenter, Zhaop
case R.id.img_back:
this.finish();
break;
case R.id.tv_look_all:
tvContent.setMaxLines(10);
break;
}
}
}
... ...
... ... @@ -3,7 +3,6 @@ package com.hh.xuetubao.adapter;
import android.content.Context;
import android.content.Intent;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
... ... @@ -12,17 +11,27 @@ import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.hh.xuetubao.MyServer;
import com.hh.xuetubao.R;
import com.hh.xuetubao.Utils.BaseObsever;
import com.hh.xuetubao.Utils.HttpUtils;
import com.hh.xuetubao.Utils.ListviewUtils;
import com.hh.xuetubao.Utils.NetConfig;
import com.hh.xuetubao.Utils.SharedPrefrenceUtils;
import com.hh.xuetubao.activity.pratice.PriacticeDistActivity;
import com.hh.xuetubao.bean.AnswerBean;
import com.hh.xuetubao.bean.DoExerciseBean;
import com.hh.xuetubao.bean.FreeCourseBean;
import com.hh.xuetubao.fragment.CurriculumScheduleFragment;
import java.util.List;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
public class CertificationCourseDetailAdapter extends BaseAdapter {
private List<DoExerciseBean.bean> list;
private Context context;
... ... @@ -78,27 +87,82 @@ public class CertificationCourseDetailAdapter extends BaseAdapter {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
String oid = list.get(thisPosition).getSubCatalogLst().get(thisPosition).getSubCatalogLst().get(position).getCatalogOid();
String accountOid = SharedPrefrenceUtils.getString(context, "AccountOid");
if (type == 1) {
CurriculumScheduleFragment curriculumScheduleFragment = new CurriculumScheduleFragment();
transaction.replace(R.id.frame, curriculumScheduleFragment, oid);
transaction.commit();
//认证课程
doRequestOne(accountOid, oid);
} else if (type == 2) {
intent = new Intent(context, PriacticeDistActivity.class);
intent.putExtra("CatalogOid", oid);
SharedPrefrenceUtils.saveString(context, "PraticeTitle", list.get(thisPosition).getSubCatalogLst().get(thisPosition).getSubCatalogLst().get(position).getCatalogName());
context.startActivity(intent);
//练习
String title = list.get(thisPosition).getSubCatalogLst().get(thisPosition).getSubCatalogLst().get(position).getCatalogName();
doRequestTwo(oid, accountOid, title);
}
}
});
if (list.get(position).getSubCatalogLst().get(position).getCatalogName() != null)
title.setText(list.get(position).getSubCatalogLst().get(position).getCatalogName());
if (list.get(position).getCatalogPicUrl() != null&&list.get(position).getCatalogPicUrl()!="")
if (list.get(position).getCatalogPicUrl() != null && list.get(position).getCatalogPicUrl() != "")
Glide.with(context).load(list.get(position).getCatalogPicUrl()).into(img);
return view;
}
private void doRequestOne(String accountOid, final String oid) {
MyServer mServers = HttpUtils.getInstance().getServer(NetConfig.learnUrl);
mServers.getLessonLstByCatalogOid(accountOid, oid)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObsever() {
@Override
public void onNext(Object value) {
super.onNext(value);
FreeCourseBean courseBean = (FreeCourseBean) value;
if (courseBean.getSuccess()) {
CurriculumScheduleFragment curriculumScheduleFragment = new CurriculumScheduleFragment();
transaction.replace(R.id.frame, curriculumScheduleFragment, oid);
transaction.commit();
} else {
Toast.makeText(context, "您当前还没有权限哦~", Toast.LENGTH_SHORT).show();
}
}
@Override
public void onError(Throwable e) {
super.onError(e);
}
@Override
public void onComplete() {
super.onComplete();
}
});
}
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(context, PriacticeDistActivity.class);
intent.putExtra("CatalogOid", catalogOid);
SharedPrefrenceUtils.saveString(context, "PraticeTitle", title);
context.startActivity(intent);
} else {
Toast.makeText(context, "您当前还没有权限哦~", Toast.LENGTH_SHORT).show();
}
}
});
}
}
... ...
... ... @@ -2,6 +2,7 @@ package com.hh.xuetubao.adapter;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
... ... @@ -13,6 +14,7 @@ import com.bumptech.glide.Glide;
import com.hh.xuetubao.R;
import com.hh.xuetubao.bean.CompanyBean;
import java.util.ArrayList;
import java.util.List;
public class CompanyRecAdapter extends RecyclerView.Adapter<CompanyRecAdapter.ViewHolder> {
... ... @@ -47,6 +49,36 @@ public class CompanyRecAdapter extends RecyclerView.Adapter<CompanyRecAdapter.Vi
holder.address.setText(list.get(position).getAddress());
if (list.get(position).getPopularJobName() != null)
holder.job.setText(list.get(position).getPopularJobName());
/*
if (list.get(position).getCompanyNature() != null)
holder.one.setText(list.get(position).getCompanyNature());
if (list.get(position).getCompanySize() != null)
holder.two.setText(list.get(position).getCompanySize());*/
/* if (list.get(position).getIndustryList().get(0).getIndustry() != null)
holder.three.setText(list.get(position).getIndustryList().get(0).getIndustry());
if (list.get(position).getIndustryList().get(1).getIndustry() != null)
holder.four.setText(list.get(position).getIndustryList().get(1).getIndustry());
if (list.get(position).getIndustryList().get(2).getIndustry() != null)
holder.five.setText(list.get(position).getIndustryList().get(2).getIndustry());*/
CompanyBean.CompanyListBean.IndustryListBean bean1 = new CompanyBean.CompanyListBean.IndustryListBean();
bean1.setIndustry(list.get(position).getCompanyNature());
CompanyBean.CompanyListBean.IndustryListBean bean2 = new CompanyBean.CompanyListBean.IndustryListBean();
bean2.setIndustry(list.get(position).getCompanySize());
List<CompanyBean.CompanyListBean.IndustryListBean> industryList = list.get(position).getIndustryList();
List<CompanyBean.CompanyListBean.IndustryListBean> newList = new ArrayList<>();
newList.add( bean1);
newList.add( bean2);
for (CompanyBean.CompanyListBean.IndustryListBean a : industryList) {
newList.add(a);
}
ListLabelAdapter adapter = new ListLabelAdapter(newList, context);
LinearLayoutManager manager = new LinearLayoutManager(context);
manager.setOrientation(LinearLayoutManager.HORIZONTAL);
holder.label.setLayoutManager(manager);
holder.label.setAdapter(adapter);
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
... ... @@ -70,6 +102,13 @@ public class CompanyRecAdapter extends RecyclerView.Adapter<CompanyRecAdapter.Vi
private final TextView address;
private final TextView job;
private final TextView count;
private final RecyclerView label;
/* private final TextView one;
private final TextView two;
private final TextView three;
private final TextView four;
private final TextView five;*/
public ViewHolder(View itemView) {
super(itemView);
... ... @@ -78,6 +117,14 @@ public class CompanyRecAdapter extends RecyclerView.Adapter<CompanyRecAdapter.Vi
address = (TextView) itemView.findViewById(R.id.address);
job = (TextView) itemView.findViewById(R.id.job);
count = (TextView) itemView.findViewById(R.id.job_count);
/* one = (TextView) itemView.findViewById(R.id.tv_one);
two = (TextView) itemView.findViewById(R.id.tv_two);
three = (TextView) itemView.findViewById(R.id.tv_three);
four = (TextView) itemView.findViewById(R.id.tv_four);
five = (TextView) itemView.findViewById(R.id.tv_five);*/
label = (RecyclerView) itemView.findViewById(R.id.list_label);
}
}
... ...
... ... @@ -9,6 +9,10 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.hh.xuetubao.R;
import com.hh.xuetubao.bean.FreeCourseBean;
... ... @@ -42,6 +46,12 @@ public class GridHomeHotAdapter extends BaseAdapter {
public View getView(int position, View convertView, ViewGroup parent) {
View view = LayoutInflater.from(context).inflate(R.layout.grid_home_hot, null);
RoundedCorners roundedCorners = new RoundedCorners(10);//数字为圆角度数
RequestOptions coverRequestOptions = new RequestOptions()
.transforms(new CenterCrop(), roundedCorners)
.diskCacheStrategy(DiskCacheStrategy.NONE)//不做磁盘缓存
.skipMemoryCache(true);//不做内存缓存
ImageView img = (ImageView) view.findViewById(R.id.img);
TextView lesson = (TextView) view.findViewById(R.id.tv_lesson);
TextView count = (TextView) view.findViewById(R.id.tv_count);
... ... @@ -53,7 +63,7 @@ public class GridHomeHotAdapter extends BaseAdapter {
if (list.get(position).getLearningPeopleCount() != null)
count.setText(list.get(position).getLearningPeopleCount());
if (list.get(position).getLessonCoverPic() != null)
Glide.with(context).load(list.get(position).getLessonCoverPic()).into(img);
Glide.with(context).load(list.get(position).getLessonCoverPic()).apply(coverRequestOptions).into(img);
if (list.get(position).getLessonType() != null)
type.setText(list.get(position).getLessonType());
return view;
... ...
... ... @@ -9,6 +9,10 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.hh.xuetubao.R;
import com.hh.xuetubao.bean.QuestionBankLstBean;
... ... @@ -43,6 +47,12 @@ public class HomeQuestionAdapter extends BaseAdapter {
public View getView(int position, View convertView, ViewGroup parent) {
View view = LayoutInflater.from(context).inflate(R.layout.lv_home_question, null);
RoundedCorners roundedCorners = new RoundedCorners(10);//数字为圆角度数
RequestOptions coverRequestOptions = new RequestOptions()
.transforms(new CenterCrop(), roundedCorners)
.diskCacheStrategy(DiskCacheStrategy.NONE)//不做磁盘缓存
.skipMemoryCache(true);//不做内存缓存
ImageView img = (ImageView) view.findViewById(R.id.img);
TextView title = (TextView) view.findViewById(R.id.title);
TextView time = (TextView) view.findViewById(R.id.time);
... ... @@ -50,17 +60,8 @@ public class HomeQuestionAdapter extends BaseAdapter {
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()).into(img);
Glide.with(context).load(list.get(position).getConverUrl()).apply(coverRequestOptions).into(img);
return view;
}
private Turn turn;
public void setTurn(Turn turn) {
this.turn = turn;
}
public interface Turn {
void turnToDetail();
}
}
... ...
... ... @@ -78,7 +78,7 @@ public class JobHuntWorkAdapter extends RecyclerView.Adapter<JobHuntWorkAdapter.
company = (TextView) itemView.findViewById(R.id.tv_company);
jingyan = (TextView) itemView.findViewById(R.id.jingyan);
xueli = (TextView) itemView.findViewById(R.id.xueli);
address = (TextView) itemView.findViewById(R.id.jingyan);
address = (TextView) itemView.findViewById(R.id.address);
}
}
... ...
... ... @@ -42,6 +42,11 @@ public class OfficeDetailJobAdapter extends RecyclerView.Adapter<OfficeDetailJob
holder.year.setText(list.get(position).getExprience());
if (list.get(position).getEducation() != null)
holder.education.setText(list.get(position).getEducation());
if (position == list.size() - 1) {
holder.line.setVisibility(View.GONE);
} else {
holder.line.setVisibility(View.VISIBLE);
}
}
... ... @@ -58,6 +63,7 @@ public class OfficeDetailJobAdapter extends RecyclerView.Adapter<OfficeDetailJob
private final TextView education;
private final TextView address;
private final RecyclerView recLabel;
private final View line;
public ViewHolder(View itemView) {
super(itemView);
... ... @@ -67,6 +73,7 @@ public class OfficeDetailJobAdapter extends RecyclerView.Adapter<OfficeDetailJob
education = (TextView) itemView.findViewById(R.id.education);
address = (TextView) itemView.findViewById(R.id.address);
recLabel = (RecyclerView) itemView.findViewById(R.id.rec_label);
line = itemView.findViewById(R.id.line);
}
}
}
... ...
... ... @@ -32,15 +32,16 @@ public class PqAdapter extends RecyclerView.Adapter<PqAdapter.ViewHolder> {
@Override
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
holder.change.setText(String.valueOf(list.get(position).getIncoming()));
holder.total.setText(String.valueOf(list.get(position).getTotalPQCoin()));
if (list.get(position).getPaymentsType() != null) {
holder.label.setText(list.get(position).getPaymentsType());
if (list.get(position).getPaymentsType().equals("收入")) {
holder.change.setText("+" + String.valueOf(list.get(position).getIncoming()));
holder.label.setBackground(context.getResources().getDrawable(R.drawable.coners_green));
holder.tvPq.setTextColor(context.getResources().getColor(R.color.color_008f44));
holder.change.setTextColor(context.getResources().getColor(R.color.color_008f44));
} else {
holder.change.setText("-" + String.valueOf(list.get(position).getIncoming()));
holder.label.setBackground(context.getResources().getDrawable(R.drawable.coners_orange));
holder.tvPq.setTextColor(context.getResources().getColor(R.color.color_ff5400));
holder.change.setTextColor(context.getResources().getColor(R.color.color_ff5400));
... ...
... ... @@ -42,9 +42,9 @@ public class StudyTimeXrcAdapter extends RecyclerView.Adapter<StudyTimeXrcAdapte
@Override
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
if (day.get(position) != null)
holder.tvDay.setText(day.get(position));
holder.tvDay.setText(time.get(position));
if (time.get(position) != null)
holder.tvTime.setText(time.get(position));
holder.tvTime.setText(day.get(position));
ViewGroup.LayoutParams params = holder.longView.getLayoutParams();
params.height=100;
holder.longView.setLayoutParams(params);
... ...
package com.hh.xuetubao.bean;
public class BdPhoneBean {
/**
* IsSuccess : true
* AccountOid : 16EA2C01-20E3-420D-AB4E-4E44F0539349
*/
private boolean IsSuccess;
private String AccountOid;
public boolean isIsSuccess() {
return IsSuccess;
}
public void setIsSuccess(boolean IsSuccess) {
this.IsSuccess = IsSuccess;
}
public String getAccountOid() {
return AccountOid;
}
public void setAccountOid(String AccountOid) {
this.AccountOid = AccountOid;
}
}
... ...
... ... @@ -9,7 +9,7 @@ public class CourseDetailInfoBean implements Serializable {
private String LessonDesc;
private String LessonName;
private String LessonCoverUrl;
private String LearningPeopleCoun;
private String LearningPeopleCount;
private String Difficult;
private String TeacherName;
private String TeacherUserPic;
... ... @@ -55,12 +55,12 @@ public class CourseDetailInfoBean implements Serializable {
LessonCoverUrl = lessonCoverUrl;
}
public String getLearningPeopleCoun() {
return LearningPeopleCoun;
public String getLearningPeopleCount() {
return LearningPeopleCount;
}
public void setLearningPeopleCoun(String learningPeopleCoun) {
LearningPeopleCoun = learningPeopleCoun;
public void setLearningPeopleCount(String learningPeopleCoun) {
LearningPeopleCount = learningPeopleCoun;
}
public String getDifficult() {
... ... @@ -94,4 +94,5 @@ public class CourseDetailInfoBean implements Serializable {
public void setSkillLst(List<String> skillLst) {
SkillLst = skillLst;
}
}
... ...
... ... @@ -4,11 +4,14 @@ 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;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.hh.xuetubao.R;
import com.hh.xuetubao.Utils.SharedPrefrenceUtils;
... ... @@ -30,16 +33,21 @@ import butterknife.Unbinder;
/**
* 课程列表
*/
public class CurriculumScheduleFragment extends BaseMvpFragment<CommonPresenter, LearnModel> implements ICommonView, CurriculumScheduleRecAdapter.Turn {
public class CurriculumScheduleFragment extends BaseMvpFragment<CommonPresenter, LearnModel> implements ICommonView, CurriculumScheduleRecAdapter.Turn, View.OnClickListener {
@BindView(R.id.recyclerview)
RecyclerView recyclerview;
Unbinder unbinder;
@BindView(R.id.rl_top)
RelativeLayout rlTop;
@BindView(R.id.tv_none)
TextView tvNone;
private CurriculumScheduleRecAdapter curriculumScheduleRecAdapter;
private String tag;
private List<FreeCourseBean.bean> list = new ArrayList<>();
private String accountOid;
private FragmentTransaction transaction;
@Override
public int getLayoutId() {
... ... @@ -56,6 +64,8 @@ public class CurriculumScheduleFragment extends BaseMvpFragment<CommonPresenter,
curriculumScheduleRecAdapter = new CurriculumScheduleRecAdapter(list, getActivity());
recyclerview.setAdapter(curriculumScheduleRecAdapter);
curriculumScheduleRecAdapter.setTurn(this);
rlTop.setOnClickListener(this);
}
@Override
... ... @@ -79,10 +89,16 @@ public class CurriculumScheduleFragment extends BaseMvpFragment<CommonPresenter,
public void getData(Object o, int api, int intent) {
if (api == 1 && intent == 2) {
FreeCourseBean courseBean = (FreeCourseBean) o;
List<FreeCourseBean.bean> lessonLst = courseBean.getLessonLst();
if (lessonLst != null)
list.addAll(lessonLst);
curriculumScheduleRecAdapter.notifyDataSetChanged();
if (courseBean.getSuccess()) {
List<FreeCourseBean.bean> lessonLst = courseBean.getLessonLst();
if (lessonLst != null)
list.addAll(lessonLst);
curriculumScheduleRecAdapter.notifyDataSetChanged();
tvNone.setVisibility(View.GONE);
} else {
tvNone.setVisibility(View.VISIBLE);
}
}
}
... ... @@ -116,4 +132,16 @@ public class CurriculumScheduleFragment extends BaseMvpFragment<CommonPresenter,
intent.putExtra("lessonOid", lessonOid);
startActivity(intent);
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.rl_top:
transaction = getActivity().getSupportFragmentManager().beginTransaction();
CertificationCourseFragment fragment = new CertificationCourseFragment();
transaction.replace(R.id.frame, fragment);
transaction.commit();
break;
}
}
}
... ...
package com.hh.xuetubao.fragment;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
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 com.hh.xuetubao.R;
import com.hh.xuetubao.Utils.ListViewNesting;
import com.hh.xuetubao.activity.pratice.PracticeActivity;
import com.hh.xuetubao.activity.study.CourseDetailActivity;
import com.hh.xuetubao.activity.study.StudyActivity;
... ... @@ -31,6 +35,10 @@ import com.hh.xuetubao.model.ZhaopinModel;
import com.hh.xuetubao.mvp.BaseMvpFragment;
import com.hh.xuetubao.mvp.CommonPresenter;
import com.hh.xuetubao.mvp.ICommonView;
import com.youth.banner.Banner;
import com.youth.banner.Transformer;
import com.youth.banner.listener.OnBannerListener;
import com.youth.banner.loader.ImageLoader;
import java.util.ArrayList;
import java.util.List;
... ... @@ -49,17 +57,19 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
@BindView(R.id.grid_hotLesson)
GridView gridHotLesson;
@BindView(R.id.list_question)
ListView listQuestion;
ListViewNesting listQuestion;
@BindView(R.id.list_company)
ListView listCompany;
@BindView(R.id.img_top)
ImageView imgTop;
Banner banner;
@BindView(R.id.tv_more_ke)
TextView tvMoreKe;
@BindView(R.id.tv_more_qiye)
TextView tvMoreQiye;
@BindView(R.id.tv_more_ti)
TextView tvMoreTi;
@BindView(R.id.lin_title)
LinearLayout linTitle;
private Unbinder unbinder;
private List<FreeCourseBean.bean> hotList = new ArrayList<>();
private List<QuestionBankLstBean.QuestionBankbean> questionList = new ArrayList<>();
... ... @@ -68,6 +78,7 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
private HomeQuestionAdapter questionAdapter;
private HomeCompanyAdapter companyAdapter;
private Intent intent;
private List<Drawable> imageList = new ArrayList<>();
@Override
public int getLayoutId() {
... ... @@ -79,9 +90,9 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
//ScrollView 嵌套ListView 进入页面 焦点会显示在ScrollView中间位置
//利用顶部控件 获取焦点 修改此问题
imgTop.setFocusable(true);
imgTop.setFocusableInTouchMode(true);
imgTop.requestFocus();
linTitle.setFocusable(true);
linTitle.setFocusableInTouchMode(true);
linTitle.requestFocus();
hotAdapter = new GridHomeHotAdapter(hotList, getActivity());
gridHotLesson.setAdapter(hotAdapter);
... ... @@ -116,10 +127,34 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
}
});
imageList.add(getResources().getDrawable(R.drawable.bannerone));
imageList.add(getResources().getDrawable(R.drawable.bannertwo));
banner.setImages(imageList);
banner.setImageLoader(new ImageLoader() {
@Override
public void displayImage(Context context, Object path, ImageView imageView) {
Drawable drawable = (Drawable) path;
imageView.setBackground(drawable);
}
});
banner.setOnBannerListener(new OnBannerListener() {
@Override
public void OnBannerClick(int position) {
}
});
banner.isAutoPlay(true);
banner.setBannerAnimation(Transformer.DepthPage);
banner.setDelayTime(2000);
banner.start();
tvMoreKe.setOnClickListener(this);
tvMoreQiye.setOnClickListener(this);
tvMoreTi.setOnClickListener(this);
imgTop.setOnClickListener(this);
}
... ... @@ -157,14 +192,27 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
if (api == 2 && intent == 1) {
QuestionBankLstBean bean = (QuestionBankLstBean) o;
List<QuestionBankLstBean.QuestionBankbean> bankLst = bean.getQuestionBankLst();
Log.e("zhangtao:Size", String.valueOf(bankLst.size()));
questionList.addAll(bankLst);
questionAdapter.notifyDataSetChanged();
if (bankLst.size() > 3) {
tvMoreTi.setVisibility(View.VISIBLE);
} else {
tvMoreTi.setVisibility(View.GONE);
}
}
if (api == 3 && intent == 1) {
CompanyBean bean = (CompanyBean) o;
List<CompanyBean.CompanyListBean> companyListBeans = bean.getCompanyList();
companyList.addAll(companyListBeans);
companyAdapter.notifyDataSetChanged();
if (companyListBeans.size() > 3) {
tvMoreQiye.setVisibility(View.VISIBLE);
} else {
tvMoreQiye.setVisibility(View.GONE);
}
}
}
... ... @@ -192,6 +240,18 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
unbinder.unbind();
}
@Override
public void onPause() {
super.onPause();
banner.stopAutoPlay();
banner.releaseBanner();
}
@Override
public void onResume() {
super.onResume();
banner.startAutoPlay();
}
@Override
public void onClick(View v) {
... ... @@ -201,12 +261,13 @@ public class HomeFragment extends BaseMvpFragment<CommonPresenter, LearnModel> i
FragmentTransaction transaction = getActivity().getSupportFragmentManager().beginTransaction();
transaction.replace(R.id.frame, fragment);
transaction.commit();*/
startActivity(new Intent(getActivity(),StudyActivity.class));
startActivity(new Intent(getActivity(), StudyActivity.class));
break;
case R.id.tv_more_qiye:
startActivity(new Intent(getActivity(), CompanyActivity.class));
break;
case R.id.tv_more_ti:
startActivity(new Intent(getActivity(), PracticeActivity.class));
break;
}
}
... ...
... ... @@ -2,6 +2,7 @@ package com.hh.xuetubao.fragment;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
... ... @@ -36,14 +37,10 @@ public class IntroduceFragment extends BaseMvpFragment<CommonPresenter, LearnMod
Unbinder unbinder;
@BindView(R.id.tv_title)
TextView tvTitle;
@BindView(R.id.tv_count)
@BindView(R.id.tv_count_people)
TextView tvCount;
@BindView(R.id.tv_sort)
TextView tvSort;
@BindView(R.id.tv_user_name)
TextView tvUserName;
@BindView(R.id.img_user)
ImageView imgUser;
@BindView(R.id.tv_jianjie_show)
TextView tvJianjieShow;
@BindView(R.id.gridview)
... ... @@ -63,6 +60,10 @@ public class IntroduceFragment extends BaseMvpFragment<CommonPresenter, LearnMod
lessonOid = getTag();
tvTitle.setFocusable(true);
tvTitle.setFocusableInTouchMode(true);
tvTitle.requestFocus();
gridAdapter = new IntroduceGridAdapter(list, getActivity());
gridview.setAdapter(gridAdapter);
}
... ... @@ -88,17 +89,12 @@ public class IntroduceFragment extends BaseMvpFragment<CommonPresenter, LearnMod
public void getData(Object o, int api, int intent) {
if (api == 2 && intent == 1) {
CourseDetailInfoBean bean = (CourseDetailInfoBean) o;
Log.e("zhangtao",bean.toString());
tvCount.setText(bean.getLearningPeopleCount());
if (bean.getLessonName() != null)
tvTitle.setText(bean.getLessonName());
if (bean.getLearningPeopleCoun() != null)
tvCount.setText(bean.getLearningPeopleCoun());
if (bean.getDifficult() != null)
tvSort.setText(bean.getDifficult());
if (bean.getTeacherName() != null)
tvUserName.setText(bean.getTeacherName());
if (bean.getTeacherUserPic() != null)
Glide.with(getActivity()).load(bean.getTeacherUserPic()).into(imgUser);
if (bean.getLessonDesc() != null)
tvJianjieShow.setText(bean.getLessonDesc());
if (bean.getSkillLst() != null)
... ...
... ... @@ -15,6 +15,7 @@ import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.hh.xuetubao.R;
import com.hh.xuetubao.Utils.SharedPrefrenceUtils;
import com.hh.xuetubao.activity.login.LoginActivity;
import com.hh.xuetubao.activity.personal.DeliveryActivity;
import com.hh.xuetubao.activity.personal.InfromationActivity;
import com.hh.xuetubao.activity.personal.MessageActivity;
... ... @@ -199,6 +200,8 @@ public class MineFragment extends BaseMvpFragment<CommonPresenter, PersonalModel
transaction.commit();
break;
case R.id.rl_end:
SharedPrefrenceUtils.saveString(getActivity(),"AccountOid",null);
startActivity(new Intent(getActivity(), LoginActivity.class));
getActivity().finish();
break;
}
... ...
... ... @@ -10,6 +10,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ListView;
import android.widget.TextView;
import com.hh.xuetubao.R;
import com.hh.xuetubao.Utils.SharedPrefrenceUtils;
... ... @@ -36,6 +37,8 @@ public class PraticeWrongFragment extends BaseMvpFragment<CommonPresenter, Exerc
@BindView(R.id.listview)
ListView listview;
Unbinder unbinder;
@BindView(R.id.tv_num)
TextView tvNum;
private PractiveWrongAdapter practiveWrongAdapter;
private List<AnswerBean.CatalogLstBean> catalogLst = new ArrayList<>();
private PraticeWrongFragment fragment;
... ... @@ -84,9 +87,12 @@ public class PraticeWrongFragment extends BaseMvpFragment<CommonPresenter, Exerc
AnswerBean bean = (AnswerBean) o;
List<AnswerBean.CatalogLstBean> catalogLstBeans = bean.getCatalogLst();
tvNum.setText(String.valueOf(catalogLstBeans.size()));
catalogLst.addAll(catalogLstBeans);
practiveWrongAdapter.notifyDataSetChanged();
}
@Override
... ...
... ... @@ -27,6 +27,23 @@ public class AccountModel implements ICommonModel {
}
/* 获取验证码 */
private void sendValidateCode(final ICommonView commonView, final int api, final int intent, String... params) {
if (api == 1 && intent == 1)
mServers.sendValidateCode(params[0], Integer.valueOf(params[1]))
.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 mobileLogin(final ICommonView commonView, final int api, final int intent, String... params) {
if (api == 1 && intent == 2)
mServers.mobileLogin(params[0], params[1])
... ... @@ -42,18 +59,20 @@ public class AccountModel implements ICommonModel {
});
}
private void sendValidateCode(final ICommonView commonView, final int api, final int intent, String... params) {
if (api == 1 && intent == 1)
mServers.sendValidateCode(params[0], Integer.valueOf(params[1]))
private void bd_phone(final ICommonView commonView, final int api, final int tag, String... params) {
if (api == 1 && tag == 2) {
mServers.bd_phone(params[0], params[1], params[2])
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObsever() {
@Override
public void onNext(Object value) {
super.onNext(value);
commonView.getData(value, api, intent);
commonView.getData(value, api, tag);
}
});
}
}
}
... ...
... ... @@ -3,5 +3,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ff349dff" />
<corners android:topLeftRadius="14dp" android:topRightRadius="14dp" android:bottomLeftRadius="14dp" android:bottomRightRadius="14dp" />
<corners android:radius="@dimen/dp_15"/>
</shape>
\ No newline at end of file
... ...
... ... @@ -3,7 +3,7 @@
<stroke
android:width="@dimen/dp_1"
android:color="#349DFE" />
android:color="#FF5400" />
<corners
android:bottomLeftRadius="@dimen/dp_5"
android:topLeftRadius="@dimen/dp_5" />
... ...
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="@dimen/dp_1"
android:color="#FF5400" />
<corners
android:bottomLeftRadius="@dimen/dp_5"
android:topLeftRadius="@dimen/dp_5" />
<solid android:color="#FF5400" />
</shape>
\ No newline at end of file
... ...
... ... @@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="@dimen/dp_1"
android:color="#349DFE" />
android:color="#FF5400" />
<corners
android:bottomRightRadius="@dimen/dp_5"
android:topRightRadius="@dimen/dp_5" />
... ...
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="@dimen/dp_1"
android:color="#FF5400" />
<corners
android:bottomRightRadius="@dimen/dp_5"
android:topRightRadius="@dimen/dp_5" />
<solid android:color="#FF5400" />
</shape>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_25" />
<solid android:color="@color/color_dddddd" />
</shape>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_10" />
<stroke android:color="#E5E5E5" android:width="@dimen/dp_0_5"/>
<solid android:color="#FF5400"/>
</shape>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FF5400" />
<corners android:radius="@dimen/dp_15"/>
</shape>
\ No newline at end of file
... ...
... ... @@ -4,4 +4,5 @@
<stroke
android:width="@dimen/dp_1"
android:color="#CCCCCC" />
<corners android:radius="@dimen/dp_5"/>
</shape>
\ No newline at end of file
... ...
... ... @@ -4,4 +4,5 @@
android:width="@dimen/dp_1"
android:color="#CCCCCC" />
<solid android:color="#FF5400"/>
<corners android:radius="@dimen/dp_5"/>
</shape>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_50"/>
<stroke
android:width="@dimen/dp_1"
android:color="#C4C4C4" />
</shape>
\ No newline at end of file
... ...
... ... @@ -43,7 +43,8 @@
android:layout_marginTop="@dimen/dp_20"
android:text="工业机器人操作与运维技能等级认证（初级）"
android:textColor="#333333"
android:textSize="15sp" />
android:textSize="15sp"
android:textStyle="bold" />
<View
android:id="@+id/line"
... ...
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/tv_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_60"
android:text="绑定手机号"
android:textColor="#232323"
android:textSize="17sp" />
<ImageView
android:id="@+id/img_phone"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_below="@+id/tv_login"
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_50"
android:src="@mipmap/login_phone" />
<TextView
android:id="@+id/tv_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/img_phone"
android:layout_marginLeft="@dimen/dp_5"
android:layout_toRightOf="@+id/img_phone"
android:text="手机号"
android:textColor="#666666"
android:textSize="12sp" />
<!--<View-->
<!--android:layout_width="@dimen/dp_1"-->
<!--android:layout_height="@dimen/dp_15"-->
<!--android:background="@color/color_333333"-->
<!--android:layout_toRightOf="@+id/tv_phone"-->
<!--android:layout_alignTop="@+id/tv_phone"-->
<!--android:layout_marginLeft="@dimen/dp_10"-->
<!--/>-->
<EditText
android:id="@+id/ed_phone"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:layout_alignBottom="@id/img_phone"
android:layout_marginLeft="@dimen/dp_15"
android:layout_toRightOf="@id/tv_phone"
android:background="@null"
android:hint="|请输入手机号"
android:textColorHint="#C7C7C7"
android:textSize="12sp" />
<View
android:id="@+id/line2"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_below="@id/img_phone"
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_25"
android:background="#333333" />
<ImageView
android:id="@+id/img_message"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_below="@id/line2"
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_35"
android:src="@mipmap/login_message" />
<TextView
android:id="@+id/tv_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/img_message"
android:layout_marginLeft="@dimen/dp_5"
android:layout_toRightOf="@+id/img_phone"
android:text="验证码"
android:textColor="#666666"
android:textSize="12sp" />
<EditText
android:id="@+id/ed_code"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_alignBottom="@id/img_message"
android:layout_marginLeft="@dimen/dp_15"
android:layout_toRightOf="@id/tv_message"
android:background="@null"
android:hint="请输入短信验证码"
android:textColorHint="#C7C7C7"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_yanzheng"
android:layout_width="@dimen/dp_75"
android:layout_height="@dimen/dp_25"
android:layout_alignBottom="@id/img_message"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_25"
android:background="@drawable/login_circle"
android:gravity="center"
android:text="获取验证码"
android:textColor="#FFFFFF"
android:textSize="11sp" />
<View
android:id="@+id/ling2"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_below="@+id/tv_yanzheng"
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_25"
android:background="#D5D5D5" />
<TextView
android:id="@+id/bdsj_sure"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_below="@id/ling2"
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_240"
android:layout_marginRight="@dimen/dp_25"
android:background="@drawable/circle_orange"
android:gravity="center"
android:text="确定"
android:textColor="#FFFFFF"
android:textSize="16sp" />
<TextView
android:id="@+id/bdsj_fhdl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:layout_below="@id/bdsj_sure"
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_25"
android:background="@drawable/circle_grey_25"
android:gravity="center"
android:text="返回登录"
android:textColor="@color/color_6666666"
android:textSize="16sp" />
</RelativeLayout>
\ No newline at end of file
... ...
... ... @@ -68,7 +68,12 @@
android:layout_marginLeft="@dimen/dp_5"
android:src="@mipmap/down" />
</LinearLayout>
<View
android:layout_width="@dimen/dp_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_5"
android:background="#D7D7D7" />
<LinearLayout
android:id="@+id/lin_city"
android:layout_width="0dp"
... ... @@ -95,7 +100,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center">
android:gravity="center"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
... ... @@ -116,7 +122,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center">
android:gravity="center"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
... ...
... ... @@ -5,10 +5,10 @@
android:layout_height="match_parent"
tools:context=".activity.study.CourseDetailActivity">
<fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard
android:id="@+id/jiecao_Player"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_230" />
<fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard
android:id="@+id/jiecao_Player"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_230" />
<LinearLayout
android:id="@+id/tab"
... ... @@ -17,20 +17,16 @@
android:layout_below="@+id/jiecao_Player"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/lin_introduce"
<TextView
android:id="@+id/tv_introduce"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="介绍"
android:textColor="#616161"
android:textSize="12sp" />
</LinearLayout>
android:layout_weight="1"
android:gravity="center"
android:text="介绍"
android:textColor="#FF5400"
android:textSize="12sp" />
<View
... ... @@ -39,20 +35,16 @@
android:layout_gravity="center_vertical"
android:background="#D7D7D7" />
<LinearLayout
android:id="@+id/lin_list"
<TextView
android:id="@+id/tv_list"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="目录"
android:textColor="#616161"
android:textSize="12sp" />
</LinearLayout>
android:layout_weight="1"
android:gravity="center"
android:text="目录"
android:textColor="#616161"
android:textSize="12sp" />
</LinearLayout>
... ...
... ... @@ -5,16 +5,6 @@
android:layout_height="match_parent"
tools:context=".activity.personal.DeliveryActivity">
<TextView
android:id="@+id/tv_none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="您当前还没有投递记录哦~"
android:textColor="#AAAAAA"
android:textSize="14sp"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/rl_top"
android:layout_width="match_parent"
... ... @@ -79,5 +69,23 @@
android:layout_height="match_parent"
android:layout_below="@id/line1" />
<ImageView
android:id="@+id/toudi_none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@mipmap/toudi_none" />
<TextView
android:id="@+id/tv_none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/toudi_none"
android:layout_centerInParent="true"
android:layout_marginTop="@dimen/dp_30"
android:text="您当前还没有投递记录哦~"
android:textColor="#AAAAAA"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
... ...
... ... @@ -137,12 +137,13 @@
<EditText
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_width="@dimen/dp_100"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_15"
android:layout_toLeftOf="@+id/img_name"
android:background="@null"
android:gravity="end"
android:text="王不二"
android:textColor="#333333"
android:textCursorDrawable="@color/color_e5e5e5"
... ... @@ -183,12 +184,13 @@
<EditText
android:id="@+id/tv_sex"
android:layout_width="wrap_content"
android:layout_width="@dimen/dp_100"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_15"
android:layout_toLeftOf="@+id/img_sex"
android:background="@null"
android:gravity="end"
android:text="男"
android:textColor="#333333"
android:textCursorDrawable="@color/color_e5e5e5"
... ... @@ -229,12 +231,13 @@
<EditText
android:id="@+id/tv_company"
android:layout_width="wrap_content"
android:layout_width="@dimen/dp_100"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_15"
android:layout_toLeftOf="@+id/img_work"
android:background="@null"
android:gravity="end"
android:text="华航唯实"
android:textColor="#333333"
android:textCursorDrawable="@color/color_e5e5e5"
... ... @@ -275,12 +278,13 @@
<EditText
android:id="@+id/tv_web"
android:layout_width="wrap_content"
android:layout_width="@dimen/dp_100"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_15"
android:layout_toLeftOf="@+id/img_home_page"
android:background="@null"
android:gravity="end"
android:text="未填写"
android:textColor="#333333"
android:textCursorDrawable="@color/color_e5e5e5"
... ...
... ... @@ -49,34 +49,13 @@
android:layout_height="wrap_content"
android:layout_below="@id/rl_top"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_40"
android:layout_alignTop="@id/img_user"
android:layout_marginTop="@dimen/dp_25"
android:layout_toRightOf="@+id/img_user"
android:text="归零"
android:textColor="#000000"
android:textSize="16sp" />
<TextView
android:id="@+id/tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_user"
android:layout_alignStart="@id/tv_user"
android:layout_marginTop="@dimen/dp_14"
android:text="用户名:"
android:textColor="#666666"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_user"
android:layout_marginTop="@dimen/dp_14"
android:layout_toRightOf="@id/tv"
android:text="wangabc"
android:textColor="#666666"
android:textSize="12sp" />
<LinearLayout
android:id="@+id/lin_tab"
android:layout_width="match_parent"
... ... @@ -93,7 +72,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/circle_coners_left_blue"
android:background="@drawable/circle_coners_left_orange"
android:gravity="center"
android:text="系统消息"
android:textColor="#FFFFFF"
... ... @@ -107,7 +86,7 @@
android:background="@drawable/circle_coners_right"
android:gravity="center"
android:text="互动消息"
android:textColor="#349DFE"
android:textColor="#FF5400"
android:textSize="13sp" />
</LinearLayout>
... ...
... ... @@ -55,36 +55,6 @@
android:textColor="#000000"
android:textSize="16sp" />
<ImageView
android:id="@+id/img_zuanshi"
android:layout_width="@dimen/dp_12"
android:layout_height="@dimen/dp_12"
android:layout_below="@+id/tv_user"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_14"
android:layout_toRightOf="@id/img_user"
android:src="@mipmap/zuanshi" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/img_zuanshi"
android:layout_marginLeft="@dimen/dp_5"
android:layout_toRightOf="@id/img_zuanshi"
android:text="普通会员"
android:textColor="#FF5400"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/img_user"
android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_20"
android:text="会员中心 >"
android:textColor="#999999"
android:textSize="12sp" />
<View
android:id="@+id/line"
... ... @@ -125,8 +95,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="PQ币"
android:layout_marginLeft="@dimen/dp_5"
android:text="PQ币"
android:textColor="#FF5400"
android:textSize="13sp" />
</LinearLayout>
... ... @@ -151,7 +121,7 @@
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_40"
android:background="#FF5400"
android:background="@drawable/coners_10_orange"
android:gravity="center"
android:text="账户明细"
android:textColor="#FFFFFF"
... ...
... ... @@ -40,7 +40,7 @@
android:layout_below="@id/rl_top"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:background="#FF5400"
android:background="@drawable/stoke_1dp_orange"
android:gravity="center"
android:text="全部"
android:textColor="#FFFFFF"
... ... @@ -82,7 +82,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="#000000" />
android:background="#E4E4E4" />
<com.jcodecraeer.xrecyclerview.XRecyclerView
... ...
... ... @@ -132,8 +132,9 @@
android:id="@+id/company_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/img_logo"
android:layout_below="@+id/line"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_toRightOf="@id/img_logo"
android:text="中企崛起"
android:textColor="#232323"
... ... @@ -143,8 +144,9 @@
android:id="@+id/tv_nature"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/img_logo"
android:layout_below="@id/company_name"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@id/img_logo"
android:text="民营"
android:textColor="#232323"
... ... @@ -154,7 +156,7 @@
android:id="@+id/tv_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/img_logo"
android:layout_alignBottom="@id/tv_nature"
android:layout_marginLeft="@dimen/dp_15"
android:layout_toRightOf="@id/tv_nature"
android:text="1-50人"
... ... @@ -165,9 +167,9 @@
android:id="@+id/tv_industry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/img_logo"
android:layout_marginLeft="@dimen/dp_15"
android:layout_toRightOf="@id/tv_size"
android:layout_below="@id/tv_nature"
android:layout_alignStart="@id/tv_nature"
android:layout_marginTop="@dimen/dp_10"
android:text="移动互联网"
android:textColor="#232323"
android:textSize="14sp" />
... ... @@ -185,9 +187,9 @@
android:id="@+id/line2"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_below="@+id/img_logo"
android:layout_below="@+id/tv_industry"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_20"
android:background="#C4C4C4" />
... ... @@ -208,88 +210,43 @@
android:layout_height="wrap_content"
android:layout_below="@id/tv_zhiwei"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="54dp"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:ellipsize="end"
android:lineSpacingExtra="@dimen/dp_20"
android:maxLines="4"
android:text="北京华航唯实机器人科技股份有限公司系一家2013年成立于中关村科技园的全国高新技术企业，公司以离线编程仿真技术的研发和应用为核心，面向职业院校和工业企业两大客户群，主要从事工业机器人离线编程仿真软件、系统集成应用及模块化柔性制造系统的研发、生产和销售。公司是国内较早从事工业机器人离线编程仿真技术的研发和应用的企业之一，公司推出的拥有独立知识产权的"
android:textColor="#4C4C4C"
android:textSize="12sp" />
<View
android:id="@+id/line1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_below="@id/tv_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_20"
android:background="#C4C4C4" />
<TextView
android:id="@+id/tv_lianxi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/line1"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:text="联系方式"
android:textColor="#000000"
android:textSize="14sp" />
<ImageView
android:id="@+id/img_email"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_below="@id/tv_lianxi"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:src="@drawable/email_orange" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/img_email"
android:layout_marginLeft="@dimen/dp_5"
android:layout_toRightOf="@id/img_email"
android:text="请将个人简历发送到"
android:textColor="#4C4C4C"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_youxiang"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/img_email"
android:layout_marginLeft="@dimen/dp_5"
android:layout_toRightOf="@id/img_email"
android:text="邮箱:"
android:textColor="#4C4C4C"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_look_all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/img_email"
android:layout_toRightOf="@id/tv_youxiang"
android:text="www.baidu.com"
android:textColor="#4C4C4C"
android:textSize="12sp" />
android:layout_below="@+id/tv_content"
android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_20"
android:text="查看全部"
android:textColor="@color/color_ff5400"
android:textSize="13sp" />
<View
android:id="@+id/line3"
android:id="@+id/line1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_below="@id/img_email"
android:layout_below="@id/tv_look_all"
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:background="#C4C4C4" />
<TextView
android:id="@+id/tv_dizhi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/line3"
android:layout_below="@id/line1"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:text="工作地址"
... ... @@ -324,7 +281,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_20"
android:src="@mipmap/gongsi"/>
android:src="@mipmap/gongsi" />
<View
android:id="@+id/line4"
... ... @@ -370,8 +327,8 @@
android:layout_below="@id/line5"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:text="推荐职位"
android:layout_marginBottom="@dimen/dp_20"
android:text="推荐职位"
android:textColor="#000000"
android:textSize="14sp" />
... ... @@ -411,7 +368,7 @@
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_20"
android:background="@drawable/circle_blue">
android:background="@drawable/coners_15_orange">
<TextView
android:layout_width="wrap_content"
... ...
... ... @@ -102,7 +102,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_20"
android:background="@drawable/circle_blue"
android:background="@drawable/coners_15_orange"
android:gravity="center"
android:text="一键投递"
android:textColor="#FFFFFF"
... ...
... ... @@ -113,7 +113,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="#C4C4C4" />
android:background="#EDEDED" />
<TextView
android:id="@+id/tv_jieshao"
... ... @@ -154,7 +154,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="#C4C4C4" />
android:background="#EDEDED" />
<TextView
android:id="@+id/tv_map"
... ...
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".fragment.CurriculumScheduleFragment">
<RelativeLayout
android:id="@+id/rl_top"
android:layout_width="match_parent"
... ... @@ -35,9 +36,18 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerview"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_below="@id/rl_top"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20" />
</LinearLayout>
\ No newline at end of file
<TextView
android:id="@+id/tv_none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="您的账号当前没有权限哦~"
android:textColor="#AAAAAA"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
... ...
... ... @@ -15,12 +15,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
<com.youth.banner.Banner
android:id="@+id/img_top"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_160"
android:layout_alignParentTop="true"
android:src="@mipmap/home_top" />
android:layout_alignParentTop="true" />
<LinearLayout
android:id="@+id/lin_title"
... ... @@ -28,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/img_top"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:orientation="horizontal">
<View
... ... @@ -54,13 +53,12 @@
</LinearLayout>
<GridView
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:id="@+id/grid_hotLesson"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_400"
android:layout_below="@+id/lin_title"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:nestedScrollingEnabled="false"
android:numColumns="2"
android:scrollbars="none" />
... ... @@ -71,7 +69,6 @@
android:layout_height="30dp"
android:layout_below="@+id/grid_hotLesson"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="@drawable/stroke_gray"
android:gravity="center"
... ... @@ -107,7 +104,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:text="在线 · 题库"
android:text="在线 · 认证"
android:textColor="#333333"
android:textSize="18sp" />
... ... @@ -118,15 +115,13 @@
android:background="#333333" />
</LinearLayout>
<ListView
<com.hh.xuetubao.Utils.ListViewNesting
android:id="@+id/list_question"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/lin_title1"
android:layout_marginLeft="@dimen/dp_20"
android:scrollbars="none"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20" />
android:scrollbars="none" />
<TextView
android:id="@+id/tv_more_ti"
... ... @@ -184,10 +179,10 @@
<ListView
android:id="@+id/list_company"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_350"
android:layout_height="@dimen/dp_370"
android:layout_below="@+id/lin_title2"
android:scrollbars="none"
android:layout_marginTop="@dimen/dp_20" />
android:layout_marginTop="@dimen/dp_10"
android:scrollbars="none" />
<TextView
android:id="@+id/tv_more_qiye"
... ... @@ -197,7 +192,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_40"
android:layout_marginBottom="@dimen/dp_30"
android:background="@drawable/stroke_gray"
android:gravity="center"
android:text="查看更多"
... ...
... ... @@ -43,16 +43,22 @@
android:text="1小时20分30秒" />
<TextView
android:id="@+id/tv_count"
android:id="@+id/tv_count_people"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_title"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@id/tv_long"
android:text="10万人在学" />
android:text="10" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_title"
android:layout_marginTop="@dimen/dp_15"
android:layout_toRightOf="@id/tv_count_people"
android:text="人在学" />
<View
android:id="@+id/line"
android:layout_width="match_parent"
... ... @@ -95,59 +101,10 @@
android:background="#E6E6E6" />
<TextView
android:id="@+id/tv_teacher"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/line1"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:text="讲师"
android:textColor="#333333"
android:textSize="18sp" />
<ImageView
android:id="@+id/img_user"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:layout_below="@id/tv_teacher"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:src="@mipmap/money" />
<TextView
android:id="@+id/tv_user_name"
android:layout_width="@dimen/dp_66"
android:layout_height="wrap_content"
android:layout_below="@id/tv_teacher"
android:layout_marginTop="@dimen/dp_25"
android:layout_toRightOf="@id/img_user"
android:text="COOL KA"
android:textColor="#333333"
android:textSize="15sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_user_name"
android:layout_alignStart="@id/tv_user_name"
android:layout_marginTop="@dimen/dp_10"
android:text="机器人研发工程师 10年经验"
android:textColor="#999999"
android:textSize="12sp" />
<View
android:id="@+id/line2"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_7"
android:layout_below="@id/img_user"
android:layout_marginTop="@dimen/dp_15"
android:background="#F5F5F5" />
<TextView
android:id="@+id/tv_learned"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/line2"
android:layout_below="@id/line1"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:text="学到技能"
... ...
... ... @@ -338,7 +338,7 @@
android:layout_height="@dimen/dp_50"
android:layout_below="@+id/rl_toudi"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginRight="@dimen/dp_20"
android:background="@drawable/circle_bigconners_orange">
... ...
... ... @@ -18,7 +18,7 @@
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_17"
android:background="@drawable/circle_concers"
android:orientation="horizontal">
... ... @@ -72,6 +72,8 @@
<View
android:layout_width="@dimen/dp_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_5"
android:background="#D7D7D7" />
<LinearLayout
... ... @@ -98,6 +100,8 @@
<View
android:layout_width="@dimen/dp_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_5"
android:background="#D7D7D7" />
<LinearLayout
... ... @@ -124,6 +128,8 @@
<View
android:layout_width="@dimen/dp_1"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_5"
android:background="#D7D7D7" />
<LinearLayout
... ...
... ... @@ -16,7 +16,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_20"
android:text="全部错题"
android:textColor="@color/color_ffffff"
android:textSize="12sp" />
... ... @@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_wrong"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:text="20"
android:textColor="@color/color_ffffff"
android:textSize="60sp" />
... ...
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content">
<ImageView
... ... @@ -16,7 +16,7 @@
<TextView
android:id="@+id/tv_lesson"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_40"
android:layout_height="wrap_content"
android:layout_below="@id/img"
android:layout_alignStart="@id/img"
android:layout_marginTop="@dimen/dp_10"
... ... @@ -41,7 +41,7 @@
android:layout_below="@id/tv_lesson"
android:layout_marginTop="@dimen/dp_10"
android:layout_toRightOf="@+id/tv_count"
android:text="万人在学"
android:text="人在学"
android:textColor="#AAAAAA"
android:textSize="12sp" />
... ...
... ... @@ -4,14 +4,12 @@
android:layout_height="match_parent">
<TextView
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_15"
android:id="@+id/content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#F8F8F8"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:text="民营"
android:textColor="#A9A9A9"
... ...
... ... @@ -33,73 +33,95 @@
android:text="广东 深圳市"
android:textColor="#232323"
android:textSize="14sp" />
<!--
<LinearLayout
android:id="@+id/lin_biaoqian1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/img"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#F8F8F8"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:text="民营"
android:textColor="#A9A9A9"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:background="#F8F8F8"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:text="1-50人"
android:textColor="#A9A9A9"
android:textSize="11sp" />
<TextView
<LinearLayout
android:id="@+id/lin_biaoqian1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:background="#F8F8F8"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:text="汽车行业"
android:textColor="#A9A9A9"
android:textSize="11sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:background="#F8F8F8"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:text="金属加工"
android:textColor="#A9A9A9"
android:textSize="11sp" />
</LinearLayout>
android:layout_below="@id/img"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#F8F8F8"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:textColor="#A9A9A9"
android:textSize="11sp" />
<TextView
android:id="@+id/tv_two"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:background="#F8F8F8"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:textColor="#A9A9A9"
android:textSize="11sp" />
<TextView
android:id="@+id/tv_three"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:background="#F8F8F8"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:textColor="#A9A9A9"
android:textSize="11sp" />
<TextView
android:id="@+id/tv_four"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:background="#F8F8F8"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:textColor="#A9A9A9"
android:textSize="11sp" />
<TextView
android:id="@+id/tv_five"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:background="#F8F8F8"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5"
android:textColor="#A9A9A9"
android:textSize="11sp" />
</LinearLayout>
-->
<android.support.v7.widget.RecyclerView
android:id="@+id/list_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/address"
android:layout_marginTop="@dimen/dp_20"
android:nestedScrollingEnabled="false" />
<View
android:id="@+id/line3"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_below="@id/lin_biaoqian1"
android:layout_below="@id/list_label"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_20"
... ... @@ -111,7 +133,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/line3"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:text="热招："
android:textColor="#9B9B9B"
android:textSize="12sp" />
... ... @@ -121,7 +143,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/line3"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_toRightOf="@id/tv1"
android:text="销售工程师"
android:textColor="#FF5500"
... ... @@ -132,7 +154,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/line3"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_toRightOf="@id/job"
android:text="等"
android:textColor="#9B9B9B"
... ... @@ -143,7 +165,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/line3"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_toRightOf="@id/tv2"
android:text="2"
android:textColor="#9B9B9B"
... ... @@ -153,7 +175,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/line3"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"
android:layout_toRightOf="@id/job_count"
android:text="个职位"
android:textColor="#9B9B9B"
... ... @@ -164,17 +186,17 @@
android:layout_height="@dimen/dp_30"
android:layout_below="@id/line3"
android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/dp_7"
android:layout_marginTop="@dimen/dp_13"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_20"
android:src="@mipmap/into" />
<View
android:id="@+id/line4"
android:visibility="gone"
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:background="#D7D7D7"
android:visibility="gone" />
</RelativeLayout>
... ...
... ... @@ -52,7 +52,15 @@
android:layout_alignBottom="@id/img"
android:layout_marginLeft="@dimen/dp_5"
android:layout_toRightOf="@id/tv_dian"
android:text="1万人在学"
android:text="1"
android:textColor="#AAAAAA"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/img"
android:layout_toRightOf="@id/tv_count"
android:text="人在学"
android:textColor="#AAAAAA"
android:textSize="12sp" />
... ...
... ... @@ -17,7 +17,7 @@
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_100"
android:layout_above="@+id/tv_day"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_5"
android:background="@drawable/tall" />
... ...
... ... @@ -10,7 +10,7 @@
android:padding="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_20"
android:background="@drawable/stoke_gray_coners"
android:background="@drawable/stoke_gray_bigconers"
android:layout_height="wrap_content" />
</RelativeLayout>
... ...
... ... @@ -3,13 +3,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_alignParentTop="true"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="#EEEEEE" />
<TextView
android:id="@+id/job"
... ... @@ -75,8 +68,18 @@
<View
android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
android:layout_below="@+id/rec_label" />
<View
android:id="@+id/line"
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>
... ...
... ... @@ -85,7 +85,7 @@
android:layout_below="@id/tv_free"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/tv_count"
android:text="万人在学"
android:text="人在学"
android:textColor="#AAAAAA"
android:textSize="12sp" />
... ...
... ... @@ -27,7 +27,8 @@
android:layout_toRightOf="@id/label"
android:text="在线时长"
android:textColor="#232323"
android:textSize="13sp" />
android:textSize="13sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_pq"
... ... @@ -87,5 +88,5 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:background="#000000" />
android:background="#E4E4E4" />
</RelativeLayout>
... ...
... ... @@ -20,4 +20,5 @@
<color name="color_575757">#575757</color>
<color name="color_333333">#333333</color>
<color name="color_e4e4e4">#E4E4E4</color>
<color name="color_616161">#616161</color>
</resources>
... ...