张涛 / huahang_project · 提交

转到一个项目

作者 zhangtao
提交 db3fb6a4fd472801edda9a8a6213eb66c0678903 1 个父辈 2654c3c3

代码提交

内嵌 并排对比
正在显示 13 个修改的文件 包含 79 行增加 和 33 行删除
... ... @@ -42,11 +42,11 @@
<activity
android:name=".MainActivity"
android:launchMode="singleTask">
<!-- <intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>-->
</intent-filter>
</activity>
<activity
android:name=".activity.personal.InfromationActivity"
... ... @@ -93,11 +93,11 @@
<activity
android:name=".activity.login.LoginActivity"
android:screenOrientation="portrait">
<intent-filter>
<!-- <intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</intent-filter>-->
</activity>
<activity
android:name=".activity.personal.MoneyHistoryActivity"
... ...
... ... @@ -150,8 +150,6 @@ public interface MyServer {
Observable<UserBean> mobileLogin(@Query("mobileNumber") String mobileNumber, @Query("verCode") String verCode);
/**
<<<<<<< HEAD
=======
* 微信绑定手机
*
* @param OpenId
... ... @@ -165,7 +163,6 @@ public interface MyServer {
/**
>>>>>>> liming
* 微信登录接口
*
* @param wxOpenId 微信用户的OpenId
... ... @@ -458,7 +455,7 @@ public interface MyServer {
* @return
*/
@GET("GetJobPropList")
Observable<AddressBean> GetJobPropList(@Query("PropType") int PropType, @Query("IsAll") boolean IsAll);
Observable<AddressBean> GetJobPropList(@Query("PropType") int PropType, @Query("IsAll") boolean IsAll);
/**
* 获取模拟题基本信息接口
... ... @@ -525,12 +522,13 @@ public interface MyServer {
* 删除用户错题接口
*
* @param accountOid
* @param catalogOid
* @param wrongQuestionType
* @param questionOid 题目ID
* @param wrongQuestionType 0：练习，1：模拟题
* @param catalogOid 当前目录ID
* @return
*/
@GET("RemoveWrongQuestion")
Observable<AnswerBean> RemoveWrongQuestion(@Query("accountOid") String accountOid, @Query("catalogOid") String catalogOid, @Query("wrongQuestionType") int wrongQuestionType);
Observable<AnswerBean> RemoveWrongQuestion(@Query("accountOid") String accountOid, @Query("questionOid") String questionOid, @Query("wrongQuestionType") int wrongQuestionType, @Query("catalogOid") String catalogOid);
/**
* 获取随机习题列表接口
... ...
... ... @@ -3,6 +3,7 @@ package com.hh.xuetubao.activity.personal;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
... ... @@ -58,10 +59,11 @@ public class DeliveryActivity extends BaseMvpActivity<CommonPresenter, ZhaopinMo
String headPic = SharedPrefrenceUtils.getString(this, "HeadPic");
String userName = SharedPrefrenceUtils.getString(this, "UserName");
if (reallHeader != null && reallHeader != "") {
Glide.with(this).load(reallHeader).into(imgUser);
} else if (headPic != null && headPic != "") {
if (headPic != null && headPic != "") {
Glide.with(this).load(headPic).into(imgUser);
Log.e("zhangtao", headPic);
} else if (reallHeader != null && reallHeader != "") {
Glide.with(this).load(reallHeader).into(imgUser);
}
if (userName != null) {
tvUser.setText(userName);
... ...
... ... @@ -89,11 +89,11 @@ public class AnswerWrongActivity extends BaseMvpActivity<CommonPresenter, Exerci
private int rightCount;//答对题的数量
private int wrongCount;//答错题的数量
private AnswerSheetGridAdapter sheetGridAdapter;
private String resumeOid;
private String accountOid;
@Override
public void initView() {
resumeOid = SharedPrefrenceUtils.getString(this, "AccountOid");
accountOid = SharedPrefrenceUtils.getString(this, "AccountOid");
catalogOid = getIntent().getStringExtra("catalogOid");
rlLast.setOnClickListener(this);
... ... @@ -178,7 +178,7 @@ public class AnswerWrongActivity extends BaseMvpActivity<CommonPresenter, Exerci
option.setVisibility(View.GONE);
String questionOid = questionList.get(position).getQuestionOid();
mPresenter.getPresenter(4, 2, resumeOid, questionOid, String.valueOf(1));
mPresenter.getPresenter(4, 2, accountOid, questionOid, String.valueOf(1));
wrongCount++;
tvWrongNum.setText(String.valueOf(wrongCount));
... ... @@ -200,7 +200,7 @@ public class AnswerWrongActivity extends BaseMvpActivity<CommonPresenter, Exerci
@Override
public void initData() {
mPresenter.getPresenter(7, 1, resumeOid, catalogOid, String.valueOf(1));
mPresenter.getPresenter(7, 1, accountOid, catalogOid, String.valueOf(1));
}
@Override
... ... @@ -306,7 +306,7 @@ public class AnswerWrongActivity extends BaseMvpActivity<CommonPresenter, Exerci
String questionOid = questionList.get(currentIndex).getQuestionOid();
mPresenter.getPresenter(4, 2, resumeOid, questionOid, String.valueOf(1));
mPresenter.getPresenter(4, 2, accountOid, questionOid, String.valueOf(1));
}
currentIndex++;
index.setText(String.valueOf(currentIndex + 1));
... ...
... ... @@ -6,6 +6,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
... ... @@ -117,6 +118,7 @@ public class CompanyActivity extends BaseMvpActivity<CommonPresenter, ZhaopinMod
requsetBody = new CompanySearchBody();
requsetBody.setPage(1);
requsetBody.setPageSize(10);
requsetBody.setSearchName(edSearch.getText().toString());
doRequset(requsetBody);
}
});
... ... @@ -256,6 +258,7 @@ public class CompanyActivity extends BaseMvpActivity<CommonPresenter, ZhaopinMod
}
private void doRequset(CompanySearchBody body) {
MyServer myServer = HttpUtils.getInstance().getServer(NetConfig.zhaopinUrl);
myServer.CompanySearch(body)
.subscribeOn(Schedulers.io())
... ... @@ -547,6 +550,12 @@ public class CompanyActivity extends BaseMvpActivity<CommonPresenter, ZhaopinMod
final GridViewAdapter adapter1 = new GridViewAdapter(zhinengList, this);
gridTwo.setAdapter(adapter1);
final PopupWindow popupWindow = new PopupWindow(contentView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, true);
popupWindow.setOutsideTouchable(true);
popupWindow.setTouchable(true);
chageAlpha(0.5f);
popupWindow.showAsDropDown(linLeibie);
gridOne.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
... ... @@ -566,12 +575,6 @@ public class CompanyActivity extends BaseMvpActivity<CommonPresenter, ZhaopinMod
}
});
final PopupWindow popupWindow = new PopupWindow(contentView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, true);
popupWindow.setOutsideTouchable(true);
popupWindow.setTouchable(true);
chageAlpha(0.5f);
popupWindow.showAsDropDown(linLeibie);
reset.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
... ...
... ... @@ -82,15 +82,15 @@ public class AddressBean implements Serializable {
}
public class CityListBean {
private String CityId;
private String CityOid;
private String CityName;
public String getCityId() {
return CityId;
return CityOid;
}
public void setCityId(String cityId) {
CityId = cityId;
CityOid = cityId;
}
public String getCityName() {
... ... @@ -103,15 +103,15 @@ public class AddressBean implements Serializable {
}
public class PropListBean {
private String PropId;
private String PropOid;
private String PropName;
public String getPropId() {
return PropId;
return PropOid;
}
public void setPropId(String propId) {
PropId = propId;
PropOid = PropOid;
}
public String getPropName() {
... ...
... ... @@ -111,4 +111,22 @@ public class CompanySearchBody implements Serializable {
public void setCompanySize(String companySize) {
CompanySize = companySize;
}
@Override
public String toString() {
return "CompanySearchBody{" +
"Page=" + Page +
", PageSize=" + PageSize +
", ProvinceId='" + ProvinceId + '\'' +
", CityId='" + CityId + '\'' +
", SearchName='" + SearchName + '\'' +
", CompanyIndustry='" + CompanyIndustry + '\'' +
", CompanyNature='" + CompanyNature + '\'' +
", CompanySize='" + CompanySize + '\'' +
", JobFunction='" + JobFunction + '\'' +
", Education='" + Education + '\'' +
", Exprience='" + Exprience + '\'' +
", JobNature='" + JobNature + '\'' +
'}';
}
}
... ...
... ... @@ -111,4 +111,22 @@ public class JobSearchBody implements Serializable {
public void setCompanySize(String companySize) {
CompanySize = companySize;
}
@Override
public String toString() {
return "JobSearchBody{" +
"Page=" + Page +
", PageSize=" + PageSize +
", ProvinceId='" + ProvinceId + '\'' +
", CityIdId='" + CityIdId + '\'' +
", SearchName='" + SearchName + '\'' +
", CompanyIndustry='" + CompanyIndustry + '\'' +
", JobFunction='" + JobFunction + '\'' +
", JobNature='" + JobNature + '\'' +
", Education='" + Education + '\'' +
", Exprience='" + Exprience + '\'' +
", CompanyNature='" + CompanyNature + '\'' +
", CompanySize='" + CompanySize + '\'' +
'}';
}
}
... ...
... ... @@ -9,6 +9,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
... ... @@ -121,6 +122,8 @@ public class OfficeFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMode
requestBody.setSearchName(edSearch.getText().toString());
doRequset(requestBody);
Log.e("zhangtao:Jobreqeust",requestBody.toString());
Log.e("zhangtao:A","=========================");
}
});
}
... ... @@ -260,6 +263,8 @@ public class OfficeFragment extends BaseMvpFragment<CommonPresenter, ZhaopinMode
}
private void doRequset(JobSearchBody body) {
Log.e("zhangtao:request", body.toString());
Log.e("zhangtao", "=================================================");
MyServer myServer = HttpUtils.getInstance().getServer(NetConfig.zhaopinUrl);
myServer.JobSearch(body)
.subscribeOn(Schedulers.io())
... ...
... ... @@ -24,7 +24,7 @@
android:layout_height="@dimen/dp_60"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_80"
android:src="@mipmap/toudi_sucess" />
android:src="@drawable/toudi_sucess" />
<TextView
android:id="@+id/tv_sucess"
... ...
... ... @@ -60,7 +60,7 @@
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_20"
android:background="#FFFFFF">
android:background="@drawable/coners_5_stoke">
<com.hh.xuetubao.Utils.CircleImageView
android:id="@+id/img_user"
... ...
... ... @@ -21,4 +21,6 @@
<color name="color_333333">#333333</color>
<color name="color_e4e4e4">#E4E4E4</color>
<color name="color_616161">#616161</color>
<color name="color_dddddd">#DDDDDD</color>
<color name="color_6666666">#666666</color>
</resources>
... ...