Skip to content

android / dayu

Go to a project
Commit da9877a5 by yu
Options

2017/10/14 第三次提交 

     消息还未完善,另外还有些许小bug
parent fc4d3d68
Inline Side-by-side
Showing with 1702 additions and 691 deletions
.idea/dictionaries/yu.xml 100644 → 100755
File mode changed from 100644 to 100755
.idea/inspectionProfiles/Project_Default.xml 100644 → 100755
File mode changed from 100644 to 100755
.idea/inspectionProfiles/profiles_settings.xml 100644 → 100755
File mode changed from 100644 to 100755
app/build.gradle
......@@ -27,7 +27,7 @@ android {
minSdkVersion 15
targetSdkVersion 23
versionCode 1
versionName "1.0"
versionName "1.0.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
}
......
app/libs/eventbus-3.0.0.jar 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/AndroidManifest.xml
......@@ -89,6 +89,7 @@
<activity android:name=".activity.AboutUs"/>
<activity android:name=".activity.IdeaActivity"/>
<activity android:name=".activity.WorksheetRecordActivity"/>
<activity android:name=".activity.MessageActivity"/>
</application>
</manifest>
\ No newline at end of file
app/src/main/assets/fonts/DIN Alternate Bold.ttf 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/Constants.java
......@@ -2,21 +2,27 @@ package com.dayu.bigfish;
import com.dayu.bigfish.utils.LogUtils;
import static android.R.id.message;
/**
* Created by MrWang on 2017/8/20.
*/
public class Constants {
/**************************微服务测试路径*******************************/
public static final String BASE_USER = "http://47.94.101.239:7100/";
public static final String BASE_ORDER = "http://47.94.101.239:7200/";
public static final String BASE_OTHER = "http://47.94.101.239:7300/";
public static final String BASE_COUNT = "http://47.94.101.239:7500/";
/**************************正式环境路径*******************************/
public static final String BASE_URL = "http://mobile.dayu.ai";
/**************************测试环境*******************************/
public static final String BASE_USER = "https://47.94.101.239:7100/";
public static final String BASE_ORDER = "https://47.94.101.239:7200/";
public static final String BASE_OTHER = "https://47.94.101.239:7300/";
public static final String BASE_MESSAGE = "https://47.94.101.239:7400/";
public static final String BASE_COUNT = "https://47.94.101.239:7500/";
public static final String BASE_TEST = "http://47.94.101.239:3112";
/**************************正式根环境路径*******************************/
public static final String BASE_URL = "https://mobile.dayu.ai";
//登录的URL
public static final String LOGIN_URL = BASE_USER + "account/appLogin";
public static final String LOGIN_URL = BASE_URL+"/check";
/**************************测试环境*******************************/
/*//登录的URL
public static final String LOGIN_URL = "http://47.94.101.239:3112/check";
//登录时发送验证码的URL
public static final String REGISTER_URL = BASE_USER + "account/loginSms/";
//根据工单状态获取分页工单信息的路径
......@@ -33,6 +39,9 @@ public class Constants {
//开始服务
public static final String START_SERVE = BASE_ORDER + "orders/onWorking/";
//工单详情信息,包含评价,投诉,服务记录
//"http://47.94.101.239:7200/orders/" + orderId + "/detail"
public static final String ORDER_DETAILS = BASE_ORDER+"orders/";
//工单完成,提交验收报告
public static final String ORDER_FINISH = BASE_ORDER + "orders/waitCustomerCheck";
//个人中心
public static final String PERSONAL_CENTER = BASE_USER + "engineerInfo/accountId/";
......@@ -56,9 +65,53 @@ public class Constants {
public final static String WORKSSHEET_RECORD = BASE_ORDER + "orders/findSimpleOrderVOByPage";
//获取首页tab状态的数量
public final static String TAB_NUM = BASE_ORDER + "orders/";
public final static String MESSAGE_HX = BASE_MESSAGE+"hXMessage";
*/
/***********************测试环境2.0配置**********************************/
/* //登录的URL
public static final String LOGIN_URL = "http://47.94.101.239:3112/check";
//登录时发送验证码的URL
public static final String REGISTER_URL = BASE_TEST + "/api-user/" + "account/loginSms/";
//根据工单状态获取分页工单信息的路径
public static final String ORDER_URL = BASE_TEST + "/api-order/" + "orders/findSimpleOrderVOByPage";
//异常单获取
public static final String ERROR_ORDER = BASE_TEST + "/api-order/" + "orders/findExceptionSimpleOrderVO";
//工程师接单
public static final String ORDER_RECEIVING = BASE_TEST + "/api-order/" + "orders/";
//再次上门、重新预约时间
public static final String ORDER_DOOR = BASE_TEST + "/api-order/" + "orders/bespeakDoor";
//开始出发
public static final String START_ORDER = BASE_TEST + "/api-order/" + "orders/onWay/";
//开始服务
public static final String START_SERVE = BASE_TEST + "/api-order/" + "orders/onWorking/";
//工单详情信息,包含评价,投诉,服务记录
public static final String ORDER_DETAILS = BASE_TEST+"/api-order/"+"orders/";
//工单完成,提交验收报告
public static final String ORDER_FINISH = BASE_TEST + "/api-order/" + "orders/waitCustomerCheck";
//个人中心
public static final String PERSONAL_CENTER = BASE_TEST + "/api-user/" + "engineerInfo/accountId/";
//单表查询工单记录
public final static String SELECT_ORDER = BASE_TEST + "/api-order/" + "orders/";
//根据工程师id和工程师id获取今日业绩(今日收益)
public final static String USER_ORDER_REVENUE = BASE_TEST + "/api-count/" + "ordersStatistics/income/";
//根据站点id和工程师id获取工程师今日接单数量
public final static String USER_ORDER_RECEIVING = BASE_TEST + "/api-count/" + "ordersStatistics/tasks/";
//服务记录、工程师评价
public final static String USER_REVENUE = BASE_TEST + "/api-count/" + "ordersStatistics/total/";
//反馈提交
public final static String SET_IDEA_COMMIT = BASE_TEST + "/api-base/" + "suggest";
//版本更新检测
public final static String UPDATA_VERSION = BASE_TEST + "/api-base/" + "appVersion/newestVersion/appId/";
//版本更新、获取新版本信息
public final static String UPGRADE_VERSION = BASE_TEST + "/api-base/" + "appVersion/versionInfo";
public final static String COMMIT_VERSION_INFO = BASE_TEST + "/api-base/" + "versionUpgrade";
//工单记录/搜索工单
public final static String WORKSSHEET_RECORD = BASE_TEST + "/api-order/" + "orders/findSimpleOrderVOByPage";
//获取首页tab状态的数量
public final static String TAB_NUM = BASE_TEST + "/api-order/" + "orders/";
public final static String MESSAGE_HX = BASE_TEST+"/api-message/"+"hXMessage";
*/
/**************************正式环境*******************************/
/*//登录的URL
public static final String LOGIN_URL = BASE_URL + "/api-user/" + "account/appLogin";
//登录时发送验证码的URL
public static final String REGISTER_URL = BASE_URL + "/api-user/" + "account/loginSms/";
//根据工单状态获取分页工单信息的路径
......@@ -74,6 +127,8 @@ public class Constants {
//开始服务
public static final String START_SERVE = BASE_URL + "/api-order/" + "orders/onWorking/";
//工单详情信息,包含评价,投诉,服务记录
public static final String ORDER_DETAILS = BASE_URL+"/api-order/"+"orders/";
//工单完成,提交验收报告
public static final String ORDER_FINISH = BASE_URL + "/api-order/" + "orders/waitCustomerCheck";
//个人中心
public static final String PERSONAL_CENTER = BASE_URL + "/api-user/" + "engineerInfo/accountId/";
......@@ -95,7 +150,9 @@ public class Constants {
//工单记录/搜索工单
public final static String WORKSSHEET_RECORD = BASE_URL + "/api-order/" + "orders/findSimpleOrderVOByPage";
//获取首页tab状态的数量
public final static String TAB_NUM = BASE_URL + "/api-order/" + "orders/";*/
public final static String TAB_NUM = BASE_URL + "/api-order/" + "orders/";
//环信消息
public final static String MESSAGE_HX = BASE_URL+"/api-message/"+"hXMessage";
/***********************其他配置**********************************/
......@@ -111,5 +168,7 @@ public class Constants {
public final static String SITE_ID = "siteId/";
public final static String TAB_NUM_COUNT = "/count";
public final static String ORDER_TEMP = "/detail";
}
app/src/main/java/com/dayu/bigfish/MainActivity.java
......@@ -25,7 +25,9 @@ import android.view.WindowManager;
import android.widget.Toast;
import com.dayu.bigfish.activity.HomeActivity;
import com.dayu.bigfish.activity.LoginActivity;
import com.dayu.bigfish.activity.MessageActivity;
import com.dayu.bigfish.bean.BaseStringBean;
import com.dayu.bigfish.bean.InformBean;
import com.dayu.bigfish.bean.MessageTell;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.bean.VersionBase;
......@@ -77,36 +79,7 @@ public class MainActivity extends AppCompatActivity {
//判断userInfo中是否有数据
if (UserManager.getInstance().hasUserInfo(this)) {
//进入主页面,无需登录
//联网检测当前是否为最新版本
OkGo.get(Constants.UPDATA_VERSION + "dayushifua_dayu")
.tag(this)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
BaseStringBean baseStringBean = gson.fromJson(s, BaseStringBean.class);
if (baseStringBean.getCode() == 0) {
if (!(getPackageNum().equals(baseStringBean.getData()))) {
ToastUtils.showShortToast("需要更新");
upgradeVersion(baseStringBean.getData());
} else {
// commitVersionInfo(userId, getIMEI(MainActivity.this), getPackageNum());
ToastUtils.showShortToast("当前是最新版本,无需更新");
startHomeActivity();
}
} else {
ToastUtils.showShortToast("检测更新版本失败");
startHomeActivity();
}
}
@Override
public void onError(Call call, Response response, Exception e) {
ToastUtils.showShortToast("网络或服务器异常,检测版本失败");
startHomeActivity();
}
});
startHomeActivity();
} else {
//userInfo没有找到关于用户的信息，打开登录页面
startLoginActivity();
......@@ -138,22 +111,26 @@ public class MainActivity extends AppCompatActivity {
for (EMMessage list : messages) {
System.out.println("收到消息" + list.getBody());
System.out.println("----->----->" + list.ext());
Intent intent = new Intent(MainActivity.this, HomeActivity.class);
Intent intent = new Intent(MainActivity.this, MessageActivity.class);
PendingIntent pi = PendingIntent.getActivity(MainActivity.this,
0, intent, 0);
String str=list.getBody().toString();
str=str.substring(3);
//str=str.Substring(3);
Gson gson = new Gson();
InformBean informBean = gson.fromJson(list.ext().toString(), InformBean.class);
Notification.Builder builder = new Notification.Builder(MainActivity.this);
builder
// 设置打开通知，该通知取消
.setAutoCancel(true)
// 设置通知提示信息
.setTicker("有新消息")
.setTicker("工单有新消息")
// 设置通知的图标
.setSmallIcon(R.mipmap.logo)
// 设置通知的标题
.setContentTitle(list.getFrom())
// .setContentTitle(list.getFrom())
.setContentTitle(informBean.getTitle())
// 设置通知的内容
.setContentText(str)
// 设置使用系统默认的声音、LED
......@@ -169,7 +146,7 @@ public class MainActivity extends AppCompatActivity {
Notification notification = builder.build();
NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
manager.notify(ID, notification);
MessageTell messageTell = new Gson().fromJson(list.ext().toString(), MessageTell.class);
// if (messageTell.getFunctionType().equals("1")) {
// }else{
......@@ -230,109 +207,8 @@ public class MainActivity extends AppCompatActivity {
}
/**
* 获取当前应用的版本号
*/
public String getPackageNum() {
try {
PackageInfo packageInfo = this.getPackageManager().getPackageInfo(this.getPackageName(), 0);
String packageName = packageInfo.versionName;
return packageName;
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
return "解析版本号失败";
}
}
/**
* 获取新版本的信息
*/
public void upgradeVersion(String versionCode) {
//?appId=dayushifua_dayu&versionCode=1.10.1
OkGo.get(Constants.UPGRADE_VERSION)
.tag(this)
.params("appId", "dayushifua_dayu")
.params("versionCode", versionCode)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
VersionBase versionBase = gson.fromJson(s, VersionBase.class);
if (versionBase.getCode() == 0) {
//弹窗
showUpdateDialog(versionBase.getData().getUpgradePrompt(), versionBase.getData().getDownloadUrl());
} else {
ToastUtils.showShortToast("获取新版本信息失败");
startHomeActivity();
//SPUtils.get(MainActivity.this,"big_fish")
}
}
@Override
public void onError(Call call, Response response, Exception e) {
ToastUtils.showShortToast("网络或服务器异常,获取新版本APK失败");
startHomeActivity();
}
});
}
/**
* 弹窗选择是否更新(软更新)
* @param upgradePrompt 提示语
* @param downloadPath 下载的路径
*/
private void showUpdateDialog(String upgradePrompt, String downloadPath) {
AlertDialog.Builder alertDialog = new AlertDialog.Builder(this);
alertDialog.setCancelable(false);//设置点击弹窗外部区域，会话框不能消失
alertDialog.setTitle("有新版本啦");
alertDialog.setMessage(upgradePrompt);
alertDialog.setPositiveButton("下次再说", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
startHomeActivity();
}
});
alertDialog.setNegativeButton("立刻升级", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
pd = new ProgressDialog(MainActivity.this);//创建进度条对话框
pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);//设置进度条样式为水平方向
pd.show();//显示进度条对话框
File sdDir = Environment.getExternalStorageDirectory();
File file = new File(sdDir, SystemClock.uptimeMillis() + ".apk");
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
HttpUtils httpUtils = new HttpUtils();
httpUtils.download(downloadPath, file.getAbsolutePath(), new RequestCallBack<File>() {
@Override
public void onSuccess(ResponseInfo<File> responseInfo) {
pd.dismiss(); //关闭进度条对话框
Toast.makeText(MainActivity.this, "下载成功", Toast.LENGTH_SHORT).show();
/*覆盖安装APK*/
Intent intent = new Intent();
intent.setAction("android.intent.action.VIEW");
intent.addCategory("android.intent.category.DEFAULT");
intent.setDataAndType(Uri.fromFile(responseInfo.result),
"application/vnd.android.package-archive");
startActivity(intent);
}
@Override
public void onFailure(HttpException e, String s) {
pd.dismiss();
Toast.makeText(MainActivity.this, "下载失败", Toast.LENGTH_SHORT).show();
}
@Override
public void onLoading(long total, long current, boolean isUploading) {
super.onLoading(total, current, isUploading);
pd.setMax((int) total); //设置进度条最大值
pd.setProgress((int) current); //设置进度条最小值
}
});
}
}
});
alertDialog.show();
}
}
app/src/main/java/com/dayu/bigfish/activity/AboutUs.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/activity/AgainUpDoorActivity.java 100644 → 100755
......@@ -24,6 +24,7 @@ import com.dayu.bigfish.bean.BaseBean;
import com.dayu.bigfish.eventbus.AgainUpDoorText;
import com.dayu.bigfish.eventbus.UpdataTime;
import com.dayu.bigfish.utils.DateUtils;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import com.google.gson.Gson;
......@@ -83,6 +84,7 @@ public class AgainUpDoorActivity extends Activity {
private int orderId;
Calendar calendar = Calendar.getInstance(Locale.CHINA);
private String edValue;
private String token;
private DateUtils dateUtils = new DateUtils();
@Override
......@@ -90,6 +92,7 @@ public class AgainUpDoorActivity extends Activity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_again_door);
ButterKnife.bind(this);
token = GetUserInfo.getToken(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog);
initData();
}
......@@ -186,20 +189,21 @@ public class AgainUpDoorActivity extends Activity {
//initNetWork(orderId, "2017-18-23 15:34:00", edValue);
String time= dateUtils.stringTimeTo(textDateValue.getText().toString());
String timeValue = time+textTimeValue.getText().toString()+":00";
initNetWork(orderId, timeValue, edValue);
initNetWork(orderId, timeValue, edValue,token);
}
break;
}
}
public void initNetWork(int orderId, String doorTime, String doorComment) {
public void initNetWork(int orderId, String doorTime, String doorComment,String token) {
OkGo.post(Constants.ORDER_DOOR)
.tag(this)
.params("orderId", orderId)
//params("doorTime", calendar.getTime().toString())
.params("doorTime", doorTime)
.params("doorComment", doorComment)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......
app/src/main/java/com/dayu/bigfish/activity/HomeActivity.java
package com.dayu.bigfish.activity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.AssetManager;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
import android.os.SystemClock;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
......@@ -13,6 +20,7 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
......@@ -20,24 +28,34 @@ import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.FragmentHomeAdapter;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.LoginBean;
import com.dayu.bigfish.bean.TabBean;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.fragment.HomeEndTabFragment;
import com.dayu.bigfish.fragment.HomeOneTabFragment;
import com.dayu.bigfish.fragment.HomeThreeTabFragment;
import com.dayu.bigfish.fragment.HomeTwoTabFragment;
import com.dayu.bigfish.moudle.home.HomePresenter;
import com.dayu.bigfish.moudle.home.HomeView;
import com.dayu.bigfish.moudle.login.LoginPresenter;
import com.dayu.bigfish.moudle.receiving.Receiving;
import com.dayu.bigfish.utils.DpToPxUtils;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.LogUtils;
import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CircleImageView;
import com.dayu.bigfish.views.CustomProgressDialog;
import com.google.gson.Gson;
import com.lidroid.xutils.HttpUtils;
import com.lidroid.xutils.exception.HttpException;
import com.lidroid.xutils.http.ResponseInfo;
import com.lidroid.xutils.http.callback.RequestCallBack;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.io.File;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
......@@ -57,8 +75,6 @@ import static com.dayu.bigfish.R.id.tabicon;
*/
public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implements HomeView {
@BindView(R.id.imageView_circle)
CircleImageView imageViewCircle;
@BindView(R.id.image_phone)
......@@ -67,6 +83,8 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
TabLayout homeTabLayout;
@BindView(R.id.view_pager)
ViewPager viewPager;
@BindView(R.id.image_inform)
ImageView imageInform;
private HomePresenter mHomePresenter;
private TextView textView_number_one;//用来接收第一个tab的标签数字
......@@ -75,18 +93,23 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
private TextView textView1; //......
private TextView textView_number2;
private TextView textView2;
public List<Fragment> list_fragments;
private FragmentHomeAdapter adapter;
public List<Fragment> list_fragments;
private FragmentHomeAdapter adapter;
private TextView textView_number;
private int userId;
private int userId;
private String imageUrl;//图片的Url
// private LoginBean loginBean = new LoginBean();
private TabBean mTabBean;
private CustomProgressDialog dialog;
private Boolean isTrue = false;
private String token;
private ProgressDialog pd; //进度条对话框
@Override
public void initView() {
Intent intent = getIntent();
imageUrl = intent.getStringExtra("imageUrl");
System.out.println("照片的路径为:----->"+imageUrl);
System.out.println("照片的路径为:----->" + imageUrl);
Glide.with(this)
.load(imageUrl)
.placeholder(R.mipmap.user_head)
......@@ -94,11 +117,26 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
.into(imageViewCircle);
}
/**
* 获取当前应用的版本号
*/
public String getPackageNum() {
try {
PackageInfo packageInfo = this.getPackageManager().getPackageInfo(this.getPackageName(), 0);
String packageName = packageInfo.versionName;
return packageName;
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
return "解析版本号失败";
}
}
@Override
public void initData() {
userId= GetUserInfo.getACCOUNT_ID(this);
viewPager.setOffscreenPageLimit(0);
userId = GetUserInfo.getACCOUNT_ID(this);
// viewPager.setOffscreenPageLimit(0);
list_fragments = new ArrayList<>();
list_fragments.add(new HomeOneTabFragment());
list_fragments.add(new HomeTwoTabFragment());
......@@ -107,9 +145,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
adapter = new FragmentHomeAdapter(getSupportFragmentManager(), list_fragments);
viewPager.setAdapter(adapter);
homeTabLayout.setupWithViewPager(viewPager);
homeTabLayout.removeAllTabs();
initNetWorkTabNum(userId);
setTabNum("0","0","0","0");
initNetWorkTabNum(userId, token);
homeTabLayout.setTabMode(TabLayout.MODE_FIXED);
homeTabLayout.post(new Runnable() {
@Override
......@@ -118,22 +154,15 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
//拿到tabLayout的mTabStrip属性
Field mTabStripField = homeTabLayout.getClass().getDeclaredField("mTabStrip");
mTabStripField.setAccessible(true);
LinearLayout mTabStrip = (LinearLayout) mTabStripField.get(homeTabLayout);
int dp10 = DpToPxUtils.dip2px(HomeActivity.this, 10);
for (int i = 0; i < mTabStrip.getChildCount(); i++) {
View tabView = mTabStrip.getChildAt(i);
//拿到tabView的mTextView属性
Field mTextViewField = tabView.getClass().getDeclaredField("mTextView");
mTextViewField.setAccessible(true);
TextView mTextView = (TextView) mTextViewField.get(tabView);
tabView.setPadding(0, 0, 0, 0);
//因为想要的效果是 字多宽线就多宽，所以测量mTextView的宽度
int width = 0;
width = mTextView.getWidth();
......@@ -229,37 +258,52 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
}
});
}
/**
* 请求服务器tab的
* */
private void initNetWorkTabNum(int userId) {
OkGo.get(Constants.TAB_NUM+userId+Constants.TAB_NUM_COUNT)
*/
private void initNetWorkTabNum(int userId, String token) {
dialog.show();
OkGo.get(Constants.TAB_NUM + userId + Constants.TAB_NUM_COUNT)
.tag(this)
.headers("token", token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
TabBean tabBean = gson.fromJson(s, TabBean.class);
if (tabBean.getCode()==0){
// tabBean.getData().
if (tabBean.getCode() == 0) {
// tabBean.getData().
mTabBean = tabBean;
setTabNum(mTabBean);
dialog.dismiss();
} else {
ToastUtils.showShortToast("首页状态获取失败");
dialog.dismiss();
}
}
@Override
public void onError(Call call, Response response, Exception e) {
super.onError(call, response, e);
ToastUtils.showShortToast("网络或服务器异常");
dialog.dismiss();
}
});
}
/**
* 动态刷新tab
* */
private void setTabNum(String subscribe,String serve,String error,String cancel) {
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon_one(subscribe, "待预约")));
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon(serve, "待服务")));
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon(error, "异常单")));
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon(cancel,"已取消")));
* 初始化tab
*/
private void setTabNum(TabBean tabNum) {
homeTabLayout.removeAllTabs();
//tabNum.getData().getReservation() 待预约
//tabNum.getData().getPendingservice() 待服务
//tabNum.getData().getError() 异常单
//tabNum.getData().getCanceled() 已完成
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon_one(tabNum.getData().getReservation() + "", "待预约")));
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon(tabNum.getData().getPendingservice() + "", "待服务")));
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon(tabNum.getData().getError() + "", "异常单")));
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon(tabNum.getData().getCanceled() + "", "已取消")));
}
/**
......@@ -314,6 +358,11 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
setContentView(R.layout.activity_home);
ButterKnife.bind(this);
// TODO: add setContentView(...) invocation
EventBus.getDefault().register(this);
dialog = new CustomProgressDialog(HomeActivity.this, R.style.CustomDialog);
token = GetUserInfo.getToken(this);
dialog.show();
mHomePresenter.get(token, getPackageNum());
initView();
initData();
......@@ -329,33 +378,133 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
}
@Override
public void getDateSuccess() {
}
@Override
public void getDateFailed(String msg) {
}
@OnClick({R.id.imageView_circle, R.id.image_phone})
@OnClick({R.id.imageView_circle, R.id.image_phone,R.id.image_inform})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.imageView_circle:
Intent intentPerson = new Intent(HomeActivity.this, PersonalCenterActivity.class);
intentPerson.putExtra("imageUrl",imageUrl);
intentPerson.putExtra("imageUrl", imageUrl);
startActivity(intentPerson);
mHomePresenter.get();
break;
case R.id.image_phone:
//进入待接单列表
// Intent intentReceiving = new Intent(HomeActivity.this, OrderFinishActivity.class);
// Intent intentReceiving = new Intent(HomeActivity.this, OrderFinishActivity.class);
//Intent intentReceiving = new Intent(HomeActivity.this, HandleListActivity.class);
Intent intentReceiving = new Intent(HomeActivity.this, ReceivingActivity.class);
startActivity(intentReceiving);
break;
case R.id.image_inform:
Intent MesssageIntent = new Intent(HomeActivity.this, MessageActivity.class);
startActivity(MesssageIntent);
break;
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onRefreTabNum(RefreshTabNum refreshTabNum) {
if (refreshTabNum.getTabNum() == 1) {
//ToastUtils.showShortToast("刷新了");
/* viewPager.setCurrentItem(1);
homeTabLayout.getTabAt(1).select();*/
initNetWorkTabNum(userId, token);
}
}
//获取版本号成功
@Override
public void getDateSuccess(String msg) {
//获取新版本信息
mHomePresenter.upgradeVersion(msg, token);
}
// 获取版本号失败
@Override
public void getDateFailed(String msg) {
dialog.dismiss();
ToastUtils.showShortToast(msg);
}
@Override
public void getNewVersionSuccess(String msg, String downloadUrl) {
dialog.dismiss();
showUpdateDialog(msg, downloadUrl);
}
@Override
public void getNewVersionFailed(String msg) {
dialog.dismiss();
ToastUtils.showShortToast(msg);
}
@Override
public void Error(String msg) {
dialog.dismiss();
ToastUtils.showShortToast(msg);
}
/**
* 弹窗选择是否更新(软更新)
*
* @param upgradePrompt 提示语
* @param downloadPath 下载的路径
*/
private void showUpdateDialog(String upgradePrompt, String downloadPath) {
AlertDialog.Builder alertDialog = new AlertDialog.Builder(this);
alertDialog.setCancelable(false);//设置点击弹窗外部区域，会话框不能消失
pd = new ProgressDialog(HomeActivity.this);//创建进度条对话
alertDialog.setTitle("有新版本啦");
alertDialog.setMessage(upgradePrompt);
alertDialog.setPositiveButton("下次再说", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
pd.dismiss(); //关闭进度条对话框
}
});
alertDialog.setNegativeButton("立刻升级", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);//设置进度条样式为水平方向
pd.show();//显示进度条对话框
File sdDir = Environment.getExternalStorageDirectory();
File file = new File(sdDir, SystemClock.uptimeMillis() + ".apk");
if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
HttpUtils httpUtils = new HttpUtils();
httpUtils.download(downloadPath, file.getAbsolutePath(), new RequestCallBack<File>() {
@Override
public void onSuccess(ResponseInfo<File> responseInfo) {
pd.dismiss(); //关闭进度条对话框
Toast.makeText(HomeActivity.this, "下载成功", Toast.LENGTH_SHORT).show();
/*覆盖安装APK*/
Intent intent = new Intent();
intent.setAction("android.intent.action.VIEW");
intent.addCategory("android.intent.category.DEFAULT");
intent.setDataAndType(Uri.fromFile(responseInfo.result),
"application/vnd.android.package-archive");
startActivity(intent);
}
@Override
public void onFailure(HttpException e, String s) {
pd.dismiss();
Toast.makeText(HomeActivity.this, "下载失败", Toast.LENGTH_SHORT).show();
}
@Override
public void onLoading(long total, long current, boolean isUploading) {
super.onLoading(total, current, isUploading);
pd.setMax((int) total); //设置进度条最大值
pd.setProgress((int) current); //设置进度条最小值
}
});
}
}
});
alertDialog.show();
}
}
app/src/main/java/com/dayu/bigfish/activity/IdeaActivity.java 100644 → 100755
......@@ -52,12 +52,14 @@ public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPre
private DateUtils dateUtils = new DateUtils();
private String systemDate;
private CustomProgressDialog dialog;
private String token;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_idea);
ButterKnife.bind(this);
token = GetUserInfo.getToken(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog);
initData();
}
......@@ -92,6 +94,7 @@ public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPre
public void success() {
ToastUtils.showShortToast("提交成功");
dialog.dismiss();
finish();
}
@Override
......@@ -125,8 +128,7 @@ public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPre
ToastUtils.showShortToast("请输入反馈意见..");
return;
}
ideaActivityPresenter.getData(comment, userName, userPhone);
ideaActivityPresenter.getData(comment, userName, userPhone,token);
}
break;
}
......
app/src/main/java/com/dayu/bigfish/activity/LoginActivity.java 100644 → 100755
......@@ -22,6 +22,7 @@ import com.dayu.bigfish.bean.RegisterBean;
import com.dayu.bigfish.managers.UserManager;
import com.dayu.bigfish.moudle.login.LoginPresenter;
import com.dayu.bigfish.moudle.login.LoginView;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.IsPhoneUtils;
import com.dayu.bigfish.utils.LogUtils;
import com.dayu.bigfish.utils.SPUtils;
......@@ -78,6 +79,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login);
ButterKnife.bind(this);
token = GetUserInfo.getToken(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog);
}
......@@ -155,7 +157,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
});
}
userId = Integer.parseInt(accountId);
commitVersionInfo(userId,getIMEI(this),getPackageNum());
commitVersionInfo(userId,getIMEI(this),getPackageNum(),token);
}
......@@ -252,7 +254,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
/**
* 版本第一次使用时要上传的信息
*/
public void commitVersionInfo(int userId, String imei, String versionCode) {
public void commitVersionInfo(int userId, String imei, String versionCode,String token) {
/*{
"accountId": 145,
"createTime": "",
......@@ -282,6 +284,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
OkGo.post(Constants.COMMIT_VERSION_INFO)
.tag(this)
.upJson(jsonObject.toString())
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......
app/src/main/java/com/dayu/bigfish/activity/MessageActivity.java 0 → 100644
package com.dayu.bigfish.activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.view.ViewPager;
import android.widget.ImageView;
import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.FragmentOrderAdapter;
import com.dayu.bigfish.fragment.order.message.BigFishMessageFragment;
import com.dayu.bigfish.fragment.order.message.SystemMessageFragment;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* Created by yu on 2017/10/14.
*/
public class MessageActivity extends FragmentActivity {
@BindView(R.id.message_back)
ImageView messageBack;
@BindView(R.id.text_title)
TextView textTitle;
@BindView(R.id.message_tablayout)
TabLayout messageTablayout;
@BindView(R.id.message_view_pager)
ViewPager messageViewPager;
private List<Fragment> list;
private String orderValue;
private int orderId;
private FragmentOrderAdapter fragmentAdapter;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_message);
ButterKnife.bind(this);
initData();
}
public void initData() {
/* Intent intent = getIntent();
orderValue = intent.getStringExtra("orderId");
orderId = Integer.parseInt(orderValue);
System.out.println("此订单的Id为:----->"+orderId);*/
list = new ArrayList<>();
list.add(new BigFishMessageFragment());
list.add(new SystemMessageFragment());
fragmentAdapter = new FragmentOrderAdapter(getSupportFragmentManager(),list);
messageViewPager.setAdapter(fragmentAdapter);
messageTablayout.setupWithViewPager(messageViewPager);
messageTablayout.removeAllTabs();
messageTablayout.addTab(messageTablayout.newTab().setText("系统通知"));
messageTablayout.addTab(messageTablayout.newTab().setText("大鱼通知"));
messageTablayout.setTabMode(TabLayout.MODE_FIXED);
}
@OnClick(R.id.message_back)
public void onViewClicked() {
finish();
}
}
\ No newline at end of file
app/src/main/java/com/dayu/bigfish/activity/NotificationActivity.java deleted 100644 → 0
package com.dayu.bigfish.activity;
import android.app.Activity;
import android.os.Bundle;
import android.support.annotation.Nullable;
import com.dayu.bigfish.R;
/**
* 消息列表
*/
public class NotificationActivity extends Activity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_notification);
}
}
app/src/main/java/com/dayu/bigfish/activity/OrderFinishActivity.java 100644 → 100755
......@@ -28,6 +28,7 @@ import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.CheckOrderInit;
import com.dayu.bigfish.bean.ImageBean;
import com.dayu.bigfish.eventbus.OrderFinish;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.moudle.check.OrderFinishActivityPresenter;
import com.dayu.bigfish.moudle.check.OrderFinishActivityView;
import com.dayu.bigfish.utils.GetUserInfo;
......@@ -197,7 +198,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
private String payRemark;
private Boolean isSwitch;
private String categoryName; //产品名称
private String token;
public void initData() {
Intent intent = getIntent();
String value = intent.getStringExtra("orderId");
......@@ -242,10 +243,11 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
setContentView(R.layout.activity_order_finish);
ButterKnife.bind(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog);
token = GetUserInfo.getToken(this);
initData();
initView();
dialog.show();
orderFinishActivityPresenter.getInitData(orderId);
orderFinishActivityPresenter.getInitData(orderId,token);
}
......@@ -309,21 +311,25 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
}
public void success() {
dialog.dismiss();
ToastUtils.showShortToast("数据提交成功");
SPUtils.clear(this, "big_fish_two");
finish();
EventBus.getDefault().post(new RefreshTabNum(1));
EventBus.getDefault().post(new OrderFinish(3));
dialog.dismiss();
}
public void failed() {
dialog.dismiss();
EventBus.getDefault().post(new RefreshTabNum(1));
ToastUtils.showShortToast("提交失败!");
dialog.dismiss();
}
public void error() {
EventBus.getDefault().post(new RefreshTabNum(1));
ToastUtils.showShortToast("服务器异常,提交失败!");
dialog.dismiss();
ToastUtils.showShortToast("提交失败!");
}
@Override
......@@ -337,7 +343,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
// listTwo = list;
orderFinishActivityPresenter.postPhotoSubmit(list, orderId, serveValue1,
engineerId, isPay, upDoorCost, payRemark,
serveCost, cailiaoCost, otherCost);
serveCost, cailiaoCost, otherCost,token);
}
@Override
......@@ -449,7 +455,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
payRemark = etUpInput.getText().toString();
orderFinishActivityPresenter.postSubmit(orderId, serveValue1,
engineerId, isPay, upDoorCost, payRemark,
serveCost, cailiaoCost, otherCost);
serveCost, cailiaoCost, otherCost,token);
}
break;
//选择图片
......@@ -504,7 +510,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
String path = file.getAbsolutePath();
mImageList.add(path);
if (mImageList.size() == iamgeUrl.size()) {
orderFinishActivityPresenter.upPhoto(mImageList, orderId);
orderFinishActivityPresenter.upPhoto(mImageList, orderId,token);
}
}
......
app/src/main/java/com/dayu/bigfish/activity/PersonalCenterActivity.java 100644 → 100755
......@@ -107,12 +107,14 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
private String imageUrl;//头像信息
private String userName;
private String userPhone;
private String token;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_personal_center);
ButterKnife.bind(this);
token = GetUserInfo.getToken(this);
userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
// userId = userInfo.getAccountId();
......@@ -152,13 +154,13 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
@Override
public void initData() {
//获取工程师信息
personalCenterPresenter.get(userId);
personalCenterPresenter.get(userId,token);
//获取工程师今日收益(业绩)
personalCenterPresenter.getEarnings(siteId,userId);
personalCenterPresenter.getEarnings(siteId,userId,token);
//获取工程师今日接单数量
personalCenterPresenter.getReceOrder(siteId,userId);
personalCenterPresenter.getReceOrder(siteId,userId,token);
//获取工程师的累计信息 (评分,累计业绩,工单记录)
personalCenterPresenter.getOrderUserInfo(siteId,userId);
personalCenterPresenter.getOrderUserInfo(siteId,userId,token);
}
......
app/src/main/java/com/dayu/bigfish/activity/ReceivingActivity.java 100644 → 100755
package com.dayu.bigfish.activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.widget.SwipeRefreshLayout;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.TextView;
......@@ -14,15 +14,17 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.ReceivingAdapter;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.ReceivingBean;
import com.dayu.bigfish.bean.ReceivingOrderBean;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.moudle.receiving.Receiving;
import com.dayu.bigfish.moudle.receiving.ReceivingPresenter;
import com.dayu.bigfish.moudle.receiving.ReceivingView;
import com.dayu.bigfish.tip.TipsHelper;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import com.dayu.bigfish.views.RefreListView;
import org.greenrobot.eventbus.EventBus;
import java.util.List;
......@@ -30,10 +32,6 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import static com.dayu.bigfish.utils.GetUserInfo.getACCOUNT_ID;
import static com.dayu.bigfish.utils.SPUtils.get;
import static com.umeng.analytics.pro.x.G;
import static com.umeng.analytics.pro.x.S;
/**
* 接单列表
......@@ -43,8 +41,6 @@ import static com.umeng.analytics.pro.x.S;
public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPresenter> implements ReceivingView, Receiving {
@BindView(R.id.receiving_back)
ImageView receivingBack;
@BindView(R.id.receiving_listview)
ListView receivingListview;
public ReceivingAdapter mReceiviingAdapter;
public ReceivingPresenter mReceivingPresenter;
public List<ReceivingBean.DataBeanX.DataBean> list;
......@@ -54,10 +50,22 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
SwipeRefreshLayout receivingRefersh;
@BindView(R.id.order_title_num)
TextView orderTitleNum;
@BindView(R.id.image)
ImageView view;
@BindView(R.id.receiving_listview)
RefreListView receivingListview;
@BindView(R.id.image_empty)
ImageView imageEmpty;
@BindView(R.id.textView_empty)
TextView textViewEmpty;
@BindView(R.id.view)
RelativeLayout view;
/* @BindView(R.id.receiving_listview)
ListView receivingListview;*/
private CustomProgressDialog dialog;
TipsHelper mTipsHelper;
private String token;
private int orderId;
// private Boolean refershState;;
// public LayoutInflater inflater; //加载更多的布局
// private View loadmoreView;//用来接收加载更多的布局
......@@ -69,6 +77,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_receiving);
ButterKnife.bind(this);
token = GetUserInfo.getToken(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog);
//初始化receivingRefersh的颜色
//第一次进入的时候就刷新数据
......@@ -81,8 +90,17 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
@Override
public void initListener() {
receivingListview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
orderId = list.get(position).getId();
Intent intent = new Intent(ReceivingActivity.this, OrderDetailsActivity.class);
intent.putExtra("orderId", orderId + "");
startActivity(intent);
}
});
receivingRefersh.setOnRefreshListener(
() -> initNetWork(1, 1, 10,GetUserInfo.getSITE_ID(ReceivingActivity.this)));
() -> initNetWork(1, 1, 10, GetUserInfo.getSITE_ID(ReceivingActivity.this)));
}
@Override
......@@ -110,9 +128,10 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
//初始化适配器
}
//请求列表数据
public void initNetWork(int getState, int pagerId, int PagerSize,int siteId) {
mReceivingPresenter.get(getState, pagerId, PagerSize,siteId);
public void initNetWork(int getState, int pagerId, int PagerSize, int siteId) {
mReceivingPresenter.get(getState, pagerId, PagerSize, siteId, token);
}
@Override
......@@ -146,16 +165,16 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
// int userId = (int) SPUtils.get(this,"ACCOUNTId","");
list = receivingBean.getData().getData();
if (list.size() == 0 || list == null) {
// mTipsHelper.showEmpty();
// mTipsHelper.showEmpty();
view.setVisibility(View.VISIBLE);
receivingListview.setVisibility(View.GONE);
dialog.dismiss();
receivingRefersh.post(() -> receivingRefersh.setRefreshing(false));
} else {
// mTipsHelper.hideEmpty();
// mTipsHelper.hideEmpty();
view.setVisibility(View.GONE);
receivingListview.setVisibility(View.VISIBLE);
System.out.println("list集合的大小--->"+list.size());
System.out.println("list集合的大小--->" + list.size());
orderTitleNum.setText(getResources().getText(R.string.tv_order_list_num) + (String.valueOf(list.size())) + ")");
mReceiviingAdapter = new ReceivingAdapter(ReceivingActivity.this, list, this);
receivingListview.setAdapter(mReceiviingAdapter);
......@@ -177,7 +196,8 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
@Override
public void receivingSuccess() {
ToastUtils.showShortToast("接单成功");
initNetWork(1,1,10, GetUserInfo.getSITE_ID(this));
EventBus.getDefault().post(new RefreshTabNum(1));
initNetWork(1, 1, 10, GetUserInfo.getSITE_ID(this));
dialog.dismiss();
finish();
}
......@@ -195,10 +215,10 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
//接单的回调
@Override
public void receivingOrder(int orderId) {
// ToastUtils.showShortToast(orderId+"");
// ToastUtils.showShortToast(orderId+"");
int userId = GetUserInfo.getACCOUNT_ID(this);
dialog.show();
mReceivingPresenter.receivingOrder(orderId,userId);
mReceivingPresenter.receivingOrder(orderId, userId, token);
}
......
app/src/main/java/com/dayu/bigfish/activity/SettingActivity.java 100644 → 100755
......@@ -21,6 +21,7 @@ import com.dayu.bigfish.managers.UserManager;
import com.dayu.bigfish.moudle.set.SettingActivityPresenter;
import com.dayu.bigfish.moudle.set.SettingActivityView;
import com.dayu.bigfish.utils.DataCleanManager;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import com.dayu.bigfish.views.SwitchImage;
......@@ -66,12 +67,14 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
private CustomProgressDialog dialog;
private String userName;
private String userphone;
private String token;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_setting);
ButterKnife.bind(this);
token = GetUserInfo.getToken(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog);
initView();
initData();
......@@ -138,12 +141,13 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
break;
//更新
case R.id.set_jiance_gengxin:
settingActivityPresenter.updataVersion();
settingActivityPresenter.updataVersion(token);
break;
//客服电话
case R.id.set_kefu_phone:
Intent intent1 = new Intent(Intent.ACTION_DIAL);
intent1.setData(Uri.parse("tel:400-950-6677"));
//4000086898
intent1.setData(Uri.parse("tel:400-008-6898"));
startActivity(intent1);
break;
//关于我们
......
app/src/main/java/com/dayu/bigfish/activity/StartActivity.java 100644 → 100755
......@@ -9,6 +9,7 @@ import android.widget.Button;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.BaseBean;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.google.gson.Gson;
import com.lzy.okgo.OkGo;
......@@ -33,6 +34,7 @@ public class StartActivity extends Activity {
Button buttonThree;
private int orderId;
private boolean isStart = false;
private String token;
// private boolean isServe = true;
private void initData() {
......@@ -48,6 +50,7 @@ public class StartActivity extends Activity {
setContentView(R.layout.activity_begin_start);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
token = GetUserInfo.getToken(this);
initData();
}
......@@ -57,11 +60,11 @@ public class StartActivity extends Activity {
case R.id.button_one:
//isStart = false 不等于true 说明工程师还未出发
//开始出发
initStart(orderId);
initStart(orderId,token);
break;
case R.id.button_two:
if (isStart) {
initServe(orderId);
initServe(orderId,token);
buttonThree.setVisibility(View.VISIBLE);
} else {
ToastUtils.showShortToast("您还未出发,不能开始服务");
......@@ -80,10 +83,11 @@ public class StartActivity extends Activity {
}
}
public void initStart(final int orderId) {
public void initStart(final int orderId,String token) {
System.out.println("开始出发的工单id--->" + orderId);
OkGo.get(Constants.START_ORDER + orderId)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......@@ -105,10 +109,11 @@ public class StartActivity extends Activity {
});
}
public void initServe(final int orderId) {
public void initServe(final int orderId,String token) {
System.out.println("开始服务的工单id" + orderId);
OkGo.get(Constants.START_SERVE + orderId)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......
app/src/main/java/com/dayu/bigfish/activity/SubscribeTimeActivity.java 100644 → 100755
......@@ -6,6 +6,7 @@ import android.content.Intent;
import android.database.DatabaseUtils;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.media.session.MediaSessionCompat;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
......@@ -23,9 +24,11 @@ import com.dayu.bigfish.MainActivity;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.BaseBean;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.moudle.subscribe.SubscribeTimePresenter;
import com.dayu.bigfish.moudle.subscribe.SubscribeTimeView;
import com.dayu.bigfish.utils.DateUtils;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.TimeUtils;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
......@@ -34,6 +37,8 @@ import com.google.gson.Gson;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback;
import org.greenrobot.eventbus.EventBus;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
......@@ -95,6 +100,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
Calendar calendar = Calendar.getInstance(Locale.CHINA);
private String edValue;
private CustomProgressDialog dialog;
private String token;
private DateUtils dateUtils = new DateUtils();
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -102,6 +108,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
setContentView(R.layout.activity_subscribe_time);
ButterKnife.bind(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog);
token = GetUserInfo.getToken(this);
initData();
// refershAdapter = (RefershAdapter) HomeActivity.list_fragments.get(0);
......@@ -123,9 +130,10 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
orderId = Integer.parseInt(value);
}
public void initNetWork(int orderId, String doorTime, String doorComment) {
public void initNetWork(int orderId, String doorTime, String doorComment,String token) {
OkGo.post(Constants.ORDER_DOOR)
.tag(this)
.headers("token",token)
.params("orderId", orderId)
//params("doorTime", calendar.getTime().toString())
.params("doorTime", doorTime)
......@@ -138,6 +146,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
BaseBean baseBean = gson.fromJson(s, BaseBean.class);
if (baseBean.getCode() == 0) {
ToastUtils.showShortToast("预约时间成功,请移至待服务列表查看");
EventBus.getDefault().post(new RefreshTabNum(1));
dialog.dismiss();
}
// refershAdapter.refershAdapter();
......@@ -146,8 +155,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
@Override
public void onError(Call call, Response response, Exception e) {
System.out.println("------->" + call);
System.out.println("------->" + response);
ToastUtils.showShortToast("网络异常");
}
});
}
......@@ -180,7 +188,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
String time= dateUtils.stringTimeTo(textDateValue.getText().toString());
String timeValue = time+textTimeValue.getText().toString()+":00";
initNetWork(orderId, timeValue, edValue);
initNetWork(orderId, timeValue, edValue,token);
}
break;
......
app/src/main/java/com/dayu/bigfish/activity/TakePhotoActivity.java deleted 100644 → 0
package com.dayu.bigfish.activity;
/**
* Created by yu
* on 2017/9/22.
*/
public class TakePhotoActivity {}
/* // private CustomHelper customHelper;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
initPhoto();
}
*//* public void onClick(View view) {
}
*//*
public void initPhoto() {
File file = new File(Environment.getExternalStorageDirectory(), "/temp/" + System.currentTimeMillis() + ".jpg");
if (!file.getParentFile().exists()) file.getParentFile().mkdirs();
Uri imageUri = Uri.fromFile(file);
*//* //鲁班压缩
LubanOptions option = new LubanOptions.Builder()
.setMaxHeight(800)
.setMaxWidth(width)
.setMaxSize(maxSize)
.create();
config = CompressConfig.ofLuban(option);
config.enableReserveRaw(enableRawFile);*//*
//调起相机并裁剪
getTakePhoto().onPickFromCaptureWithCrop(imageUri, getCropOptions());
// getTakePhoto().onPickMultipleWithCrop(limit, getCropOptions());
}
@Override
public void takeCancel() {
super.takeCancel();
}
@Override
public void takeFail(TResult result, String msg) {
super.takeFail(result, msg);
}
@Override
public void takeSuccess(TResult result) {
super.takeSuccess(result);
showImg(result.getImages());
}
private void showImg(ArrayList<TImage> images) {
// Intent intent=new Intent(this,ResultActivity.class);
//intent.putExtra("images",images);
//startActivity(intent);
}
public CropOptions getCropOptions() {
CropOptions.Builder builder = new CropOptions.Builder();
builder.setAspectX(800).setAspectY(800);
builder.setWithOwnCrop(true);
return builder.create();
}
}*/
app/src/main/java/com/dayu/bigfish/activity/UpdataSubscribeTimeActivity.java 100644 → 100755
......@@ -22,6 +22,7 @@ import com.dayu.bigfish.eventbus.UpdataTime;
import com.dayu.bigfish.moudle.updata.UpdataSubscribeTimePresenter;
import com.dayu.bigfish.moudle.updata.UpdataSubscribeTimeView;
import com.dayu.bigfish.utils.DateUtils;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
......@@ -79,12 +80,14 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
private String edValue;
private CustomProgressDialog dialog;
private DateUtils dateUtils = new DateUtils();
private String token;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_updata_subscribe_time);
ButterKnife.bind(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog);
token = GetUserInfo.getToken(this);
initData();
}
......@@ -129,7 +132,7 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
ToastUtils.showShortToast("正在提交数据......");
String time= dateUtils.stringTimeTo(textDateValue.getText().toString());
String timeValue = time+textTimeValue.getText().toString()+":00";
updataSubscribeTimePresenter.post(orderId, timeValue, edValue);
updataSubscribeTimePresenter.post(orderId, timeValue, edValue,token);
//initNetWork(orderId, "2017-18-23 15:34:00", edValue);
}
break;
......
app/src/main/java/com/dayu/bigfish/activity/WorkOrderActivity.java deleted 100644 → 0
package com.dayu.bigfish.activity;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.ImageView;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.RelativeLayout;
import com.dayu.bigfish.R;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 工单详情页面
* on 2017/9/1.
*/
public class WorkOrderActivity extends AppCompatActivity {
@BindView(R.id.work_order_back)
ImageView workOrderBack;
@BindView(R.id.work_order_title)
RelativeLayout workOrderTitle;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_work_order);
ButterKnife.bind(this);
}
}
app/src/main/java/com/dayu/bigfish/adapter/HomeTwoTabAdapter.java 100644 → 100755
......@@ -69,11 +69,13 @@ public class HomeTwoTabAdapter extends BaseAdapter {
private List<MyGreenDao> list; //数据库的数据源
ViewHolder viewHolder;
int postion;
private String mToken;
// int state;//0:默认开始出发,1:开始服务，2:需要再次上门,3:处理工单
public HomeTwoTabAdapter(Context context, List<HomeTwoTabBean.DataBeanX.DataBean> list) {
public HomeTwoTabAdapter(Context context, List<HomeTwoTabBean.DataBeanX.DataBean> list,String token) {
this.context = context;
this.twoTablist = list;
this.mToken = token;
dialog = new CustomProgressDialog(context, R.style.CustomDialog);
EventBus.getDefault().register(this);
}
......@@ -110,7 +112,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
//switchView(viewHolder);
this.postion = position;
try {
initData(position, viewHolder);
initData(position, viewHolder,mToken);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShortToast("待服务列表适配器解析异常");
......@@ -173,7 +175,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
}
}
private void initData(final int position, final ViewHolder viewHolder) throws Exception {
private void initData(final int position, final ViewHolder viewHolder,String token) throws Exception {
//查询数据
Query query = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(position).getId()),
MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
......@@ -262,7 +264,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
viewHolder.itemStartDepart.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
initNetWork(viewHolder, orderId, Constants.START_ORDER, position);
initNetWork(viewHolder, orderId, Constants.START_ORDER, position,token);
}
});
//修改预约时间
......@@ -287,7 +289,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
viewHolder.itemServe.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
initNetWork1(viewHolder, orderId, Constants.START_SERVE, position);
initNetWork1(viewHolder, orderId, Constants.START_SERVE, position,token);
}
});
......@@ -304,10 +306,11 @@ public class HomeTwoTabAdapter extends BaseAdapter {
}
/*初始化网络数据*/
public void initNetWork(final ViewHolder viewHolder, final int orderId, String url, final int position) {
public void initNetWork(final ViewHolder viewHolder, final int orderId, String url, final int position,String token) {
dialog.show();
OkGo.get(url + orderId)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......@@ -378,9 +381,10 @@ public class HomeTwoTabAdapter extends BaseAdapter {
}
/*初始化网络数据*/
public void initNetWork1(final ViewHolder viewHolder, final int orderId, String url, final int position) {
public void initNetWork1(final ViewHolder viewHolder, final int orderId, String url, final int position,String token) {
dialog.show();
OkGo.get(url + orderId)
.headers("token",token)
.tag(this)
.execute(new StringCallback() {
@Override
......
app/src/main/java/com/dayu/bigfish/adapter/ReceivingAdapter.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/adapter/SystemMessageAdapter.java 0 → 100644
package com.dayu.bigfish.adapter;
import android.content.Context;
import android.content.res.AssetManager;
import android.graphics.Typeface;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.MessageBean;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* Created by yu on 2017/10/14.
*/
public class SystemMessageAdapter extends BaseAdapter {
private List<MessageBean.DataBeanX.DataBean> dataBeenList;
private Context context;
public SystemMessageAdapter(List<MessageBean.DataBeanX.DataBean> dataBeenList, Context context) {
this.dataBeenList = dataBeenList;
this.context = context;
}
@Override
public int getCount() {
// dataBeenList.size()
return 3;
}
@Override
public Object getItem(int position) {
return position;
}
@Override
public long getItemId(int position) {
return position;
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view;
ViewHolder viewHolder;
if (convertView == null) {
view = View.inflate(context, R.layout.message_adapter, null);
viewHolder = new ViewHolder(view,context);
view.setTag(viewHolder);
} else {
view = convertView;
viewHolder = (ViewHolder) view.getTag();
}
initData();
return convertView;
}
private void initData() {
}
static class ViewHolder {
@BindView(R.id.line_textView)
TextView lineTextView;
@BindView(R.id.message_date)
TextView messageDate;
@BindView(R.id.message_time)
TextView messageTime;
@BindView(R.id.message_text_content)
TextView messageTextContent;
@BindView(R.id.item)
RelativeLayout item;
ViewHolder(View view,Context context) {
ButterKnife.bind(this, view);
AssetManager mgr = context.getAssets();//得到AssetManager
Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf");//根据路径得到Typeface
messageTime.setTypeface(tf);//设置字体
}
}
}
app/src/main/java/com/dayu/bigfish/adapter/Test.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/application/MyApplication.java
......@@ -160,10 +160,11 @@ public class MyApplication extends Application {
//builder.cookieJar(new CookieJarImpl(new MemoryCookieStore())); //使用内存保持cookie，app退出后，cookie消失
//https相关设置，以下几种方案根据需要自己设置
//方法一：信任所有证书,不安全有风险
// HttpsUtils.SSLParams sslParams1 = HttpsUtils.getSslSocketFactory();
// HttpsUtils.SSLParams sslParams1 = HttpsUtils.getSslSocketFactory();
// //方法二：自定义信任规则，校验服务端证书
// HttpsUtils.SSLParams sslParams2 = HttpsUtils.getSslSocketFactory(new SafeTrustManager());
// HttpsUtils.SSLParams sslParams2 = HttpsUtils.getSslSocketFactory(new SafeTrustManager());
// //方法三：使用预埋证书，校验服务端证书（自签名证书）
// //HttpsUtils.SSLParams sslParams3 = HttpsUtils.getSslSocketFactory(getAssets().open("srca.cer"));
// //方法四：使用bks证书和密码管理客户端证书（双向认证），使用预埋证书，校验服务端证书（自签名证书）
......
app/src/main/java/com/dayu/bigfish/base/BaseFragment.java 100644 → 100755
......@@ -18,17 +18,10 @@ public abstract class BaseFragment<V, T extends BasePresenter<V>> extends Fragme
public T presenter;
//标志位,Fragment是否可见
protected boolean isVisible;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
presenter = initPresenter();
initData();
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
presenter = initPresenter();
return super.onCreateView(inflater, container, savedInstanceState);
}
protected TipsHelper createTipsHelper(View view) {
......
app/src/main/java/com/dayu/bigfish/bean/BaseBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/BaseStringBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/CheckOrderInit.java 100644 → 100755
......@@ -10,7 +10,7 @@ public class CheckOrderInit implements Serializable {
/**
* code : 0
* data : {"id":302,"orderNum":"20170916165019623400","source":1,"partnerNum":null,"partnerName":null,"status":4,"repairType":1,"customerType":1,"customerName":"张艺谋","customerCompany":"张艺谋","customerMobile":"15811366263","customerTelphome":"发范德萨","provinceId":1,"provinceName":"北京市","cityId":2,"cityName":"北京城区","districtId":112,"districtName":"海淀区","address":"量子银座","providerTypeId":97,"providerName":"安装","categoryId":107,"categoryName":"电视配件","categorySource":null,"brandId":37,"brandName":"三星","productModel":"X9008","createId":133,"created":"冯小刚","createTime":"2017-09-18 14:10:44","appointmentTime":"2017-09-17 16:49:30","comment":"带备件","confirmDoorTime":"2018-06-23 15:34:00","confirmDoorComment":"露露比姚帅脑瓜仁疼","serviceRecordComment":null,"customerCheckComment":"还不睡觉","isPay":1,"payType":null,"doorPrice":0,"doorPriceComment":"..","servicePrice":0,"servicePriceComment":"..","materialCost":0,"materialCostComment":"..","otherPrice":0,"otherPriceComment":"..","totalPrice":0,"cancelOrderReason":null,"closePhase":null,"siteId":59,"engineerId":134,"update":null,"key":null,"startTime":null,"endTime":null}
* data : {"id":48,"orderNum":"20171013151641110126","source":1,"partnerNum":null,"partnerName":null,"status":2,"repairType":1,"customerType":1,"customerName":"测试363","customerCompany":"测试363","customerMobile":"15265895425","customerTelphome":"010-2569548","provinceId":1,"provinceName":"北京市","cityId":2,"cityName":"北京城区","districtId":3,"districtName":"东城区","address":"某某大厦","providerTypeId":328,"providerName":"安装","categoryId":"C_727","categoryName":"海贼王","categorySource":null,"brandId":438,"brandName":"春兰","productModel":"256","createId":285,"created":"大鱼鱼头","createTime":"2017-10-13 15:16:41","appointmentTime":"2017-10-14 15:16:20","comment":"测试363测试363","confirmDoorTime":null,"confirmDoorComment":null,"serviceRecordComment":null,"customerCheckComment":null,"isPay":null,"payType":null,"doorPrice":null,"doorPriceComment":null,"servicePrice":null,"servicePriceComment":null,"materialCost":null,"materialCostComment":null,"otherPrice":null,"otherPriceComment":null,"totalPrice":null,"cancelOrderReason":null,"closePhase":null,"siteId":143,"engineerId":288,"update":null,"key":null,"startTime":null,"endTime":null,"excptionCode":null}
* msg : 成功
*/
......@@ -44,61 +44,62 @@ public class CheckOrderInit implements Serializable {
public static class DataBean {
/**
* id : 302
* orderNum : 20170916165019623400
* id : 48
* orderNum : 20171013151641110126
* source : 1
* partnerNum : null
* partnerName : null
* status : 4
* status : 2
* repairType : 1
* customerType : 1
* customerName : 张艺谋
* customerCompany : 张艺谋
* customerMobile : 15811366263
* customerTelphome : 发范德萨
* customerName : 测试363
* customerCompany : 测试363
* customerMobile : 15265895425
* customerTelphome : 010-2569548
* provinceId : 1
* provinceName : 北京市
* cityId : 2
* cityName : 北京城区
* districtId : 112
* districtName : 海淀区
* address : 量子银座
* providerTypeId : 97
* districtId : 3
* districtName : 东城区
* address : 某某大厦
* providerTypeId : 328
* providerName : 安装
* categoryId : 107
* categoryName : 电视配件
* categoryId : C_727
* categoryName : 海贼王
* categorySource : null
* brandId : 37
* brandName : 三星
* productModel : X9008
* createId : 133
* created : 冯小刚
* createTime : 2017-09-18 14:10:44
* appointmentTime : 2017-09-17 16:49:30
* comment : 带备件
* confirmDoorTime : 2018-06-23 15:34:00
* confirmDoorComment : 露露比姚帅脑瓜仁疼
* brandId : 438
* brandName : 春兰
* productModel : 256
* createId : 285
* created : 大鱼鱼头
* createTime : 2017-10-13 15:16:41
* appointmentTime : 2017-10-14 15:16:20
* comment : 测试363测试363
* confirmDoorTime : null
* confirmDoorComment : null
* serviceRecordComment : null
* customerCheckComment : 还不睡觉
* isPay : 1
* customerCheckComment : null
* isPay : null
* payType : null
* doorPrice : 0
* doorPriceComment : ..
* servicePrice : 0
* servicePriceComment : ..
* materialCost : 0
* materialCostComment : ..
* otherPrice : 0
* otherPriceComment : ..
* totalPrice : 0
* doorPrice : null
* doorPriceComment : null
* servicePrice : null
* servicePriceComment : null
* materialCost : null
* materialCostComment : null
* otherPrice : null
* otherPriceComment : null
* totalPrice : null
* cancelOrderReason : null
* closePhase : null
* siteId : 59
* engineerId : 134
* siteId : 143
* engineerId : 288
* update : null
* key : null
* startTime : null
* endTime : null
* excptionCode : null
*/
private int id;
......@@ -122,7 +123,7 @@ public class CheckOrderInit implements Serializable {
private String address;
private int providerTypeId;
private String providerName;
private int categoryId;
private String categoryId;
private String categoryName;
private Object categorySource;
private int brandId;
......@@ -133,21 +134,21 @@ public class CheckOrderInit implements Serializable {
private String createTime;
private String appointmentTime;
private String comment;
private String confirmDoorTime;
private String confirmDoorComment;
private Object confirmDoorTime;
private Object confirmDoorComment;
private Object serviceRecordComment;
private String customerCheckComment;
private int isPay;
private Object customerCheckComment;
private Object isPay;
private Object payType;
private int doorPrice;
private String doorPriceComment;
private int servicePrice;
private String servicePriceComment;
private int materialCost;
private String materialCostComment;
private int otherPrice;
private String otherPriceComment;
private int totalPrice;
private Object doorPrice;
private Object doorPriceComment;
private Object servicePrice;
private Object servicePriceComment;
private Object materialCost;
private Object materialCostComment;
private Object otherPrice;
private Object otherPriceComment;
private Object totalPrice;
private Object cancelOrderReason;
private Object closePhase;
private int siteId;
......@@ -156,6 +157,7 @@ public class CheckOrderInit implements Serializable {
private Object key;
private Object startTime;
private Object endTime;
private Object excptionCode;
public int getId() {
return id;
......@@ -325,11 +327,11 @@ public class CheckOrderInit implements Serializable {
this.providerName = providerName;
}
public int getCategoryId() {
public String getCategoryId() {
return categoryId;
}
public void setCategoryId(int categoryId) {
public void setCategoryId(String categoryId) {
this.categoryId = categoryId;
}
......@@ -413,19 +415,19 @@ public class CheckOrderInit implements Serializable {
this.comment = comment;
}
public String getConfirmDoorTime() {
public Object getConfirmDoorTime() {
return confirmDoorTime;
}
public void setConfirmDoorTime(String confirmDoorTime) {
public void setConfirmDoorTime(Object confirmDoorTime) {
this.confirmDoorTime = confirmDoorTime;
}
public String getConfirmDoorComment() {
public Object getConfirmDoorComment() {
return confirmDoorComment;
}
public void setConfirmDoorComment(String confirmDoorComment) {
public void setConfirmDoorComment(Object confirmDoorComment) {
this.confirmDoorComment = confirmDoorComment;
}
......@@ -437,19 +439,19 @@ public class CheckOrderInit implements Serializable {
this.serviceRecordComment = serviceRecordComment;
}
public String getCustomerCheckComment() {
public Object getCustomerCheckComment() {
return customerCheckComment;
}
public void setCustomerCheckComment(String customerCheckComment) {
public void setCustomerCheckComment(Object customerCheckComment) {
this.customerCheckComment = customerCheckComment;
}
public int getIsPay() {
public Object getIsPay() {
return isPay;
}
public void setIsPay(int isPay) {
public void setIsPay(Object isPay) {
this.isPay = isPay;
}
......@@ -461,75 +463,75 @@ public class CheckOrderInit implements Serializable {
this.payType = payType;
}
public int getDoorPrice() {
public Object getDoorPrice() {
return doorPrice;
}
public void setDoorPrice(int doorPrice) {
public void setDoorPrice(Object doorPrice) {
this.doorPrice = doorPrice;
}
public String getDoorPriceComment() {
public Object getDoorPriceComment() {
return doorPriceComment;
}
public void setDoorPriceComment(String doorPriceComment) {
public void setDoorPriceComment(Object doorPriceComment) {
this.doorPriceComment = doorPriceComment;
}
public int getServicePrice() {
public Object getServicePrice() {
return servicePrice;
}
public void setServicePrice(int servicePrice) {
public void setServicePrice(Object servicePrice) {
this.servicePrice = servicePrice;
}
public String getServicePriceComment() {
public Object getServicePriceComment() {
return servicePriceComment;
}
public void setServicePriceComment(String servicePriceComment) {
public void setServicePriceComment(Object servicePriceComment) {
this.servicePriceComment = servicePriceComment;
}
public int getMaterialCost() {
public Object getMaterialCost() {
return materialCost;
}
public void setMaterialCost(int materialCost) {
public void setMaterialCost(Object materialCost) {
this.materialCost = materialCost;
}
public String getMaterialCostComment() {
public Object getMaterialCostComment() {
return materialCostComment;
}
public void setMaterialCostComment(String materialCostComment) {
public void setMaterialCostComment(Object materialCostComment) {
this.materialCostComment = materialCostComment;
}
public int getOtherPrice() {
public Object getOtherPrice() {
return otherPrice;
}
public void setOtherPrice(int otherPrice) {
public void setOtherPrice(Object otherPrice) {
this.otherPrice = otherPrice;
}
public String getOtherPriceComment() {
public Object getOtherPriceComment() {
return otherPriceComment;
}
public void setOtherPriceComment(String otherPriceComment) {
public void setOtherPriceComment(Object otherPriceComment) {
this.otherPriceComment = otherPriceComment;
}
public int getTotalPrice() {
public Object getTotalPrice() {
return totalPrice;
}
public void setTotalPrice(int totalPrice) {
public void setTotalPrice(Object totalPrice) {
this.totalPrice = totalPrice;
}
......@@ -596,5 +598,13 @@ public class CheckOrderInit implements Serializable {
public void setEndTime(Object endTime) {
this.endTime = endTime;
}
public Object getExcptionCode() {
return excptionCode;
}
public void setExcptionCode(Object excptionCode) {
this.excptionCode = excptionCode;
}
}
}
app/src/main/java/com/dayu/bigfish/bean/ErrorOrderBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/HomeOneTabBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/HomeTwoTabBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/ImageBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/InformBean.java 0 → 100755
package com.dayu.bigfish.bean;
import java.io.Serializable;
/**
* Created by yu on 2017/10/11.
*/
public class InformBean implements Serializable {
/**
* customJson : {"orderId":6}
* title : 改派通知
* functionType : 1
* category : 1
* action : order
*/
private CustomJsonBean customJson;
private String title;
private int functionType;
private int category;
private String action;
public CustomJsonBean getCustomJson() {
return customJson;
}
public void setCustomJson(CustomJsonBean customJson) {
this.customJson = customJson;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public int getFunctionType() {
return functionType;
}
public void setFunctionType(int functionType) {
this.functionType = functionType;
}
public int getCategory() {
return category;
}
public void setCategory(int category) {
this.category = category;
}
public String getAction() {
return action;
}
public void setAction(String action) {
this.action = action;
}
public static class CustomJsonBean {
/**
* orderId : 6
*/
private int orderId;
public int getOrderId() {
return orderId;
}
public void setOrderId(int orderId) {
this.orderId = orderId;
}
}
}
app/src/main/java/com/dayu/bigfish/bean/LoginBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/MessageBean.java 0 → 100644
package com.dayu.bigfish.bean;
import java.io.Serializable;
import java.util.List;
/**
* 消息的Bean
* on 2017/10/14.
*/
public class MessageBean implements Serializable {
/**
* code : 0
* data : {"pageNo":1,"pageSize":10,"totalRows":2,"data":[{"id":228,"title":"预约超时通知","content":"工单编号:20171013194811487890 您还没有预约，请及时与客户协调上门时间","sender":null,"hxAccount":"cfc68f0182484d1f9746a0f15248eafc","status":1,"type":1,"functionType":null,"category":1,"action":null,"reason":null,"batchId":null,"createTime":"2017-10-13 21:01:47","startTime":null,"endTime":null},{"id":229,"title":"预约超时通知","content":"工单编号:20171013194811487890 您还没有预约，请及时与客户协调上门时间","sender":null,"hxAccount":"f2b2a017d7154c75bf6d1f4b8076ab53","status":1,"type":1,"functionType":null,"category":1,"action":null,"reason":null,"batchId":null,"createTime":"2017-10-13 21:01:47","startTime":null,"endTime":null}],"totalPages":1,"previousPageNo":1,"nextPageNo":1}
* msg : 成功
*/
private int code;
private DataBeanX data;
private String msg;
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public DataBeanX getData() {
return data;
}
public void setData(DataBeanX data) {
this.data = data;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public static class DataBeanX {
/**
* pageNo : 1
* pageSize : 10
* totalRows : 2
* data : [{"id":228,"title":"预约超时通知","content":"工单编号:20171013194811487890 您还没有预约，请及时与客户协调上门时间","sender":null,"hxAccount":"cfc68f0182484d1f9746a0f15248eafc","status":1,"type":1,"functionType":null,"category":1,"action":null,"reason":null,"batchId":null,"createTime":"2017-10-13 21:01:47","startTime":null,"endTime":null},{"id":229,"title":"预约超时通知","content":"工单编号:20171013194811487890 您还没有预约，请及时与客户协调上门时间","sender":null,"hxAccount":"f2b2a017d7154c75bf6d1f4b8076ab53","status":1,"type":1,"functionType":null,"category":1,"action":null,"reason":null,"batchId":null,"createTime":"2017-10-13 21:01:47","startTime":null,"endTime":null}]
* totalPages : 1
* previousPageNo : 1
* nextPageNo : 1
*/
private int pageNo;
private int pageSize;
private int totalRows;
private int totalPages;
private int previousPageNo;
private int nextPageNo;
private List<DataBean> data;
public int getPageNo() {
return pageNo;
}
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getTotalRows() {
return totalRows;
}
public void setTotalRows(int totalRows) {
this.totalRows = totalRows;
}
public int getTotalPages() {
return totalPages;
}
public void setTotalPages(int totalPages) {
this.totalPages = totalPages;
}
public int getPreviousPageNo() {
return previousPageNo;
}
public void setPreviousPageNo(int previousPageNo) {
this.previousPageNo = previousPageNo;
}
public int getNextPageNo() {
return nextPageNo;
}
public void setNextPageNo(int nextPageNo) {
this.nextPageNo = nextPageNo;
}
public List<DataBean> getData() {
return data;
}
public void setData(List<DataBean> data) {
this.data = data;
}
public static class DataBean {
/**
* id : 228
* title : 预约超时通知
* content : 工单编号:20171013194811487890 您还没有预约，请及时与客户协调上门时间
* sender : null
* hxAccount : cfc68f0182484d1f9746a0f15248eafc
* status : 1
* type : 1
* functionType : null
* category : 1
* action : null
* reason : null
* batchId : null
* createTime : 2017-10-13 21:01:47
* startTime : null
* endTime : null
*/
private int id;
private String title;
private String content;
private Object sender;
private String hxAccount;
private int status;
private int type;
private Object functionType;
private int category;
private Object action;
private Object reason;
private Object batchId;
private String createTime;
private Object startTime;
private Object endTime;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public Object getSender() {
return sender;
}
public void setSender(Object sender) {
this.sender = sender;
}
public String getHxAccount() {
return hxAccount;
}
public void setHxAccount(String hxAccount) {
this.hxAccount = hxAccount;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public Object getFunctionType() {
return functionType;
}
public void setFunctionType(Object functionType) {
this.functionType = functionType;
}
public int getCategory() {
return category;
}
public void setCategory(int category) {
this.category = category;
}
public Object getAction() {
return action;
}
public void setAction(Object action) {
this.action = action;
}
public Object getReason() {
return reason;
}
public void setReason(Object reason) {
this.reason = reason;
}
public Object getBatchId() {
return batchId;
}
public void setBatchId(Object batchId) {
this.batchId = batchId;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public Object getStartTime() {
return startTime;
}
public void setStartTime(Object startTime) {
this.startTime = startTime;
}
public Object getEndTime() {
return endTime;
}
public void setEndTime(Object endTime) {
this.endTime = endTime;
}
}
}
}
app/src/main/java/com/dayu/bigfish/bean/MessageTell.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/OrderDetailsBean.java 100644 → 100755
......@@ -11,7 +11,7 @@ public class OrderDetailsBean implements Serializable {
/**
* code : 0
* data : {"id":9,"orderNum":"20170914164529038190","source":1,"partnerNum":null,"partnerName":null,"status":3,"repairType":1,"customerType":1,"customerName":"铁扇公主","customerCompany":"铁扇公主","customerMobile":"13800138000","customerTelphome":"","provinceId":1,"provinceName":"北京市","cityId":2,"cityName":"北京城区","districtId":144,"districtName":"门头沟区","address":"火焰山3号院","providerTypeId":26,"providerName":"维修","categoryId":18,"categoryName":"自定义电视","categorySource":null,"brandId":3,"brandName":"格力二号","productModel":"ss","createId":115,"created":"大鱼创想","createTime":"2017-09-14 16:45:29","appointmentTime":"2017-09-15 17:00:00","comment":"火焰山3号院火焰山3号院火焰山3号院火焰山3号院火焰山3号院","confirmDoorTime":"2018-06-23 15:34:27","confirmDoorComment":"露露比姚帅脑瓜仁疼","serviceRecordComment":null,"customerCheckComment":null,"isPay":null,"payType":null,"doorPrice":null,"doorPriceComment":null,"servicePrice":null,"servicePriceComment":null,"materialCost":null,"materialCostComment":null,"otherPrice":null,"otherPriceComment":null,"totalPrice":null,"cancelOrderReason":null,"closePhase":null,"siteId":40,"engineerId":118,"feedback":null,"complait":null,"record":[{"id":8,"orderId":9,"createTime":"2017-09-14 16:45:29","operation":"工单创建","operationComment":"大鱼创想 通过 新建工单 创建了工单工程师齐天大圣 (17310890230) 接单","serviceProgessTime":null,"serviceProgessTimeNum":null,"commentName":"工单备注","commentInfo":"火焰山3号院火焰山3号院火焰山3号院火焰山3号院火焰山3号院"},{"id":77,"orderId":9,"createTime":"2017-09-14 19:51:26","operation":"工程师预约","operationComment":"工程师齐天大圣进行客户预约","serviceProgessTime":"T3","serviceProgessTimeNum":3,"commentName":"预约时间及备注","commentInfo":"预约时间:2018-06-23 15:34:27 露露比姚帅脑瓜仁疼"},{"id":92,"orderId":9,"createTime":"2017-09-15 10:26:27","operation":"工程师上门","operationComment":"工程师齐天大圣 (17310890230) 开始上门","serviceProgessTime":"T4","serviceProgessTimeNum":4,"commentName":null,"commentInfo":null}],"pic":[]}
* data : {"id":48,"orderNum":"20171013151641110126","source":1,"partnerNum":null,"partnerName":null,"status":2,"repairType":1,"customerType":1,"customerName":"测试363","customerCompany":"测试363","customerMobile":"15265895425","customerTelphome":"010-2569548","provinceId":1,"provinceName":"北京市","cityId":2,"cityName":"北京城区","districtId":3,"districtName":"东城区","address":"某某大厦","providerTypeId":328,"providerName":"安装","categoryId":"C_727","categoryName":"海贼王","categorySource":null,"brandId":438,"brandName":"春兰","productModel":"256","createId":285,"created":"大鱼鱼头","createTime":"2017-10-13 15:16:41","appointmentTime":"2017-10-14 15:16:20","comment":"测试363测试363","confirmDoorTime":null,"confirmDoorComment":null,"serviceRecordComment":null,"customerCheckComment":null,"isPay":null,"payType":null,"doorPrice":null,"doorPriceComment":null,"servicePrice":null,"servicePriceComment":null,"materialCost":null,"materialCostComment":null,"otherPrice":null,"otherPriceComment":null,"totalPrice":null,"cancelOrderReason":null,"closePhase":null,"siteId":143,"engineerId":288,"feedback":null,"complait":null,"record":[{"id":174,"orderId":48,"createTime":"2017-10-13 15:16:41","operation":"工单创建","operationComment":"大鱼鱼头 通过 新建工单 创建了工单工程师大鱼冬师傅 (18062907260) 接单","serviceProgessTime":"T2","serviceProgessTimeNum":2,"commentName":"工单备注","commentInfo":"测试363测试363"}],"pic":[]}
* msg : 成功
*/
......@@ -45,40 +45,40 @@ public class OrderDetailsBean implements Serializable {
public static class DataBean {
/**
* id : 9
* orderNum : 20170914164529038190
* id : 48
* orderNum : 20171013151641110126
* source : 1
* partnerNum : null
* partnerName : null
* status : 3
* status : 2
* repairType : 1
* customerType : 1
* customerName : 铁扇公主
* customerCompany : 铁扇公主
* customerMobile : 13800138000
* customerTelphome :
* customerName : 测试363
* customerCompany : 测试363
* customerMobile : 15265895425
* customerTelphome : 010-2569548
* provinceId : 1
* provinceName : 北京市
* cityId : 2
* cityName : 北京城区
* districtId : 144
* districtName : 门头沟区
* address : 火焰山3号院
* providerTypeId : 26
* providerName : 维修
* categoryId : 18
* categoryName : 自定义电视
* districtId : 3
* districtName : 东城区
* address : 某某大厦
* providerTypeId : 328
* providerName : 安装
* categoryId : C_727
* categoryName : 海贼王
* categorySource : null
* brandId : 3
* brandName : 格力二号
* productModel : ss
* createId : 115
* created : 大鱼创想
* createTime : 2017-09-14 16:45:29
* appointmentTime : 2017-09-15 17:00:00
* comment : 火焰山3号院火焰山3号院火焰山3号院火焰山3号院火焰山3号院
* confirmDoorTime : 2018-06-23 15:34:27
* confirmDoorComment : 露露比姚帅脑瓜仁疼
* brandId : 438
* brandName : 春兰
* productModel : 256
* createId : 285
* created : 大鱼鱼头
* createTime : 2017-10-13 15:16:41
* appointmentTime : 2017-10-14 15:16:20
* comment : 测试363测试363
* confirmDoorTime : null
* confirmDoorComment : null
* serviceRecordComment : null
* customerCheckComment : null
* isPay : null
......@@ -94,11 +94,11 @@ public class OrderDetailsBean implements Serializable {
* totalPrice : null
* cancelOrderReason : null
* closePhase : null
* siteId : 40
* engineerId : 118
* siteId : 143
* engineerId : 288
* feedback : null
* complait : null
* record : [{"id":8,"orderId":9,"createTime":"2017-09-14 16:45:29","operation":"工单创建","operationComment":"大鱼创想 通过 新建工单 创建了工单工程师齐天大圣 (17310890230) 接单","serviceProgessTime":null,"serviceProgessTimeNum":null,"commentName":"工单备注","commentInfo":"火焰山3号院火焰山3号院火焰山3号院火焰山3号院火焰山3号院"},{"id":77,"orderId":9,"createTime":"2017-09-14 19:51:26","operation":"工程师预约","operationComment":"工程师齐天大圣进行客户预约","serviceProgessTime":"T3","serviceProgessTimeNum":3,"commentName":"预约时间及备注","commentInfo":"预约时间:2018-06-23 15:34:27 露露比姚帅脑瓜仁疼"},{"id":92,"orderId":9,"createTime":"2017-09-15 10:26:27","operation":"工程师上门","operationComment":"工程师齐天大圣 (17310890230) 开始上门","serviceProgessTime":"T4","serviceProgessTimeNum":4,"commentName":null,"commentInfo":null}]
* record : [{"id":174,"orderId":48,"createTime":"2017-10-13 15:16:41","operation":"工单创建","operationComment":"大鱼鱼头 通过 新建工单 创建了工单工程师大鱼冬师傅 (18062907260) 接单","serviceProgessTime":"T2","serviceProgessTimeNum":2,"commentName":"工单备注","commentInfo":"测试363测试363"}]
* pic : []
*/
......@@ -123,7 +123,7 @@ public class OrderDetailsBean implements Serializable {
private String address;
private int providerTypeId;
private String providerName;
private int categoryId;
private String categoryId;
private String categoryName;
private Object categorySource;
private int brandId;
......@@ -134,8 +134,8 @@ public class OrderDetailsBean implements Serializable {
private String createTime;
private String appointmentTime;
private String comment;
private String confirmDoorTime;
private String confirmDoorComment;
private Object confirmDoorTime;
private Object confirmDoorComment;
private Object serviceRecordComment;
private Object customerCheckComment;
private Object isPay;
......@@ -326,11 +326,11 @@ public class OrderDetailsBean implements Serializable {
this.providerName = providerName;
}
public int getCategoryId() {
public String getCategoryId() {
return categoryId;
}
public void setCategoryId(int categoryId) {
public void setCategoryId(String categoryId) {
this.categoryId = categoryId;
}
......@@ -414,19 +414,19 @@ public class OrderDetailsBean implements Serializable {
this.comment = comment;
}
public String getConfirmDoorTime() {
public Object getConfirmDoorTime() {
return confirmDoorTime;
}
public void setConfirmDoorTime(String confirmDoorTime) {
public void setConfirmDoorTime(Object confirmDoorTime) {
this.confirmDoorTime = confirmDoorTime;
}
public String getConfirmDoorComment() {
public Object getConfirmDoorComment() {
return confirmDoorComment;
}
public void setConfirmDoorComment(String confirmDoorComment) {
public void setConfirmDoorComment(Object confirmDoorComment) {
this.confirmDoorComment = confirmDoorComment;
}
......@@ -600,15 +600,15 @@ public class OrderDetailsBean implements Serializable {
public static class RecordBean {
/**
* id : 8
* orderId : 9
* createTime : 2017-09-14 16:45:29
* id : 174
* orderId : 48
* createTime : 2017-10-13 15:16:41
* operation : 工单创建
* operationComment : 大鱼创想 通过 新建工单 创建了工单工程师齐天大圣 (17310890230) 接单
* serviceProgessTime : null
* serviceProgessTimeNum : null
* operationComment : 大鱼鱼头 通过 新建工单 创建了工单工程师大鱼冬师傅 (18062907260) 接单
* serviceProgessTime : T2
* serviceProgessTimeNum : 2
* commentName : 工单备注
* commentInfo : 火焰山3号院火焰山3号院火焰山3号院火焰山3号院火焰山3号院
* commentInfo : 测试363测试363
*/
private int id;
......@@ -616,8 +616,8 @@ public class OrderDetailsBean implements Serializable {
private String createTime;
private String operation;
private String operationComment;
private Object serviceProgessTime;
private Object serviceProgessTimeNum;
private String serviceProgessTime;
private int serviceProgessTimeNum;
private String commentName;
private String commentInfo;
......@@ -661,19 +661,19 @@ public class OrderDetailsBean implements Serializable {
this.operationComment = operationComment;
}
public Object getServiceProgessTime() {
public String getServiceProgessTime() {
return serviceProgessTime;
}
public void setServiceProgessTime(Object serviceProgessTime) {
public void setServiceProgessTime(String serviceProgessTime) {
this.serviceProgessTime = serviceProgessTime;
}
public Object getServiceProgessTimeNum() {
public int getServiceProgessTimeNum() {
return serviceProgessTimeNum;
}
public void setServiceProgessTimeNum(Object serviceProgessTimeNum) {
public void setServiceProgessTimeNum(int serviceProgessTimeNum) {
this.serviceProgessTimeNum = serviceProgessTimeNum;
}
......@@ -692,82 +692,6 @@ public class OrderDetailsBean implements Serializable {
public void setCommentInfo(String commentInfo) {
this.commentInfo = commentInfo;
}
@Override
public String toString() {
return "RecordBean{" +
"id=" + id +
", orderId=" + orderId +
", createTime='" + createTime + '\'' +
", operation='" + operation + '\'' +
", operationComment='" + operationComment + '\'' +
", serviceProgessTime=" + serviceProgessTime +
", serviceProgessTimeNum=" + serviceProgessTimeNum +
", commentName='" + commentName + '\'' +
", commentInfo='" + commentInfo + '\'' +
'}';
}
}
@Override
public String toString() {
return "DataBean{" +
"id=" + id +
", orderNum='" + orderNum + '\'' +
", source=" + source +
", partnerNum=" + partnerNum +
", partnerName=" + partnerName +
", status=" + status +
", repairType=" + repairType +
", customerType=" + customerType +
", customerName='" + customerName + '\'' +
", customerCompany='" + customerCompany + '\'' +
", customerMobile='" + customerMobile + '\'' +
", customerTelphome='" + customerTelphome + '\'' +
", provinceId=" + provinceId +
", provinceName='" + provinceName + '\'' +
", cityId=" + cityId +
", cityName='" + cityName + '\'' +
", districtId=" + districtId +
", districtName='" + districtName + '\'' +
", address='" + address + '\'' +
", providerTypeId=" + providerTypeId +
", providerName='" + providerName + '\'' +
", categoryId=" + categoryId +
", categoryName='" + categoryName + '\'' +
", categorySource=" + categorySource +
", brandId=" + brandId +
", brandName='" + brandName + '\'' +
", productModel='" + productModel + '\'' +
", createId=" + createId +
", created='" + created + '\'' +
", createTime='" + createTime + '\'' +
", appointmentTime='" + appointmentTime + '\'' +
", comment='" + comment + '\'' +
", confirmDoorTime='" + confirmDoorTime + '\'' +
", confirmDoorComment='" + confirmDoorComment + '\'' +
", serviceRecordComment=" + serviceRecordComment +
", customerCheckComment=" + customerCheckComment +
", isPay=" + isPay +
", payType=" + payType +
", doorPrice=" + doorPrice +
", doorPriceComment=" + doorPriceComment +
", servicePrice=" + servicePrice +
", servicePriceComment=" + servicePriceComment +
", materialCost=" + materialCost +
", materialCostComment=" + materialCostComment +
", otherPrice=" + otherPrice +
", otherPriceComment=" + otherPriceComment +
", totalPrice=" + totalPrice +
", cancelOrderReason=" + cancelOrderReason +
", closePhase=" + closePhase +
", siteId=" + siteId +
", engineerId=" + engineerId +
", feedback=" + feedback +
", complait=" + complait +
", record=" + record +
", pic=" + pic +
'}';
}
}
}
app/src/main/java/com/dayu/bigfish/bean/OrderDetailsTwoBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/OrderFinishBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/PersonalCenterBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/PhotoBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/ReceOrderBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/ReceOrderNum.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/ReceUserRevenue.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/ReceivingBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/ReceivingOrderBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/RegisterBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/ServeDetailsBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/TabBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/UserInfo.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/VersionBase.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/eventbus/AgainUpDoorText.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/eventbus/OrderFinish.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/eventbus/RefreshTabNum.java 0 → 100755
package com.dayu.bigfish.eventbus;
/**
* Created by yu on 2017/10/11.
*/
public class RefreshTabNum {
private int tabNum;
public RefreshTabNum(int tabNum) {
this.tabNum = tabNum;
}
public int getTabNum() {
return tabNum;
}
public void setTabNum(int tabNum) {
this.tabNum = tabNum;
}
}
app/src/main/java/com/dayu/bigfish/eventbus/UpdataTime.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/fragment/HomeEndTabFragment.java 100644 → 100755
......@@ -46,7 +46,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
Unbinder unbinder;
@BindView(R.id.refresh)
com.cjj.MaterialRefreshLayout refresh;
private List<OrderFinishBean.DataBeanX.DataBean> finishList;
private List<OrderFinishBean.DataBeanX.DataBean> finishList;
private boolean hasNextPage = false;
private CustomProgressDialog dialog;
private TipsHelper mTipsHelper;
......@@ -56,12 +56,15 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
private int userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
private boolean isPrepared;
private int orderId;
private String token;
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
View rootView = inflater.inflate(R.layout.fragment_tab_end, container, false);
unbinder = ButterKnife.bind(this, rootView);
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
mTipsHelper = createTipsHelper(tabEndList);
token = GetUserInfo.getToken(getContext());
dialog.show();
initRefresh();
isPrepared = true;
......@@ -71,11 +74,11 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
}
public void initView() {
initData();
//initData();
}
@Override
protected void initData() {
homeEndTabPresenter.getFinishOrder(5, 1, userId, 10, siteId);
homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
}
......@@ -120,7 +123,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
// page = 1;
// initData(2, page, userId,10,siteId);
homeEndTabPresenter.getFinishOrder(5, 1, userId, 10, siteId);
homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
refresh.finishRefresh();
}
......@@ -160,7 +163,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
public void error(String msg) {
dialog.dismiss();
mTipsHelper.showError(true, msg, v -> {
homeEndTabPresenter.getFinishOrder(5, 1, userId, 10, siteId);
homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
dialog.show();
});
ToastUtils.showShortToast(msg);
......@@ -170,6 +173,6 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
@Override
public void onResume() {
super.onResume();
homeEndTabPresenter.getFinishOrder(5, 1, userId, 10, siteId);
homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
}
}
app/src/main/java/com/dayu/bigfish/fragment/HomeOneTabFragment.java 100644 → 100755
......@@ -20,6 +20,8 @@ import com.dayu.bigfish.adapter.HomeOneTabAdapter;
import com.dayu.bigfish.application.MyApplication;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.HomeOneTabBean;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.eventbus.UpdataTime;
import com.dayu.bigfish.fragment.order.OrderDatailsFragment;
import com.dayu.bigfish.moudle.reservation.ReservationPresenter;
import com.dayu.bigfish.moudle.reservation.ReservationView;
......@@ -32,6 +34,8 @@ import com.google.gson.Gson;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback;
import org.greenrobot.eventbus.EventBus;
import java.util.List;
import butterknife.BindView;
......@@ -60,11 +64,16 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
// 标志位，标志已经初始化完成。
private boolean isPrepared;
private TipsHelper mTipsHelper;
private String token;
private int orderId;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
View rootView = inflater.inflate(R.layout.fragment_tab_one, container, false);
unbinder = ButterKnife.bind(this, rootView);
token = GetUserInfo.getToken(getContext());
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
dialog.show();
mTipsHelper = createTipsHelper(tabOneList);
......@@ -80,7 +89,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
public void initListener() {
tabOneList.setOnItemClickListener((parent, view, position, id) -> {
int orderId = oneTablist.get(position).getId();
orderId = oneTablist.get(position).getId();
Intent intent = new Intent(getContext(), OrderDetailsActivity.class);
intent.putExtra("orderId", orderId + "");
startActivity(intent);
......@@ -90,13 +99,13 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
@Override
public void initView() {
initData();
// initData();
// initListener();
}
@Override
public void initData() {
presenter.getData(2, 1, userId, 10, siteId);
presenter.getData(2, 1, userId, 10, siteId,token);
}
......@@ -132,7 +141,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
@Override
public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
page = 1;
presenter.getData(2, page, userId, 10, siteId);
presenter.getData(2, page, userId, 10, siteId,token);
refresh.finishRefresh();
}
......@@ -176,7 +185,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
public void getDataFail(String data) {
dialog.dismiss();
mTipsHelper.showError(true, data, v -> {
presenter.getData(2, page, userId, 10, siteId);
presenter.getData(2, page, userId, 10, siteId,token);
dialog.show();
});
ToastUtils.showShortToast(data);
......@@ -185,7 +194,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
@Override
public void onResume() {
super.onResume();
presenter.getData(2, page, userId, 10, siteId);
presenter.getData(2, page, userId, 10, siteId,token);
}
}
app/src/main/java/com/dayu/bigfish/fragment/HomeThreeTabFragment.java 100644 → 100755
......@@ -61,14 +61,14 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
// 标志位，标志已经初始化完成。
private boolean isPrepared;
private TipsHelper mTipsHelper;
private String token;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
View rootView = inflater.inflate(R.layout.fragment_tab_three, container, false);
unbinder = ButterKnife.bind(this, rootView);
token = GetUserInfo.getToken(getContext());
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
mTipsHelper = createTipsHelper(tabThreeList);
dialog.show();
......@@ -94,13 +94,13 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
@Override
public void initView() {
initData();
// initData();
//initListener();
}
@Override
public void initData() {
presenter.getErrorOrder(userId,siteId);
presenter.getErrorOrder(userId,siteId,token);
}
@Override
......@@ -133,7 +133,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
//下拉刷新
@Override
public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
presenter.getErrorOrder(userId,siteId);
presenter.getErrorOrder(userId,siteId,token);
refresh.finishRefresh();
}
......@@ -165,7 +165,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
@Override
public void onResume() {
super.onResume();
presenter.getErrorOrder(userId,siteId);
presenter.getErrorOrder(userId,siteId,token);
}
@Override
......@@ -195,7 +195,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
public void error(String msg) {
dialog.dismiss();
mTipsHelper.showError(true, msg, v -> {
presenter.getErrorOrder(userId,siteId);
presenter.getErrorOrder(userId,siteId,token);
dialog.show();
});
ToastUtils.showShortToast(msg);
......
app/src/main/java/com/dayu/bigfish/fragment/HomeTwoTabFragment.java 100644 → 100755
......@@ -71,11 +71,14 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
private MyGreenDao ss;//数据库
private TipsHelper mTipsHelper;
private int orderId;
private String token;
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
View rootView = inflater.inflate(R.layout.fragment_tab_two, container, false);
unbinder = ButterKnife.bind(this, rootView);
token = GetUserInfo.getToken(getContext());
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
mTipsHelper = createTipsHelper(tabTwoList);
dialog.show();
......@@ -88,7 +91,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
}
public void initView() {
initData();
// initData();
// initListener();
}
......@@ -103,7 +106,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
@Override
protected void initData() {
presenter.getData(110, page, userId, 10, siteId);
presenter.getData(110, page, userId, 10, siteId,token);
}
@Override
......@@ -131,7 +134,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
@Override
public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
page = 1;
presenter.getData(110, page, userId, 10, siteId);
presenter.getData(110, page, userId, 10, siteId,token);
refresh.finishRefresh();
}
......@@ -160,7 +163,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
dialog.dismiss();
} else {
mTipsHelper.hideEmpty();
homeTwoTabAdapter = new HomeTwoTabAdapter(getContext(), list);
homeTwoTabAdapter = new HomeTwoTabAdapter(getContext(), list,token);
tabTwoList.setAdapter(homeTwoTabAdapter);
homeTwoTabAdapter.notifyDataSetChanged();
dialog.dismiss();
......@@ -200,7 +203,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
public void getDataFail(String s) {
dialog.dismiss();
mTipsHelper.showError(true, s, v -> {
presenter.getData(110, page, userId, 10, siteId);
presenter.getData(110, page, userId, 10, siteId,token);
dialog.show();
});
ToastUtils.showShortToast(s);
......@@ -209,7 +212,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
@Override
public void onResume() {
super.onResume();
presenter.getData(110, page, userId, 10, siteId);
presenter.getData(110, page, userId, 10, siteId,token);
}
/**
......
app/src/main/java/com/dayu/bigfish/fragment/order/OrderDatailsFragment.java 100644 → 100755
......@@ -14,6 +14,9 @@ import android.widget.TextView;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.OrderDetailsBean;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import com.google.gson.Gson;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback;
......@@ -123,7 +126,7 @@ public class OrderDatailsFragment extends Fragment {
@BindView(R.id.no_charge)
RelativeLayout noCharge;
private int orderId;
public OrderDetailsBean.DataBean dataBean;
private OrderDetailsBean.DataBean dataBean;
private int orderStatu;
private int customerType;
private int repairType;
......@@ -133,45 +136,50 @@ public class OrderDatailsFragment extends Fragment {
private String servicePrice;
private String doorPrice;
private String totalPrice;
private CustomProgressDialog dialog;
private String token;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View layout = inflater.inflate(R.layout.fragment_order_datails, container, false);
token = GetUserInfo.getToken(getContext());
orderId = getArguments().getInt("orderId");
System.out.println("工单详情页！！！");
initData(orderId);
unbinder = ButterKnife.bind(this, layout);
System.out.println("工单详情页！！！");
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
initData(orderId,token);
return layout;
}
private void initData(int orderId) {
private void initData(int orderId,String token) {
System.out.println("工单详情的id为---->" + orderId);
dialog.show();
//"http://47.94.101.239:7200/orders/" + orderId + "/detail"
OkGo.get(Constants.BASE_URL+"api-order"+"orders/" + orderId + "/detail")
OkGo.get(Constants.ORDER_DETAILS+ orderId + Constants.ORDER_TEMP)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
System.out.println("查询工单信息返回的数据--->" + s);
Gson gson = new Gson();
OrderDetailsBean orderDetailsBean = gson.fromJson(s, OrderDetailsBean.class);
if (orderDetailsBean.getCode() == 0){
dataBean = orderDetailsBean.getData();
initDataView(dataBean);
}
else{
ToastUtils.showShortToast("数据获取失败");
}
}
@Override
public void onError(Call call, Response response, Exception e) {
// System.out.println("");
System.out.println();
ToastUtils.showShortToast("网络或服务器异常");
}
});
}
public void initDataView(OrderDetailsBean.DataBean dataBean) {
// orderNum 工单编号
textOneOne.setText(dataBean.getOrderNum());
// status 工单状态 1未接单2未预约3已预约4进行中5已完成6已取消7订单关闭
......@@ -299,6 +307,7 @@ public class OrderDatailsFragment extends Fragment {
noCharge.setVisibility(View.GONE);
isCharge.setVisibility(View.VISIBLE);
}*/
dialog.dismiss();
}
@Override
......
app/src/main/java/com/dayu/bigfish/fragment/order/OrderDatailsServeFragment.java 100644 → 100755
......@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.ServeDatailsAdapter;
import com.dayu.bigfish.base.BaseFragment;
......@@ -21,6 +22,7 @@ import com.dayu.bigfish.moudle.orderDatailsServe.BaseHolder;
import com.dayu.bigfish.moudle.orderDatailsServe.OrderDatailsServePresenter;
import com.dayu.bigfish.moudle.orderDatailsServe.OrderDatailsServeView;
import com.dayu.bigfish.tip.TipsHelper;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import com.google.gson.Gson;
......@@ -52,12 +54,14 @@ public class OrderDatailsServeFragment extends Fragment {
private CustomProgressDialog dialog;*/
private List<ServeDetailsBean.DataBean.RecordBean> recordBeen;
private ServeDatailsAdapter serveDatailsAdapter;
private String token;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View layout = inflater.inflate(R.layout.fragment_order_serve, container, false);
orderId = getArguments().getInt("orderId");
token = GetUserInfo.getToken(getContext());
unbinder = ButterKnife.bind(this, layout);
// dialog=new CustomProgressDialog(getContext(), R.style.CustomDialog);
// dialog.show();
......@@ -65,13 +69,14 @@ public class OrderDatailsServeFragment extends Fragment {
// initRefresh();
// lazyLoad();
// initListener();
initData(orderId);
initData(orderId,token);
return layout;
}
public void initData(int orderId){
public void initData(int orderId,String token){
System.out.println("工单详情的id为---->" + orderId);
OkGo.get("http://47.94.101.239:7200/orders/" + orderId + "/detail")
OkGo.get(Constants.ORDER_DETAILS+ orderId + Constants.ORDER_TEMP)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......
app/src/main/java/com/dayu/bigfish/fragment/order/message/BigFishMessageFragment.java 0 → 100644
package com.dayu.bigfish.fragment.order.message;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.dayu.bigfish.R;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
/**
* 大鱼官方通知
* on 2017/10/11.
*/
public class BigFishMessageFragment extends Fragment {
@BindView(R.id.big_image_empty)
ImageView bigImageEmpty;
@BindView(R.id.big_textView_empty)
TextView bigTextViewEmpty;
@BindView(R.id.big_message_view)
RelativeLayout bigMessageView;
Unbinder unbinder;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View layout = inflater.inflate(R.layout.fragment_message_bigfish, container, false);
unbinder = ButterKnife.bind(this, layout);
return layout;
}
@Override
public void onDestroyView() {
super.onDestroyView();
unbinder.unbind();
}
}
app/src/main/java/com/dayu/bigfish/fragment/order/message/SystemMessageFragment.java 0 → 100644
package com.dayu.bigfish.fragment.order.message;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.SystemMessageAdapter;
import com.dayu.bigfish.bean.MessageBean;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.google.gson.Gson;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import okhttp3.Call;
import okhttp3.Response;
/**
* 系统通知
* on 2017/10/11.
*/
public class SystemMessageFragment extends Fragment {
/*@BindView(R.id.message_image_empty)
ImageView messageImageEmpty;
@BindView(R.id.message_textView_empty)
TextView messageTextViewEmpty;
@BindView(R.id.message_view)
RelativeLayout messageView;*/
@BindView(R.id.message_system_listview)
ListView messageSystemListview;
private String token;
private SystemMessageAdapter systemAdapter;
private List<MessageBean.DataBeanX.DataBean> myDataList;
private String hxUserId;
Unbinder unbinder;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View layout = inflater.inflate(R.layout.fragment_message_system, container, false);
unbinder = ButterKnife.bind(this, layout);
token = GetUserInfo.getToken(getContext());
hxUserId = GetUserInfo.getHxUserId(getContext());
initData(token,hxUserId);
return layout;
}
/**
* 初始化环信数据
*/
private void initData(String token,String hxUserId) {
OkGo.get(Constants.MESSAGE_HX)
.tag(this)
.headers("token", token)
.params("hxAccount",hxUserId)
//功能：1、消息盒子 2、待接单提醒
.params("functionType",1)
//分类：1、系统消息 2、后台推送
.params("category",1)
.params("page",1)
.params("pageSize",10)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
MessageBean messageBean = gson.fromJson(s, MessageBean.class);
if (messageBean.getCode() == 0) {
myDataList = messageBean.getData().getData();
loadPager();
}else{
ToastUtils.showShortToast("消息列表获取失败");
}
}
@Override
public void onError(Call call, Response response, Exception e) {
super.onError(call, response, e);
ToastUtils.showShortToast("服务器异常,消息列表获取失败");
}
});
}
private void loadPager() {
systemAdapter = new SystemMessageAdapter(myDataList, getContext());
messageSystemListview.setAdapter(systemAdapter);
systemAdapter.notifyDataSetChanged();
}
@Override
public void onDestroyView() {
super.onDestroyView();
unbinder.unbind();
}
}
app/src/main/java/com/dayu/bigfish/greendao/DaoMaster.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/greendao/DaoSession.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/greendao/MyGreenDaoDao.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/managers/AppManager.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/managers/UserManager.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/moudle/beltservice/BeltServicePresenter.java 100644 → 100755
......@@ -24,9 +24,10 @@ public class BeltServicePresenter extends BasePresenter<BeltServiceView> {
public BeltServicePresenter(BeltServiceView reltServiceView) {
mBeltServiceView = reltServiceView;
}
public void getData(int state,int page,int engineerId,int pageSize,int siteId){
public void getData(int state,int page,int engineerId,int pageSize,int siteId,String token){
OkGo.get(Constants.ORDER_URL)
.tag(this)
.headers("token",token)
.params("state", state)
.params("page", page)
.params("siteId",siteId)
......@@ -36,6 +37,7 @@ public class BeltServicePresenter extends BasePresenter<BeltServiceView> {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
System.out.println("待服务列表数据-->"+s);
HomeTwoTabBean twoTab = gson.fromJson(s, HomeTwoTabBean.class);
if (twoTab.getCode()==0){
mBeltServiceView.getDataSuc(twoTab);
......
app/src/main/java/com/dayu/bigfish/moudle/check/OrderFinishActivityPresenter.java 100644 → 100755
......@@ -41,9 +41,10 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
this.orderFinishActivityView = orderFinishActivityView;
}
public void getInitData(int orderId) {
public void getInitData(int orderId,String token) {
OkGo.get(Constants.SELECT_ORDER + orderId)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......@@ -66,7 +67,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
public void postSubmit(int orderId, String editText, int engineerId,
int isPay,
String doorPrice, String doorPriceComment,
String servicePrice, String materialCost, String otherPrice) {
String servicePrice, String materialCost, String otherPrice,String token) {
HashMap<String, Object> params = new HashMap<>();
//服务记录
......@@ -99,6 +100,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
OkGo.post(Constants.ORDER_FINISH)
.tag(this)
.upJson(jsonObject.toString())
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......@@ -123,7 +125,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
public void postPhotoSubmit(List<String> imageUrl, int orderId, String editText, int engineerId,
int isPay,
String doorPrice, String doorPriceComment,
String servicePrice, String materialCost, String otherPrice) {
String servicePrice, String materialCost, String otherPrice,String token) {
HashMap<String, Object> params = new HashMap<>();
//服务记录
......@@ -175,6 +177,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
OkGo.post(Constants.ORDER_FINISH)
.tag(this)
.upJson(jsonObject.toString())
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......@@ -201,7 +204,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
/**
* 上传照片至服务器
*/
public void upPhoto(List<String> imageUrl, int orderId) {
public void upPhoto(List<String> imageUrl, int orderId,String token) {
System.out.println("该订单id为:" + orderId);
// http://47.94.101.239:3111/file/uploadOne?
// targetPath=mobile/business/checkApply/
......@@ -214,6 +217,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
//http://47.94.101.239:3111/file/uploadOne?targetPath=mobile/business/checkApply/{ticketId}
OkGo.post(Constants.UP_PHOTO)
.tag(this)
.headers("token",token)
.params("targetPath", "mobile/business/checkApply")
.params("ticketId", orderId)
.addFileParams("fileUpload", files)
......
app/src/main/java/com/dayu/bigfish/moudle/error/ErrorPresenter.java 100644 → 100755
......@@ -22,15 +22,17 @@ public class ErrorPresenter extends BasePresenter<ErrorView> {
public ErrorPresenter(ErrorView mErrorView) {
this.mErrorView = mErrorView;
}
public void getErrorOrder(int userId,int userSite){
public void getErrorOrder(int userId,int userSite,String token){
OkGo.get(Constants.ERROR_ORDER)
.tag(this)
.headers("token",token)
.params("engineerId",userId)
.params("siteId",userSite)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
System.out.println("异常单列表数据-->"+s);
ErrorOrderBean errorOrderBean = gson.fromJson(s, ErrorOrderBean.class);
if (errorOrderBean.getCode()==0){
mErrorView.getSuccess(errorOrderBean);
......
app/src/main/java/com/dayu/bigfish/moudle/error/ErrorView.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/moudle/finish/HomeEndTabPresenter.java 100644 → 100755
......@@ -19,9 +19,10 @@ public class HomeEndTabPresenter extends BasePresenter<HomeEndTabView> {
public HomeEndTabPresenter(HomeEndTabView homeEndTabView) {
this.homeEndTabView = homeEndTabView;
}
public void getFinishOrder(int state,int page,int engineerId,int pageSize,int siteId){
public void getFinishOrder(int state,int page,int engineerId,int pageSize,int siteId,String token){
OkGo.get(Constants.ORDER_URL)
.tag(this)
.headers("token",token)
.params("state", state)
.params("page", page)
.params("siteId",siteId)
......@@ -31,6 +32,7 @@ public class HomeEndTabPresenter extends BasePresenter<HomeEndTabView> {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
System.out.println("已取消列表数据-->"+s);
OrderFinishBean orderFinishBean = gson.fromJson(s, OrderFinishBean.class);
if (orderFinishBean.getCode()==0){
homeEndTabView.finishSuccess(orderFinishBean);
......
app/src/main/java/com/dayu/bigfish/moudle/home/HomePresenter.java
package com.dayu.bigfish.moudle.home;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.base.BasePresenter;
import com.dayu.bigfish.bean.BaseStringBean;
import com.dayu.bigfish.bean.VersionBase;
import com.dayu.bigfish.utils.LogUtils;
import com.dayu.bigfish.utils.ToastUtils;
import com.google.gson.Gson;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback;
......@@ -22,8 +29,70 @@ public class HomePresenter extends BasePresenter<HomeView> {
mHomeView = homeView;
}
public void get() {
public void get(String token,String version) {
//联网检测当前是否为最新版本
OkGo.get(Constants.UPDATA_VERSION + "dayushifua_dayu")
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
BaseStringBean baseStringBean = gson.fromJson(s, BaseStringBean.class);
if (baseStringBean.getCode() == 0) {
if (!(version.equals(baseStringBean.getData()))) {
ToastUtils.showShortToast("需要更新");
mHomeView.getDateSuccess(baseStringBean.getData());
} else {
// commitVersionInfo(userId, getIMEI(MainActivity.this), getPackageNum());
mHomeView.getDateFailed("当前是最新版本,无需更新");
}
} else {
mHomeView.Error("检测更新版本失败");
}
}
@Override
public void onError(Call call, Response response, Exception e) {
mHomeView.Error("网络或服务器异常,检测版本失败");
}
});
}
/**
* 获取新版本的信息
*/
public void upgradeVersion(String versionCode,String token) {
//?appId=dayushifua_dayu&versionCode=1.10.1
OkGo.get(Constants.UPGRADE_VERSION)
.tag(this)
.headers("token", token)
.params("appId", "dayushifua_dayu")
.params("versionCode", versionCode)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
System.out.println("新版本返回数据"+s);
VersionBase versionBase = gson.fromJson(s, VersionBase.class);
if (versionBase.getCode() == 0) {
//弹窗
mHomeView.getNewVersionSuccess(versionBase.getData().getUpgradePrompt(), versionBase.getData().getDownloadUrl());
} else {
mHomeView.getNewVersionFailed("获取新版本信息失败");
//SPUtils.get(MainActivity.this,"big_fish")
}
}
@Override
public void onError(Call call, Response response, Exception e) {
mHomeView.Error("网络或服务器异常,获取新版本APK失败");
}
});
}
}
\ No newline at end of file
app/src/main/java/com/dayu/bigfish/moudle/home/HomeView.java
......@@ -7,8 +7,13 @@ package com.dayu.bigfish.moudle.home;
public interface HomeView{
//获取数据成功
void getDateSuccess();
void getDateSuccess(String msg);
//获取数据失败
void getDateFailed(String msg);
//获取新版本信息成功
void getNewVersionSuccess(String msg,String downloadUrl);
//获取新版本信息失败
void getNewVersionFailed(String msg);
//网络异常
void Error(String msg);
}
app/src/main/java/com/dayu/bigfish/moudle/idea/IdeaActivityPresenter.java 100644 → 100755
......@@ -28,7 +28,7 @@ public class IdeaActivityPresenter extends BasePresenter<IdeaActivityView> {
public IdeaActivityPresenter(IdeaActivityView ideaActivityView) {
this.ideaActivityView = ideaActivityView;
}
public void getData(String comment,String userName,String mobile){
public void getData(String comment,String userName,String mobile,String token){
HashMap<String, Object> params = new HashMap<>();
//建议内容
params.put("comment",comment);
......@@ -49,6 +49,7 @@ public class IdeaActivityPresenter extends BasePresenter<IdeaActivityView> {
OkGo.post(Constants.SET_IDEA_COMMIT)
.tag(this)
.upJson(jsonObject.toString())
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......
app/src/main/java/com/dayu/bigfish/moudle/login/LoginPresenter.java 100644 → 100755
......@@ -51,8 +51,8 @@ public class LoginPresenter extends BasePresenter<LoginView> {
Gson gson = new Gson();
RegisterBean registerBean = gson.fromJson(s, RegisterBean.class);
LogUtils.i(s);
System.out.println("验证码发送成功"+s);
//回调view层发送验证成功的方法回调,并把解析后的bean类传递过去
mloginView.sendRegisterSuccess(registerBean);
}
......@@ -78,15 +78,10 @@ public class LoginPresenter extends BasePresenter<LoginView> {
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
LoginBean loginBean = gson.fromJson(s, LoginBean.class);
System.out.println("登录时服务器响应数据--->" + s);
//通过view层调用登录成功的方法
//System.out.println("------>" + loginBean.getCode());
if (loginBean.getCode() == 0) {
mloginView.loginSuccess(loginBean);
} else if(loginBean.getMsg().equals("该用户尚不是工程师")) {
mloginView.loginFailed("暂不接受个人注册");
} else{
mloginView.loginFailed("服务器异常,或验证码有误");
}else{
mloginView.loginFailed("验证码有误或您不是工程师");
}
}
@Override
......
app/src/main/java/com/dayu/bigfish/moudle/login/LoginView.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/moudle/personal/PersonalCenterPresenter.java 100644 → 100755
......@@ -31,9 +31,10 @@ public class PersonalCenterPresenter extends BasePresenter<PersonalCenterView> {
this.centerView = centerView;
}
public void get(int userId) {
public void get(int userId,String token) {
OkGo.get(Constants.PERSONAL_CENTER + userId)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......@@ -54,9 +55,10 @@ public class PersonalCenterPresenter extends BasePresenter<PersonalCenterView> {
}
//获取工程师今日业绩
public void getEarnings(int userSite,int userId) {
public void getEarnings(int userSite,int userId,String token) {
OkGo.get(Constants.USER_ORDER_REVENUE+Constants.SITE_ID+userSite+Constants.USER_ID+userId)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......@@ -76,9 +78,10 @@ public class PersonalCenterPresenter extends BasePresenter<PersonalCenterView> {
});
}
//获取工程师今日接单数量(次)
public void getReceOrder(int siteId, int userId) {
public void getReceOrder(int siteId, int userId,String token) {
OkGo.get(Constants.USER_ORDER_RECEIVING+Constants.SITE_ID+siteId+Constants.USER_ID+userId)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......@@ -99,9 +102,10 @@ public class PersonalCenterPresenter extends BasePresenter<PersonalCenterView> {
});
}
//获取工程师的累计信息 (评分,累计业绩,工单记录)
public void getOrderUserInfo(int siteId, int userId) {
public void getOrderUserInfo(int siteId, int userId,String token) {
OkGo.get(Constants.USER_REVENUE+Constants.SITE_ID+siteId+Constants.USER_ID+userId)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......
app/src/main/java/com/dayu/bigfish/moudle/receiving/ReceivingPresenter.java 100644 → 100755
......@@ -36,9 +36,10 @@ public class ReceivingPresenter extends BasePresenter<ReceivingView> {
* @param state 要展示的状态信息
* @param
*/
public void get(int state, int pagerId, int pagerSize, int siteId) {
public void get(int state, int pagerId, int pagerSize, int siteId,String token) {
System.out.println("站点---->" + siteId);
OkGo.get(Constants.ORDER_URL)
.headers("token",token)
.params("state", state)
.params("page", pagerId)
.params("pageSize", pagerSize)
......@@ -74,9 +75,10 @@ public class ReceivingPresenter extends BasePresenter<ReceivingView> {
* @param orders 订单号
* @param engineer 工程师的账户id
*/
public void receivingOrder(int orders, int engineer) {
public void receivingOrder(int orders, int engineer,String token) {
OkGo.get(Constants.ORDER_RECEIVING + orders + "/engineer/" + engineer)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......
app/src/main/java/com/dayu/bigfish/moudle/reservation/ReservationPresenter.java 100644 → 100755
......@@ -23,12 +23,13 @@ public class ReservationPresenter extends BasePresenter<ReservationView> {
mReservationView = reservationView;
}
public void getData(int state,int page,int engineerId,int pageSize,int siteId){
public void getData(int state,int page,int engineerId,int pageSize,int siteId,String token){
System.out.println("------>"+state);
System.out.println("------>"+engineerId);
System.out.println("------>"+siteId);
OkGo.get(Constants.ORDER_URL)
.tag(this)
.headers("token",token)
.params("state", state)
.params("page", page)
.params("siteId",siteId)
......@@ -38,6 +39,7 @@ public class ReservationPresenter extends BasePresenter<ReservationView> {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
System.out.println("待预约列表数据-->"+s);
HomeOneTabBean ontTab = gson.fromJson(s, HomeOneTabBean.class);
if (ontTab.getCode() == 0 ) {
mReservationView.getDataSuc(ontTab);
......
app/src/main/java/com/dayu/bigfish/moudle/set/SettingActivityPresenter.java 100644 → 100755
......@@ -22,9 +22,10 @@ public class SettingActivityPresenter extends BasePresenter<SettingActivityView>
public SettingActivityPresenter(SettingActivityView settingActivityView) {
this.settingActivityView = settingActivityView;
}
public void updataVersion(){
public void updataVersion(String token){
OkGo.get(Constants.UPDATA_VERSION+"dayushifua_dayu")
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......
app/src/main/java/com/dayu/bigfish/moudle/updata/UpdataSubscribeTimePresenter.java 100644 → 100755
......@@ -22,9 +22,10 @@ public class UpdataSubscribeTimePresenter extends BasePresenter<UpdataSubscribeT
this.updataSubscribeTimeView = updataSubscribeTimeView;
}
public void post(int orderId, String doorTime, String doorComment) {
public void post(int orderId, String doorTime, String doorComment,String token) {
OkGo.post(Constants.ORDER_DOOR)
.tag(this)
.headers("token",token)
.params("orderId", orderId)
// .params("doorTime", calendar.getTime().toString())
.params("doorTime", doorTime)
......
app/src/main/java/com/dayu/bigfish/moudle/worksheetRecord/WorksheetRecordPresenter.java
......@@ -22,8 +22,9 @@ public class WorksheetRecordPresenter extends BasePresenter<WorksheetRecordView>
public WorksheetRecordPresenter(WorksheetRecordView worksheetRecordView1) {
worksheetRecordView = worksheetRecordView1;
}
public void getDate(String state,int engineerId,String customerMobile,int siteId,String page){
public void getDate(String state,int engineerId,String customerMobile,int siteId,String page,String token){
OkGo.get(Constants.WORKSSHEET_RECORD )
.headers("token",token)
.params("state",state)
.params("engineerId",engineerId)
.params("customerMobile",customerMobile)
......
app/src/main/java/com/dayu/bigfish/utils/AESTool.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/utils/DataCleanManager.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/utils/DateUtils.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/utils/DensityUtils.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/utils/DpToPxUtils.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/utils/GetUserInfo.java 100644 → 100755
......@@ -42,4 +42,11 @@ public class GetUserInfo {
String userPhone = (String) SPUtils.get(context, "USER_PHONE", "");
return userPhone;
}
/**
*获取环信账号
* */
public static String getHxUserId(Context context){
String hxuser = (String) SPUtils.get(context, "HXUSER_ID", "");
return hxuser;
}
}
app/src/main/java/com/dayu/bigfish/utils/IsPhoneUtils.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/utils/JSONDateZip.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/utils/PictrueUtils.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/utils/TimeCountUtil.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/utils/TimeUtils.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/utils/UpdataVersionUtils.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/views/CircleImageView.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/views/ClearEditText.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/views/MyTextView.java 0 → 100644
package com.dayu.bigfish.views;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.TextView;
/**
* 自定义View，无限滑动
*/
public class MyTextView extends TextView {
public MyTextView(Context context) {
super(context);
}
public MyTextView(Context context, AttributeSet attrs) {
super(context, attrs);
}
public MyTextView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
@Override
public boolean isFocused() {
return true;
}
}
app/src/main/java/com/dayu/bigfish/views/RefershAdapter.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/views/RefreListView.java 0 → 100644
package com.dayu.bigfish.views;
import android.content.Context;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.widget.ListView;
/**
* Created by yu on 2017/10/14.
*/
public class RefreListView extends ListView {
public RefreListView(Context context) {
super(context);
}
public RefreListView(Context context, AttributeSet attrs) {
super(context, attrs);
}
public RefreListView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
if (getFirstVisiblePosition() == 0 && getChildAt(0).getTop() == 0) {//到头部了
getParent().requestDisallowInterceptTouchEvent(false);//放行触摸
} else {//没有到头部
getParent().requestDisallowInterceptTouchEvent(true);//拦截触摸
}
return super.onInterceptTouchEvent(ev);
}
}
app/src/main/java/com/dayu/bigfish/views/SwitchImage.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/btn_blue_selector.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/btn_left_selector.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/btn_login_selector.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/btn_register_selector.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/btn_right_selector.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/btn_updata_selector.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/btn_updata_time_selector.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/home_tab_text.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/item_shape.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/line_shape.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/personal_center_selector.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/progressbar.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/receiving_image_selector.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/regist_button.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/shape_dialog_bg.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/subscribe_time.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/subscribe_time_shape.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/ui_black.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/drawable/work_order_one.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_about_us.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_again_door.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_again_visit.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_begin_start.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_home.xml
......@@ -6,9 +6,7 @@
android:layout_height="match_parent"
android:background="@color/cl_white"
android:orientation="vertical"
>
<RelativeLayout
style="@style/title"
>
......@@ -57,14 +55,6 @@
android:src="@mipmap/rectangle_2"
/>
<ImageView
android:id="@+id/read_round"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/image_phone"
android:layout_alignEnd="@id/image_phone"
android:layout_alignRight="@id/image_phone"
android:src="@mipmap/renwu_numbg"/>
</RelativeLayout>
<RelativeLayout
......@@ -85,7 +75,6 @@
</RelativeLayout>
<ImageView
style="@style/card_line"
/>
<android.support.v4.view.ViewPager
......
app/src/main/res/layout/activity_home_one.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_home_tab.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_idea.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_listview_item.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_login.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_message.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_home_listview_bg">
<RelativeLayout
style="@style/title"
>
<ImageView
android:id="@+id/message_back"
style="@style/title_image_back"
/>
<TextView
android:id="@+id/text_title"
style="@style/text_title"
android:text="@string/tv_message"
/>
</RelativeLayout>
<android.support.design.widget.TabLayout
android:id="@+id/message_tablayout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:background="@color/cl_white"
app:tabIndicatorColor="@color/cl_receiving_order_item_data"
app:tabSelectedTextColor="@color/cl_receiving_order_item_data"
app:tabTextAppearance="@style/TabLayoutTextStyle"
app:tabTextColor="@color/cl_tab_line"
app:tabMaxWidth="0dp"
app:tabMode="fixed"
/>
<ImageView
style="@style/card_line"
/>
<android.support.v4.view.ViewPager
android:id="@+id/message_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_10"
android:background="@color/cl_home_listview_bg"/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/activity_message_list2.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_notification.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_order_details.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_order_finish.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_personal_center.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_receiving.xml 100644 → 100755
......@@ -32,7 +32,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
<com.dayu.bigfish.views.RefreListView
android:id="@+id/receiving_listview"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -40,14 +40,31 @@
android:divider="@null"
android:scrollbars="none"
/>
<RelativeLayout
android:id="@+id/view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
>
<ImageView
android:id="@+id/image"
android:layout_width="90dp"
android:id="@+id/image_empty"
android:layout_width="wrap_content"
android:src="@mipmap/yu"
android:layout_height="90dp"
android:layout_marginTop="116dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/textView_empty"
android:layout_marginTop="@dimen/dp_17"
android:layout_below="@id/image_empty"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂无工单"
android:textSize="@dimen/sp_13.3"
android:textColor="@color/cl_login_clearedittext_hint"
/>
</RelativeLayout>
</RelativeLayout>
......
app/src/main/res/layout/activity_receiving_item.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_setting.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_subscribe_time.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_test.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_updata_subscribe_time.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_work_order.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/empty_type.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/fragment_message_bigfish.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/big_message_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
>
<ImageView
android:id="@+id/big_image_empty"
android:layout_width="wrap_content"
android:src="@mipmap/yu"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/big_textView_empty"
android:layout_marginTop="@dimen/dp_17"
android:layout_below="@id/big_image_empty"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂无数据"
android:textSize="@dimen/sp_13.3"
android:textColor="@color/cl_login_clearedittext_hint"
/>
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_message_system.xml 0 → 100644
<?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:background="@color/cl_home_listview_bg"
android:orientation="vertical">
<ListView
android:id="@+id/message_system_listview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null"
android:scrollbars="none"
android:background="@color/cl_home_listview_bg"
/>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_order_datails.xml 100644 → 100755
......@@ -41,7 +41,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/text_one"
android:text="1235676532"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -87,7 +87,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/text_three"
android:text="智能门锁"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -110,7 +110,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/text_foure"
android:text="安装"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -153,7 +153,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/two_text_two"
android:text="个人"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -176,7 +176,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/two_text_three"
android:text="王大锤"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -199,7 +199,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/two_text_four"
android:text="17310890230"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -222,7 +222,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/two_text_five"
android:text="辽宁省铁岭市莲花乡池水沟村"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -265,7 +265,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/three_text_two"
android:text="鸿基"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -288,7 +288,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/three_two_two"
android:text="666"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -312,7 +312,7 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_toRightOf="@id/three_four_four"
android:text="服务就要给钱"
android:text="暂无数据"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -492,8 +492,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_20"
android:text="暂无收费记录"
android:textSize="@dimen/sp_16"
android:textColor="@color/cl_black"
......
app/src/main/res/layout/fragment_order_serve.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/fragment_tab_end.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/fragment_tab_one.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/fragment_tab_three.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/fragment_tab_two.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/fragment_tabend_item.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/fragment_tabthree_item.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/fragment_tabtwo_item.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/listview_bottom_view.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/message_adapter.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/item"
android:layout_width="@dimen/dp_333"
android:layout_height="@dimen/dp_80"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/item_shape">
<TextView
android:id="@+id/line_textView"
android:layout_width="1dp"
android:background="@color/line_color"
android:layout_height="match_parent"
android:layout_marginLeft="89dp"
/>
<TextView
android:id="@+id/message_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_12"
android:textColor="@color/cl_home_title_text_color"
android:layout_marginTop="@dimen/dp_18"
android:layout_alignRight="@id/line_textView"
android:layout_marginRight="@dimen/dp_12"
android:text="08-10"
/>
<TextView
android:id="@+id/message_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="24sp"
android:layout_marginTop="@dimen/dp_34"
android:textColor="@color/cl_home_title_text_color"
android:textStyle="bold"
android:layout_alignRight="@id/line_textView"
android:layout_marginRight="@dimen/dp_12"
android:text="18:72"
/>
<TextView
android:id="@+id/message_text_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="工单被改派"
android:textSize="@dimen/sp_13.3"
android:textColor="@color/cl_home_title_text_color"
android:layout_alignLeft="@id/line_textView"
android:layout_marginLeft="@dimen/dp_16"
android:layout_centerVertical="true"
/>
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/progress_dialog.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/receiving_lisview_item.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/serve_datails_item.xml 100644 → 100755
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
>
<RelativeLayout
android:id="@+id/item_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:background="@color/cl_work_raiod"
android:background="@color/cl_home_listview_bg"
>
<TextView
android:id="@+id/item_time"
......@@ -18,16 +21,18 @@
android:text="2017-9-68 78:90:00"
android:textSize="@dimen/sp_13.3"
/>
<TextView
<com.dayu.bigfish.views.MyTextView
android:id="@+id/item_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_6"
android:ellipsize="marquee"
android:singleLine="true"
android:textColor="@color/cl_tab_init"
android:text="2017-9-68 78:90:00"
android:textSize="@dimen/sp_10"
/>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/tips_empty.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/tips_loading_failed.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/mipmap-xhdpi/tzb.png 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/mipmap-xxhdpi/about_us.jpg 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/mipmap-xxhdpi/mayun.jpeg 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/mipmap-xxhdpi/test_down_normal.png 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/mipmap-xxhdpi/test_down_press.png 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/values/colors.xml
......@@ -24,6 +24,7 @@
<color name="cl_order_text_title">#000000</color>
<color name="cl_order_text_one">#888888</color>
<color name="primary">#5C92FC</color>
<color name="line_color">#dddddd</color>
......
app/src/main/res/values/strings.xml
......@@ -82,6 +82,7 @@
<string name="tv_save_back">保存</string>
<string name="tv_idea">反馈意见</string>
<string name="tv_idea_text_hint">请输入您的宝贵意见</string>
<string name="tv_message">系统通知</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment