Skip to content

android / dayu

Go to a project
Commit 43755525 by 罗翻
Options

1.0.2版本

parent 320bf9b0
Expand all
Inline Side-by-side
Showing with 2587 additions and 746 deletions
.idea/modules.xml
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/dayu.iml" filepath="$PROJECT_DIR$/dayu.iml" /> <module fileurl="file://$PROJECT_DIR$/dayu.iml" filepath="$PROJECT_DIR$/dayu.iml" />
<module fileurl="file://$PROJECT_DIR$/dayu-saas-android.iml" filepath="$PROJECT_DIR$/dayu-saas-android.iml" />
</modules> </modules>
</component> </component>
</project> </project>
\ No newline at end of file
app/build.gradle
...@@ -21,8 +21,8 @@ android { ...@@ -21,8 +21,8 @@ android {
applicationId "com.dayu.bigfish" applicationId "com.dayu.bigfish"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 23 targetSdkVersion 23
versionCode 2 versionCode 3
versionName "1.0.1" versionName "1.0.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
} }
...@@ -64,7 +64,7 @@ dependencies { ...@@ -64,7 +64,7 @@ dependencies {
}) })
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
//网络请求框架 https://github.com/jeasonlzy/okhttp-OkGo //网络请求框架
compile 'com.lzy.net:okgo:2.1.4' compile 'com.lzy.net:okgo:2.1.4'
...@@ -72,7 +72,6 @@ dependencies { ...@@ -72,7 +72,6 @@ dependencies {
//注解工具 //注解工具
compile 'com.jakewharton:butterknife:8.1.0' compile 'com.jakewharton:butterknife:8.1.0'
apt 'com.jakewharton:butterknife-compiler:8.1.0' apt 'com.jakewharton:butterknife-compiler:8.1.0'
compile 'com.google.code.gson:gson:2.8.1'
//友盟统计 //友盟统计
compile 'com.umeng.analytics:analytics:latest.integration' compile 'com.umeng.analytics:analytics:latest.integration'
...@@ -91,4 +90,9 @@ dependencies { ...@@ -91,4 +90,9 @@ dependencies {
compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30' compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
//图片选择 //图片选择
compile 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.5' compile 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.5'
//retrofit
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
compile 'com.squareup.okhttp3:logging-interceptor:3.8.0'
} }
app/src/main/AndroidManifest.xml
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<application <application
android:name=".application.MyApplication" android:name=".MyApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/wechatimg" android:icon="@mipmap/wechatimg"
android:label="@string/tv_dayu" android:label="@string/tv_dayu"
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</activity> </activity>
<activity <activity
android:name=".activity.HomeActivity" android:name=".activity.HomeActivityPre"
android:hardwareAccelerated="true"/> android:hardwareAccelerated="true"/>
//友盟统计相关配置: //友盟统计相关配置:
<uses-sdk android:minSdkVersion="8"></uses-sdk> <uses-sdk android:minSdkVersion="8"></uses-sdk>
...@@ -101,23 +101,21 @@ ...@@ -101,23 +101,21 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity android:name=".activity.LoginActivity"/> <activity android:name=".ui.LoginActivity"/>
<activity android:name=".activity.ReceivingActivity"/> <activity android:name=".activity.ReceivingActivityPre"/>
<activity android:name=".activity.PersonalCenterActivity"/> <activity android:name=".activity.PersonalCenterActivityPre"/>
<activity android:name=".activity.SettingActivity"/> <activity android:name=".activity.SettingActivityPre"/>
<activity android:name=".activity.SubscribeTimeActivity"/> <activity android:name=".activity.CheckTimeActivityPre"/>
<activity android:name=".activity.UpdataSubscribeTimeActivity"/> <activity android:name=".activity.OrderDetailsActivityPre"/>
<activity android:name=".activity.OrderDetailsActivity"/> <activity android:name=".activity.OrderFinishActivityPre"/>
<activity android:name=".activity.OrderFinishActivity"/> <activity android:name=".ui.PreviewActivty"/>
<activity android:name=".activity.DeleteActivty"/> <activity android:name=".ui.AboutUs"/>
<activity android:name=".activity.AgainUpDoorActivity"/> <activity android:name=".activity.IdeaActivityPre"/>
<activity android:name=".activity.AboutUs"/> <activity android:name=".activity.WorksRecordActivityPre"/>
<activity android:name=".activity.IdeaActivity"/>
<activity android:name=".activity.WorksheetRecordActivity"/>
<activity android:name=".activity.MessageActivity"/> <activity android:name=".activity.MessageActivity"/>
<activity android:name=".activity.BigFishMessageContent"/> <activity android:name=".ui.AccountBalanceActivity"/>
<activity android:name=".activity.AccountBalanceActivity"/> <activity android:name=".ui.WithdrawalsActivity"/>
<activity android:name=".activity.WithdrawalsActivity"/> <activity android:name=".ui.AgreementActivity"/>
<receiver android:name=".utils.NetworkConnectChangedReceiver"> <receiver android:name=".utils.NetworkConnectChangedReceiver">
<intent-filter> <intent-filter>
......
app/src/main/java/com/dayu/bigfish/Constants.java
...@@ -18,68 +18,70 @@ public class Constants { ...@@ -18,68 +18,70 @@ public class Constants {
public static final String BASE_MESSAGE = "https://47.94.101.239:7400/"; public static final String BASE_MESSAGE = "https://47.94.101.239:7400/";
// /api-count/ // /api-count/
public static final String BASE_COUNT = "https://47.94.101.239:7500/"; 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";
/***********************测试环境配置**********************************/ /***********************测试环境配置**********************************/
// public static final String LOGIN_URL = "http://47.94.101.239:3112/check"; //控制Log日志的输出,具体常量控制规则由LogUtils类参数说明
// public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
// public static final String BASE_URL = "http://47.94.101.239:3112";
// public static final String LOGIN_URL = BASE_URL + "/check";
// //登录时发送验证码的URL // //登录时发送验证码的URL
// public static final String REGISTER_URL = BASE_TEST + "/api-user/" + "account/loginSms/"; // public static final String REGISTER_URL = BASE_URL + "/api-user/" + "account/loginSms/";
// //根据工单状态获取分页工单信息的路径 // //根据工单状态获取分页工单信息的路径
// public static final String ORDER_URL = BASE_TEST + "/api-order/" + "orders/findSimpleOrderVOByPage"; // public static final String ORDER_URL = BASE_URL + "/api-order/" + "orders/findSimpleOrderVOByPage";
// //异常单获取 // //异常单获取
// public static final String ERROR_ORDER = BASE_TEST + "/api-order/" + "orders/findExceptionSimpleOrderVO"; // public static final String ERROR_ORDER = BASE_URL + "/api-order/" + "orders/findExceptionSimpleOrderVO";
// //工程师接单 // //工程师接单
// public static final String ORDER_RECEIVING = BASE_TEST + "/api-order/" + "orders/"; // public static final String ORDER_RECEIVING = BASE_URL + "/api-order/" + "orders/";
// //再次上门、重新预约时间 // //再次上门、重新预约时间
// public static final String ORDER_DOOR = BASE_TEST + "/api-order/" + "orders/bespeakDoor"; // public static final String ORDER_DOOR = BASE_URL + "/api-order/" + "orders/bespeakDoor";
// //开始出发 // //开始出发
// public static final String START_ORDER = BASE_TEST + "/api-order/" + "orders/onWay/"; // public static final String START_ORDER = BASE_URL + "/api-order/" + "orders/onWay/";
// //开始服务 // //开始服务
// public static final String START_SERVE = BASE_TEST + "/api-order/" + "orders/onWorking/"; // public static final String START_SERVE = BASE_URL + "/api-order/" + "orders/onWorking/";
// //工单详情信息,包含评价,投诉,服务记录 // //工单详情信息,包含评价,投诉,服务记录
// public static final String ORDER_DETAILS = BASE_TEST + "/api-order/" + "orders/"; // public static final String ORDER_DETAILS = BASE_URL + "/api-order/" + "orders/";
// //工单完成,提交验收报告 // //工单完成,提交验收报告
// public static final String ORDER_FINISH = BASE_TEST + "/api-order/" + "orders/waitCustomerCheck"; // public static final String ORDER_FINISH = BASE_URL + "/api-order/" + "orders/waitCustomerCheck";
// //个人中心 // //个人中心
// public static final String PERSONAL_CENTER = BASE_TEST + "/api-user/" + "engineerInfo/accountId/"; // public static final String PERSONAL_CENTER = BASE_URL + "/api-user/" + "engineerInfo/accountId/";
// //个人中心,今日收益 // //个人中心,今日收益
// public static final String PERSONAL_ACOUNT_BALANCE = BASE_TEST + "/api-settlement/" + "payAccount/queryAccountBalanceAndtodayIncrease/accountId/"; // public static final String PERSONAL_ACOUNT_BALANCE = BASE_URL + "/api-settlement/" + "payAccount/queryAccountBalanceAndtodayIncrease/accountId/";
// //账户余额 // //账户余额
// public static final String PERSONAL_ACCOUT_LIST = BASE_TEST + "/api-settlement/" + "/payStream/queryPayStream/"; // public static final String PERSONAL_ACCOUT_LIST = BASE_URL + "/api-settlement/" + "/payStream/queryPayStream/";
// //绑定支付宝账号 // //绑定支付宝账号
// public static final String PERSONAL_ALIPAY_BOUND = BASE_TEST + "/api-settlement/" + "/alipay/save"; // public static final String PERSONAL_ALIPAY_BOUND = BASE_URL + "/api-settlement/" + "/alipay/save";
// //查询支付宝账号 // //查询支付宝账号
// public static final String PERSONAL_ALIPAY_QUERY = BASE_TEST + "/api-settlement/" + "/alipay/queryAlipayByAccountId/accountId/"; // public static final String PERSONAL_ALIPAY_QUERY = BASE_URL + "/api-settlement/" + "alipay/queryAlipayByAccountId/accountId/";
// //修改支付宝账号 // //修改支付宝账号
// public static final String PERSONAL_ALIPAY_MODIFY = BASE_TEST + "/api-settlement/" + "/alipay/modifyAlipay"; // public static final String PERSONAL_ALIPAY_MODIFY = BASE_URL + "/api-settlement/" + "/alipay/modifyAlipay";
// //单表查询工单记录 // //单表查询工单记录
// public final static String SELECT_ORDER = BASE_TEST + "/api-order/" + "orders/"; // public final static String SELECT_ORDER = BASE_URL + "/api-order/" + "orders/";
// //根据工程师id和工程师id获取今日业绩(今日收益) // //根据工程师id和工程师id获取今日业绩(今日收益)
// public final static String USER_ORDER_REVENUE = BASE_TEST + "/api-count/" + "ordersStatistics/income/"; // public final static String USER_ORDER_REVENUE = BASE_URL + "/api-count/" + "ordersStatistics/income/";
// //根据站点id和工程师id获取工程师今日接单数量 // //根据站点id和工程师id获取工程师今日接单数量
// public final static String USER_ORDER_RECEIVING = BASE_TEST + "/api-count/" + "ordersStatistics/tasks/"; // public final static String USER_ORDER_RECEIVING = BASE_URL + "/api-count/" + "ordersStatistics/tasks/";
// //服务记录、工程师评价 // //服务记录、工程师评价
// public final static String USER_REVENUE = BASE_TEST + "/api-count/" + "ordersStatistics/total/"; // public final static String USER_REVENUE = BASE_URL + "/api-count/" + "ordersStatistics/total/";
// //反馈提交 // //反馈提交
// public final static String SET_IDEA_COMMIT = BASE_TEST + "/api-base/" + "suggest"; // public final static String SET_IDEA_COMMIT = BASE_URL + "/api-base/" + "suggest";
// //版本更新检测 // //版本更新检测
// public final static String UPDATA_VERSION = BASE_TEST + "/api-base/" + "appVersion/newestVersion/appId/"; // public final static String UPDATA_VERSION = BASE_URL + "/api-base/" + "appVersion/newestVersion/appId/";
// //版本更新、获取新版本信息 // //版本更新、获取新版本信息
// public final static String UPGRADE_VERSION = BASE_TEST + "/api-base/" + "appVersion/versionInfo"; // public final static String UPGRADE_VERSION = BASE_URL + "/api-base/" + "appVersion/versionInfo";
// public final static String COMMIT_VERSION_INFO = BASE_TEST + "/api-base/" + "versionUpgrade"; // public final static String COMMIT_VERSION_INFO = BASE_URL + "/api-base/" + "versionUpgrade";
// //工单记录/搜索工单 // //工单记录/搜索工单
// public final static String WORKSSHEET_RECORD = BASE_TEST + "/api-order/" + "orders/findSimpleOrderVOByPage"; // public final static String WORKSSHEET_RECORD = BASE_URL + "/api-order/" + "orders/findSimpleOrderVOByPage";
// //获取首页tab状态的数量 // //获取首页tab状态的数量
// public final static String TAB_NUM = BASE_TEST + "/api-order/" + "orders/"; // public final static String TAB_NUM = BASE_URL + "/api-order/" + "orders/";
// //环信 // //环信
// public final static String MESSAGE_HX = BASE_TEST + "/api-message/" + "hXMessage"; // public final static String MESSAGE_HX = BASE_URL + "/api-message/" + "hXMessage";
// //处理工单上传照片 // //处理工单上传照片
// public final static String UP_PHOTO = "http://47.94.101.239:3111/file/uploadMore"; // public final static String UP_PHOTO = "http://47.94.101.239:3111/file/uploadMore";
/**************************正式环境*******************************/ /**************************正式环境*******************************/
//控制Log日志的输出,具体常量控制规则由LogUtils类参数说明
public static final int DEBUGLEVEL = LogUtils.LEVEL_OFF;
public static final String BASE_URL = "https://mobile.dayu.ai";
//登录的URL //登录的URL
public static final String LOGIN_URL = BASE_URL + "/check"; public static final String LOGIN_URL = BASE_URL + "/check";
//登录时发送验证码的URL //登录时发送验证码的URL
...@@ -89,7 +91,6 @@ public class Constants { ...@@ -89,7 +91,6 @@ public class Constants {
//异常单获取 //异常单获取
public static final String ERROR_ORDER = BASE_URL + "/api-order/" + "orders/findExceptionSimpleOrderVO"; public static final String ERROR_ORDER = BASE_URL + "/api-order/" + "orders/findExceptionSimpleOrderVO";
//工程师接单 //工程师接单
public static final String ORDER_RECEIVING = BASE_URL + "/api-order/" + "orders/"; public static final String ORDER_RECEIVING = BASE_URL + "/api-order/" + "orders/";
//再次上门、重新预约时间 //再次上门、重新预约时间
public static final String ORDER_DOOR = BASE_URL + "/api-order/" + "orders/bespeakDoor"; public static final String ORDER_DOOR = BASE_URL + "/api-order/" + "orders/bespeakDoor";
...@@ -138,12 +139,10 @@ public class Constants { ...@@ -138,12 +139,10 @@ public class Constants {
public static final String PERSONAL_ACOUNT_BALANCE = BASE_URL + "/api-settlement/" + "payAccount/queryAccountBalanceAndtodayIncrease/accountId/"; public static final String PERSONAL_ACOUNT_BALANCE = BASE_URL + "/api-settlement/" + "payAccount/queryAccountBalanceAndtodayIncrease/accountId/";
/***********************其他配置**********************************/ /***********************其他配置**********************************/
//控制Log日志的输出,具体常量控制规则由LogUtils类参数说明
public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
//相册选择照片删除时传递的key //相册选择照片删除时传递的key
public final static String BUNDLE_KEY_ID = "BUNDLE_KEY_ID"; public final static String BUNDLE_KEY_ID = "BUNDLE_KEY_ID";
//通用的工程师id //通用的工程师id
public final static String USER_ID = " /engineerId/"; public final static String USER_ID = "/engineerId/";
//通用的站点id //通用的站点id
public final static String SITE_ID = "siteId/"; public final static String SITE_ID = "siteId/";
public final static String TAB_NUM_COUNT = "/count"; public final static String TAB_NUM_COUNT = "/count";
...@@ -154,6 +153,8 @@ public class Constants { ...@@ -154,6 +153,8 @@ public class Constants {
public final static String ACCOUNT_ID = "accountId"; public final static String ACCOUNT_ID = "accountId";
//是否显示去设置alipay账户de对话框 //是否显示去设置alipay账户de对话框
public final static String IS_SHOW_ALIPAY_DILAOG = "is_show_alipay_dialog"; public final static String IS_SHOW_ALIPAY_DILAOG = "is_show_alipay_dialog";
//上个版本号
public final static String OLD_PAKAGENUM = "old_pakegnum";
//订单进行状态
public final static String ORDER_STATE = "order_state";
} }
app/src/main/java/com/dayu/bigfish/application/MyApplication.java → app/src/main/java/com/dayu/bigfish/MyApplication.java
package com.dayu.bigfish.application; package com.dayu.bigfish;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.Application; import android.app.Application;
...@@ -48,8 +48,8 @@ public class MyApplication extends Application { ...@@ -48,8 +48,8 @@ public class MyApplication extends Application {
filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
registerReceiver(new NetworkConnectChangedReceiver(), filter); registerReceiver(new NetworkConnectChangedReceiver(), filter);
//捕获错误报告并上传到友盟服务器 //捕获错误报告并上传到友盟服务器
/* public static void reportError(Context context, String error) /* public static void reportError(Context mContext, String error)
public static void reportError(Context context, Throwable e)*/ public static void reportError(Context mContext, Throwable e)*/
//上下文 //上下文
mContext = getApplicationContext(); mContext = getApplicationContext();
//初始化greendao //初始化greendao
......
app/src/main/java/com/dayu/bigfish/activity/BigFishMessageContent.java deleted 100644 → 0
package com.dayu.bigfish.activity;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.widget.ImageView;
import android.widget.TextView;
import com.dayu.bigfish.R;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 大鱼通知详情页，可跟具体需求决定这个页面要还是不要
* on 2017/10/16.
* Created by MrWang
*/
public class BigFishMessageContent extends Activity {
@BindView(R.id.message_content_back_image)
ImageView messageContentBackImage;
@BindView(R.id.message_text_title)
TextView messageTextTitle;
@BindView(R.id.message_time)
TextView messageTime;
@BindView(R.id.message_content)
TextView messageContent;
private String message_content;
private String message_time;
private String message_title;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_message_content);
ButterKnife.bind(this);
initData();
initView();
}
public void initData() {
Intent intent = getIntent();
message_title = intent.getStringExtra("message_title");
message_content = intent.getStringExtra("content");
message_time = intent.getStringExtra("content_time");
}
public void initView() {
messageTextTitle.setText(message_title);
messageTime.setText(message_time);
messageContent.setText(message_content);
}
@OnClick(R.id.message_content_back_image)
public void onViewClicked() {
finish();
}
}
app/src/main/java/com/dayu/bigfish/activity/IdeaActivity.java → app/src/main/java/com/dayu/bigfish/activity/IdeaActivityPre.java
...@@ -10,8 +10,8 @@ import android.widget.RelativeLayout; ...@@ -10,8 +10,8 @@ import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity; import com.dayu.bigfish.base.PreBaseActivity;
import com.dayu.bigfish.moudle.idea.IdeaActivityPresenter; import com.dayu.bigfish.moudle.idea.IdeaActivityPresenterPre;
import com.dayu.bigfish.moudle.idea.IdeaActivityView; import com.dayu.bigfish.moudle.idea.IdeaActivityView;
import com.dayu.bigfish.utils.DateUtils; import com.dayu.bigfish.utils.DateUtils;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
...@@ -28,7 +28,7 @@ import butterknife.OnClick; ...@@ -28,7 +28,7 @@ import butterknife.OnClick;
* Created by yu * Created by yu
*/ */
public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPresenter> implements IdeaActivityView { public class IdeaActivityPre extends PreBaseActivity<IdeaActivityView, IdeaActivityPresenterPre> implements IdeaActivityView {
@BindView(R.id.text_idea) @BindView(R.id.text_idea)
TextView textIdea; TextView textIdea;
@BindView(R.id.back_image) @BindView(R.id.back_image)
...@@ -41,7 +41,7 @@ public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPre ...@@ -41,7 +41,7 @@ public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPre
RelativeLayout contentText; RelativeLayout contentText;
@BindView(R.id.submit_idea) @BindView(R.id.submit_idea)
Button submitIdea; Button submitIdea;
private IdeaActivityPresenter ideaActivityPresenter; private IdeaActivityPresenterPre ideaActivityPresenter;
private String comment; private String comment;
private String userName; private String userName;
private String userPhone; private String userPhone;
...@@ -82,8 +82,8 @@ public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPre ...@@ -82,8 +82,8 @@ public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPre
} }
@Override @Override
public IdeaActivityPresenter initPresenter() { public IdeaActivityPresenterPre initPresenter() {
this.ideaActivityPresenter = new IdeaActivityPresenter(this); this.ideaActivityPresenter = new IdeaActivityPresenterPre(this);
return ideaActivityPresenter; return ideaActivityPresenter;
} }
......
app/src/main/java/com/dayu/bigfish/activity/MessageActivity.java
package com.dayu.bigfish.activity; package com.dayu.bigfish.activity;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.design.widget.TabLayout; import android.support.design.widget.TabLayout;
...@@ -14,7 +13,6 @@ import com.dayu.bigfish.R; ...@@ -14,7 +13,6 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.FragmentOrderAdapter; import com.dayu.bigfish.adapter.FragmentOrderAdapter;
import com.dayu.bigfish.fragment.order.message.BigFishMessageFragment; import com.dayu.bigfish.fragment.order.message.BigFishMessageFragment;
import com.dayu.bigfish.fragment.order.message.SystemMessageFragment; import com.dayu.bigfish.fragment.order.message.SystemMessageFragment;
import com.dayu.bigfish.views.CustomProgressDialog;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -55,7 +53,7 @@ public class MessageActivity extends FragmentActivity { ...@@ -55,7 +53,7 @@ public class MessageActivity extends FragmentActivity {
/* Intent intent = getIntent(); /* Intent intent = getIntent();
orderValue = intent.getStringExtra("orderId"); orderValue = intent.getStringExtra("orderId");
orderId = Integer.parseInt(orderValue); orderId = Integer.parseInt(orderValue);
System.out.println("此订单的Id为:----->"+orderId);*/ */
list = new ArrayList<>(); list = new ArrayList<>();
list.add(new SystemMessageFragment()); list.add(new SystemMessageFragment());
list.add(new BigFishMessageFragment()); list.add(new BigFishMessageFragment());
......
app/src/main/java/com/dayu/bigfish/activity/OrderDetailsActivity.java → app/src/main/java/com/dayu/bigfish/activity/OrderDetailsActivityPre.java
...@@ -11,10 +11,10 @@ import android.widget.TextView; ...@@ -11,10 +11,10 @@ import android.widget.TextView;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.FragmentOrderAdapter; import com.dayu.bigfish.adapter.FragmentOrderAdapter;
import com.dayu.bigfish.base.BaseActivity; import com.dayu.bigfish.base.PreBaseActivity;
import com.dayu.bigfish.fragment.order.OrderDatailsFragment; import com.dayu.bigfish.fragment.order.OrderDatailsFragment;
import com.dayu.bigfish.fragment.order.OrderDatailsServeFragment; import com.dayu.bigfish.fragment.order.OrderDatailsServeFragment;
import com.dayu.bigfish.moudle.details.OrderDetailsPresenter; import com.dayu.bigfish.moudle.details.OrderDetailsPresenterPre;
import com.dayu.bigfish.moudle.details.OrderDetailsView; import com.dayu.bigfish.moudle.details.OrderDetailsView;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -24,16 +24,12 @@ import butterknife.BindView; ...@@ -24,16 +24,12 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import static android.R.attr.fragment;
import static android.net.wifi.p2p.nsd.WifiP2pServiceRequest.newInstance;
import static java.lang.Integer.parseInt;
/** /**
* 工单详情信息页面，包含工单详情和服务记录 * 工单详情信息页面，包含工单详情和服务记录
* on 2017/9/13. * on 2017/9/13.
*/ */
public class OrderDetailsActivity extends BaseActivity<OrderDetailsView, OrderDetailsPresenter> implements OrderDetailsView { public class OrderDetailsActivityPre extends PreBaseActivity<OrderDetailsView, OrderDetailsPresenterPre> implements OrderDetailsView {
@BindView(R.id.order_back) @BindView(R.id.order_back)
ImageView orderBack; ImageView orderBack;
@BindView(R.id.text_title) @BindView(R.id.text_title)
...@@ -42,7 +38,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsView, OrderDe ...@@ -42,7 +38,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsView, OrderDe
TabLayout tablayout; TabLayout tablayout;
@BindView(R.id.view_pager) @BindView(R.id.view_pager)
ViewPager viewPager; ViewPager viewPager;
private OrderDetailsPresenter orderDetailsPresenter; private OrderDetailsPresenterPre orderDetailsPresenter;
private List<Fragment> list; private List<Fragment> list;
private FragmentOrderAdapter fragmentAdapter; private FragmentOrderAdapter fragmentAdapter;
private int orderId; private int orderId;
...@@ -78,7 +74,6 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsView, OrderDe ...@@ -78,7 +74,6 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsView, OrderDe
Intent intent = getIntent(); Intent intent = getIntent();
String orderValue = intent.getStringExtra("orderId"); String orderValue = intent.getStringExtra("orderId");
orderId = Integer.parseInt(orderValue); orderId = Integer.parseInt(orderValue);
System.out.println("此订单的Id为:----->"+orderId);
list = new ArrayList<>(); list = new ArrayList<>();
orderDatailsFragment = new OrderDatailsFragment(); orderDatailsFragment = new OrderDatailsFragment();
list.add(orderDatailsFragment); list.add(orderDatailsFragment);
...@@ -94,8 +89,8 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsView, OrderDe ...@@ -94,8 +89,8 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsView, OrderDe
} }
@Override @Override
public OrderDetailsPresenter initPresenter() { public OrderDetailsPresenterPre initPresenter() {
this.orderDetailsPresenter = new OrderDetailsPresenter(this); this.orderDetailsPresenter = new OrderDetailsPresenterPre(this);
return orderDetailsPresenter; return orderDetailsPresenter;
} }
......
app/src/main/java/com/dayu/bigfish/activity/OrderFinishActivity.java → app/src/main/java/com/dayu/bigfish/activity/OrderFinishActivityPre.java
...@@ -16,15 +16,16 @@ import android.widget.TextView; ...@@ -16,15 +16,16 @@ import android.widget.TextView;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity; import com.dayu.bigfish.base.PreBaseActivity;
import com.dayu.bigfish.bean.CheckOrderInit; import com.dayu.bigfish.bean.CheckOrderInit;
import com.dayu.bigfish.eventbus.OrderFinish; import com.dayu.bigfish.eventbus.OrderFinish;
import com.dayu.bigfish.eventbus.RefreshTabNum; import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.greendao.GreenDaoManager; import com.dayu.bigfish.greendao.GreenDaoManager;
import com.dayu.bigfish.greendao.OrderInfoDao; import com.dayu.bigfish.greendao.OrderInfoDao;
import com.dayu.bigfish.moudle.check.OrderFinishActivityPresenter; import com.dayu.bigfish.moudle.check.OrderFinishActivityPresenterPre;
import com.dayu.bigfish.moudle.check.OrderFinishActivityView; import com.dayu.bigfish.moudle.check.OrderFinishActivityView;
import com.dayu.bigfish.sqlbean.OrderInfo; import com.dayu.bigfish.sqlbean.OrderInfo;
import com.dayu.bigfish.ui.PreviewActivty;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.GlideImageLoader; import com.dayu.bigfish.utils.GlideImageLoader;
import com.dayu.bigfish.utils.SPUtils; import com.dayu.bigfish.utils.SPUtils;
...@@ -61,7 +62,7 @@ import static com.dayu.bigfish.utils.SPUtils.get; ...@@ -61,7 +62,7 @@ import static com.dayu.bigfish.utils.SPUtils.get;
* on 2017/9/15. * on 2017/9/15.
* Created by yu * Created by yu
*/ */
public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, OrderFinishActivityPresenter> implements OrderFinishActivityView { public class OrderFinishActivityPre extends PreBaseActivity<OrderFinishActivityView, OrderFinishActivityPresenterPre> implements OrderFinishActivityView {
@BindView(R.id.back_order_finish) @BindView(R.id.back_order_finish)
ImageView backOrderFinish; ImageView backOrderFinish;
...@@ -152,7 +153,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -152,7 +153,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
private int orderId; private int orderId;
private int engineerId; private int engineerId;
private CustomProgressDialog dialog; private CustomProgressDialog dialog;
private OrderFinishActivityPresenter orderFinishActivityPresenter; private OrderFinishActivityPresenterPre orderFinishActivityPresenter;
private String brandName; //品牌名称 private String brandName; //品牌名称
private String serveName; //服务类型 private String serveName; //服务类型
private int isPay = 1;//是否支付费用,默认=1 不支付费用 private int isPay = 1;//是否支付费用,默认=1 不支付费用
...@@ -223,8 +224,8 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -223,8 +224,8 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
} }
@Override @Override
public OrderFinishActivityPresenter initPresenter() { public OrderFinishActivityPresenterPre initPresenter() {
this.orderFinishActivityPresenter = new OrderFinishActivityPresenter(this); this.orderFinishActivityPresenter = new OrderFinishActivityPresenterPre(this);
return orderFinishActivityPresenter; return orderFinishActivityPresenter;
} }
...@@ -295,6 +296,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -295,6 +296,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
EventBus.getDefault().post(new OrderFinish(finshPosition)); EventBus.getDefault().post(new OrderFinish(finshPosition));
mOrderInfoDao.deleteByKey((long) orderId); mOrderInfoDao.deleteByKey((long) orderId);
dialog.dismiss(); dialog.dismiss();
PictureFileUtils.deleteCacheDirFile(mActivity);
finish(); finish();
} }
...@@ -422,7 +424,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -422,7 +424,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
} }
private void dumpPic() { private void dumpPic() {
Intent intent = new Intent(this, DeleteActivty.class); Intent intent = new Intent(this, PreviewActivty.class);
intent.putStringArrayListExtra(Constants.BUNDLE_KEY_ID, mImages); intent.putStringArrayListExtra(Constants.BUNDLE_KEY_ID, mImages);
startActivityForResult(intent, DELETECODE); startActivityForResult(intent, DELETECODE);
...@@ -446,7 +448,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -446,7 +448,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
ImageView ivDelete = (ImageView) view.findViewById(R.id.iv_picture_delete); ImageView ivDelete = (ImageView) view.findViewById(R.id.iv_picture_delete);
ImageView imageView = (ImageView) view.findViewById(R.id.iv_picture); ImageView imageView = (ImageView) view.findViewById(R.id.iv_picture);
String path = mImages.get(i); String path = mImages.get(i);
GlideImageLoader.load(OrderFinishActivity.this, path, imageView); GlideImageLoader.load(OrderFinishActivityPre.this, path, imageView);
imageView.setOnClickListener(v -> dumpPic()); imageView.setOnClickListener(v -> dumpPic());
ivDelete.setOnClickListener(v -> { ivDelete.setOnClickListener(v -> {
if (mImages.size() == 5) { if (mImages.size() == 5) {
......
app/src/main/java/com/dayu/bigfish/activity/PersonalCenterActivity.java → app/src/main/java/com/dayu/bigfish/activity/PersonalCenterActivityPre.java
...@@ -16,16 +16,18 @@ import com.bumptech.glide.Glide; ...@@ -16,16 +16,18 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.RequestOptions;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.application.MyApplication; import com.dayu.bigfish.base.PreBaseActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.AccountBalanceBean; import com.dayu.bigfish.bean.AccountBalanceBean;
import com.dayu.bigfish.bean.PersonalCenterBean; import com.dayu.bigfish.bean.PersonalCenterBean;
import com.dayu.bigfish.bean.ReceOrderNum; import com.dayu.bigfish.bean.ReceOrderNum;
import com.dayu.bigfish.bean.ReceUserRevenue; import com.dayu.bigfish.bean.ReceUserRevenue;
import com.dayu.bigfish.bean.TodayPerformanceBean; import com.dayu.bigfish.bean.TodayPerformanceBean;
import com.dayu.bigfish.moudle.personal.PersonalCenterPresenter; import com.dayu.bigfish.moudle.personal.PersonalCenterPresenterPre;
import com.dayu.bigfish.moudle.personal.PersonalCenterView; import com.dayu.bigfish.moudle.personal.PersonalCenterView;
import com.dayu.bigfish.ui.AccountBalanceActivity;
import com.dayu.bigfish.ui.WithdrawalsActivity;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.SPUtils; import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.ToastUtils; import com.dayu.bigfish.utils.ToastUtils;
...@@ -43,7 +45,7 @@ import butterknife.OnClick; ...@@ -43,7 +45,7 @@ import butterknife.OnClick;
* Created by yu * Created by yu
*/ */
public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, PersonalCenterPresenter> implements PersonalCenterView { public class PersonalCenterActivityPre extends PreBaseActivity<PersonalCenterView, PersonalCenterPresenterPre> implements PersonalCenterView {
@BindView(R.id.person_back) @BindView(R.id.person_back)
...@@ -108,7 +110,7 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per ...@@ -108,7 +110,7 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
TextView mtodayBalanceTv; TextView mtodayBalanceTv;
@BindView(R.id.ll_todaybalance) @BindView(R.id.ll_todaybalance)
LinearLayout mLTodayBalance; LinearLayout mLTodayBalance;
private PersonalCenterPresenter personalCenterPresenter; private PersonalCenterPresenterPre personalCenterPresenter;
private CustomProgressDialog dialog; private CustomProgressDialog dialog;
private int userId; private int userId;
private int siteId; private int siteId;
...@@ -152,7 +154,7 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per ...@@ -152,7 +154,7 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
//设置头像 //设置头像
imageUrl = GetUserInfo.getUserHead(this); imageUrl = GetUserInfo.getUserHead(this);
if (imageUrl.equals("暂无头像") || TextUtils.isEmpty(imageUrl)) { if (TextUtils.isEmpty(imageUrl)) {
personCircle.setImageResource(R.mipmap.user_head); personCircle.setImageResource(R.mipmap.user_head);
} else { } else {
RequestOptions options = new RequestOptions() RequestOptions options = new RequestOptions()
...@@ -175,15 +177,15 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per ...@@ -175,15 +177,15 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
// personalCenterPresenter.getReceOrder(siteId, userId, token); // personalCenterPresenter.getReceOrder(siteId, userId, token);
//获取工程师的累计信息 (、评分,累计业绩,工单记录) //获取工程师的累计信息 (、评分,累计业绩,工单记录)
personalCenterPresenter.getOrderUserInfo(siteId, userId, token); personalCenterPresenter.getOrderUserInfo(siteId, userId, token);
//获取工程师账户余额 // 获取工程师账户余额
// personalCenterPresenter.getAcountBalance(userId, token); personalCenterPresenter.getAcountBalance(userId, token);
// personalCenterPresenter.getAlipayAccount(userId, token); personalCenterPresenter.getAlipayAccount(userId, token);
} }
@Override @Override
public PersonalCenterPresenter initPresenter() { public PersonalCenterPresenterPre initPresenter() {
return this.personalCenterPresenter = return this.personalCenterPresenter =
new PersonalCenterPresenter(this); new PersonalCenterPresenterPre(this);
} }
@OnClick({R.id.person_back, R.id.person_setting, R.id.rl_gd, R.id.rl_yue}) @OnClick({R.id.person_back, R.id.person_setting, R.id.rl_gd, R.id.rl_yue})
...@@ -193,7 +195,7 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per ...@@ -193,7 +195,7 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
finish(); finish();
break; break;
case R.id.person_setting: case R.id.person_setting:
Intent intentSetting = new Intent(PersonalCenterActivity.this, SettingActivity.class); Intent intentSetting = new Intent(PersonalCenterActivityPre.this, SettingActivityPre.class);
startActivity(intentSetting); startActivity(intentSetting);
finish(); finish();
break; break;
...@@ -204,13 +206,13 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per ...@@ -204,13 +206,13 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
case R.id.text_leiji_num: case R.id.text_leiji_num:
break; break;
case R.id.rl_gd: case R.id.rl_gd:
Intent intent = new Intent(PersonalCenterActivity.this, WorksheetRecordActivity.class); Intent intent = new Intent(PersonalCenterActivityPre.this, WorksRecordActivityPre.class);
startActivity(intent); startActivity(intent);
break; break;
case R.id.rl_yue: case R.id.rl_yue:
// Intent intent1 = new Intent(mActivity, AccountBalanceActivity.class); Intent intent1 = new Intent(mActivity, AccountBalanceActivity.class);
// intent1.putExtra(Constants.ACCOUNT_BALANCE, mAccountBalance); intent1.putExtra(Constants.ACCOUNT_BALANCE, mAccountBalance);
// startActivity(intent1); startActivity(intent1);
default: default:
break; break;
} }
...@@ -270,7 +272,7 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per ...@@ -270,7 +272,7 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
//工程师今日接单 //工程师今日接单
@Override @Override
public void orderReceivingSuccess(ReceOrderNum orderNum) { public void orderReceivingSuccess(ReceOrderNum orderNum) {
// textJiedanNum.setText(orderNum.getData().get今日接单() + ""); // textJiedanNum.setText(orderNum.getUserInfo().get今日接单() + "");
} }
@Override @Override
......
app/src/main/java/com/dayu/bigfish/activity/ReceivingActivity.java → app/src/main/java/com/dayu/bigfish/activity/ReceivingActivityPre.java
...@@ -13,11 +13,11 @@ import android.widget.TextView; ...@@ -13,11 +13,11 @@ import android.widget.TextView;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.ReceivingAdapter; import com.dayu.bigfish.adapter.ReceivingAdapter;
import com.dayu.bigfish.base.BaseActivity; import com.dayu.bigfish.base.PreBaseActivity;
import com.dayu.bigfish.bean.ReceivingBean; import com.dayu.bigfish.bean.ReceivingBean;
import com.dayu.bigfish.eventbus.RefreshTabNum; import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.moudle.receiving.Receiving; import com.dayu.bigfish.moudle.receiving.Receiving;
import com.dayu.bigfish.moudle.receiving.ReceivingPresenter; import com.dayu.bigfish.moudle.receiving.ReceivingPresenterPre;
import com.dayu.bigfish.moudle.receiving.ReceivingView; import com.dayu.bigfish.moudle.receiving.ReceivingView;
import com.dayu.bigfish.tip.TipsHelper; import com.dayu.bigfish.tip.TipsHelper;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
...@@ -39,11 +39,11 @@ import butterknife.OnClick; ...@@ -39,11 +39,11 @@ import butterknife.OnClick;
* Created by yu * Created by yu
*/ */
public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPresenter> implements ReceivingView, Receiving { public class ReceivingActivityPre extends PreBaseActivity<ReceivingView, ReceivingPresenterPre> implements ReceivingView, Receiving {
@BindView(R.id.receiving_back) @BindView(R.id.receiving_back)
ImageView receivingBack; ImageView receivingBack;
public ReceivingAdapter mReceiviingAdapter; public ReceivingAdapter mReceiviingAdapter;
public ReceivingPresenter mReceivingPresenter; public ReceivingPresenterPre mReceivingPresenter;
public List<ReceivingBean.DataBeanX.DataBean> list; public List<ReceivingBean.DataBeanX.DataBean> list;
@BindView(R.id.receiving_title) @BindView(R.id.receiving_title)
RelativeLayout receivingTitle; RelativeLayout receivingTitle;
...@@ -96,13 +96,13 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres ...@@ -96,13 +96,13 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
orderId = list.get(position).getId(); orderId = list.get(position).getId();
Intent intent = new Intent(ReceivingActivity.this, OrderDetailsActivity.class); Intent intent = new Intent(ReceivingActivityPre.this, OrderDetailsActivityPre.class);
intent.putExtra("orderId", orderId + ""); intent.putExtra("orderId", orderId + "");
startActivity(intent); startActivity(intent);
} }
}); });
receivingRefersh.setOnRefreshListener( receivingRefersh.setOnRefreshListener(
() -> initNetWork(1, 1, 20, GetUserInfo.getSITE_ID(ReceivingActivity.this))); () -> initNetWork(1, 1, 20, GetUserInfo.getSITE_ID(ReceivingActivityPre.this)));
} }
@Override @Override
...@@ -135,8 +135,8 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres ...@@ -135,8 +135,8 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
} }
@Override @Override
public ReceivingPresenter initPresenter() { public ReceivingPresenterPre initPresenter() {
this.mReceivingPresenter = new ReceivingPresenter(this); this.mReceivingPresenter = new ReceivingPresenterPre(this);
return mReceivingPresenter; return mReceivingPresenter;
} }
...@@ -164,9 +164,8 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres ...@@ -164,9 +164,8 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
// mTipsHelper.hideEmpty(); // mTipsHelper.hideEmpty();
view.setVisibility(View.GONE); view.setVisibility(View.GONE);
receivingListview.setVisibility(View.VISIBLE); receivingListview.setVisibility(View.VISIBLE);
System.out.println("list集合的大小--->" + list.size());
orderTitleNum.setText(getResources().getText(R.string.tv_order_list_num) + (String.valueOf(list.size())) + ")"); orderTitleNum.setText(getResources().getText(R.string.tv_order_list_num) + (String.valueOf(list.size())) + ")");
mReceiviingAdapter = new ReceivingAdapter(ReceivingActivity.this, list, this); mReceiviingAdapter = new ReceivingAdapter(ReceivingActivityPre.this, list, this);
receivingListview.setAdapter(mReceiviingAdapter); receivingListview.setAdapter(mReceiviingAdapter);
receivingRefersh.post(() -> receivingRefersh.setRefreshing(false)); receivingRefersh.post(() -> receivingRefersh.setRefreshing(false));
mReceiviingAdapter.notifyDataSetChanged(); mReceiviingAdapter.notifyDataSetChanged();
......
app/src/main/java/com/dayu/bigfish/activity/SettingActivity.java → app/src/main/java/com/dayu/bigfish/activity/SettingActivityPre.java
...@@ -4,7 +4,6 @@ import android.content.Intent; ...@@ -4,7 +4,6 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.os.SystemClock;
import android.provider.Settings; import android.provider.Settings;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
...@@ -14,12 +13,13 @@ import android.widget.TextView; ...@@ -14,12 +13,13 @@ import android.widget.TextView;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity; import com.dayu.bigfish.base.PreBaseActivity;
import com.dayu.bigfish.bean.BaseBean;
import com.dayu.bigfish.bean.BaseStringBean; import com.dayu.bigfish.bean.BaseStringBean;
import com.dayu.bigfish.managers.UserManager; import com.dayu.bigfish.managers.UserManager;
import com.dayu.bigfish.moudle.set.SettingActivityPresenter; import com.dayu.bigfish.moudle.set.SettingActivityPresenterPre;
import com.dayu.bigfish.moudle.set.SettingActivityView; import com.dayu.bigfish.moudle.set.SettingActivityView;
import com.dayu.bigfish.ui.AboutUs;
import com.dayu.bigfish.ui.LoginActivity;
import com.dayu.bigfish.utils.DataCleanManager; import com.dayu.bigfish.utils.DataCleanManager;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils; import com.dayu.bigfish.utils.ToastUtils;
...@@ -27,23 +27,18 @@ import com.dayu.bigfish.views.CustomProgressDialog; ...@@ -27,23 +27,18 @@ import com.dayu.bigfish.views.CustomProgressDialog;
import com.dayu.bigfish.views.SwitchImage; import com.dayu.bigfish.views.SwitchImage;
import com.hyphenate.chat.EMClient; import com.hyphenate.chat.EMClient;
import org.w3c.dom.Text;
import java.io.File; import java.io.File;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import static android.provider.Settings.ACTION_APPLICATION_SETTINGS;
import static com.dayu.bigfish.R.id.tv;
/** /**
* 设置页面 * 设置页面
* 2017/9/2. * 2017/9/2.
*/ */
public class SettingActivity extends BaseActivity<SettingActivityView, SettingActivityPresenter> implements SettingActivityView { public class SettingActivityPre extends PreBaseActivity<SettingActivityView, SettingActivityPresenterPre> implements SettingActivityView {
@BindView(R.id.set_back) @BindView(R.id.set_back)
ImageView setBack; ImageView setBack;
@BindView(R.id.set_message) @BindView(R.id.set_message)
...@@ -64,7 +59,7 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc ...@@ -64,7 +59,7 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
SwitchImage setMessageSwitch; SwitchImage setMessageSwitch;
@BindView(R.id.tv_hc) @BindView(R.id.tv_hc)
TextView tvHc; TextView tvHc;
private SettingActivityPresenter settingActivityPresenter; private SettingActivityPresenterPre settingActivityPresenter;
private CustomProgressDialog dialog; private CustomProgressDialog dialog;
private String userName; private String userName;
private String userphone; private String userphone;
...@@ -101,8 +96,8 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc ...@@ -101,8 +96,8 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
} }
@Override @Override
public SettingActivityPresenter initPresenter() { public SettingActivityPresenterPre initPresenter() {
return this.settingActivityPresenter = new SettingActivityPresenter(this); return this.settingActivityPresenter = new SettingActivityPresenterPre(this);
} }
@OnClick({R.id.set_back, R.id.set_message_switch, R.id.set_message, R.id.set_clear_huancun, R.id.set_jiance_gengxin, R.id.set_kefu_phone, R.id.set_guanyu_we, R.id.set_center_fankui, R.id.exit_button}) @OnClick({R.id.set_back, R.id.set_message_switch, R.id.set_message, R.id.set_clear_huancun, R.id.set_jiance_gengxin, R.id.set_kefu_phone, R.id.set_guanyu_we, R.id.set_center_fankui, R.id.exit_button})
...@@ -158,7 +153,7 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc ...@@ -158,7 +153,7 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
break; break;
//意见反馈 //意见反馈
case R.id.set_center_fankui: case R.id.set_center_fankui:
Intent intentIdeaActivity = new Intent(this, IdeaActivity.class); Intent intentIdeaActivity = new Intent(this, IdeaActivityPre.class);
startActivity(intentIdeaActivity); startActivity(intentIdeaActivity);
break; break;
//退出账号 //退出账号
...@@ -175,23 +170,26 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc ...@@ -175,23 +170,26 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
break; break;
} }
} }
/** /**
* 获取新版本成功的回调,此回调内如果升级可直接进行更新升级操作 * 获取新版本成功的回调,此回调内如果升级可直接进行更新升级操作
* */ */
@Override @Override
public void updata_success(BaseStringBean baseStringBeanBean) { public void updata_success(BaseStringBean baseStringBeanBean) {
ToastUtils.showShortToast("新版本号为:"+baseStringBeanBean.getData()); ToastUtils.showShortToast("新版本号为:" + baseStringBeanBean.getData());
} }
/** /**
* 获取新版本失败的回调 * 获取新版本失败的回调
* */ */
@Override @Override
public void updata_failed(String msg) { public void updata_failed(String msg) {
ToastUtils.showShortToast(msg); ToastUtils.showShortToast(msg);
} }
/** /**
* 网络请求失败或者异常的回调 * 网络请求失败或者异常的回调
* */ */
@Override @Override
public void error(String msg) { public void error(String msg) {
ToastUtils.showShortToast(msg); ToastUtils.showShortToast(msg);
......
app/src/main/java/com/dayu/bigfish/activity/WorksheetRecordActivity.java → app/src/main/java/com/dayu/bigfish/activity/WorksRecordActivityPre.java
...@@ -16,10 +16,10 @@ import com.cjj.MaterialRefreshLayout; ...@@ -16,10 +16,10 @@ import com.cjj.MaterialRefreshLayout;
import com.cjj.MaterialRefreshListener; import com.cjj.MaterialRefreshListener;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.WorksheetAdapter; import com.dayu.bigfish.adapter.WorksheetAdapter;
import com.dayu.bigfish.application.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BaseActivity; import com.dayu.bigfish.base.PreBaseActivity;
import com.dayu.bigfish.bean.WorksheetBean; import com.dayu.bigfish.bean.WorksheetBean;
import com.dayu.bigfish.moudle.worksheetRecord.WorksheetRecordPresenter; import com.dayu.bigfish.moudle.worksheetRecord.WorksheetRecordPresenterPre;
import com.dayu.bigfish.moudle.worksheetRecord.WorksheetRecordView; import com.dayu.bigfish.moudle.worksheetRecord.WorksheetRecordView;
import com.dayu.bigfish.tip.TipsHelper; import com.dayu.bigfish.tip.TipsHelper;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
...@@ -37,7 +37,7 @@ import butterknife.OnClick; ...@@ -37,7 +37,7 @@ import butterknife.OnClick;
* on 2017/9/29. * on 2017/9/29.
*/ */
public class WorksheetRecordActivity extends BaseActivity<WorksheetRecordView, WorksheetRecordPresenter> implements WorksheetRecordView, WorksheetAdapter.OnItemLongClickListener { public class WorksRecordActivityPre extends PreBaseActivity<WorksheetRecordView, WorksheetRecordPresenterPre> implements WorksheetRecordView, WorksheetAdapter.OnItemLongClickListener {
@BindView(R.id.refresh) @BindView(R.id.refresh)
com.cjj.MaterialRefreshLayout refresh; com.cjj.MaterialRefreshLayout refresh;
@BindView(R.id.title_text) @BindView(R.id.title_text)
...@@ -129,8 +129,8 @@ public class WorksheetRecordActivity extends BaseActivity<WorksheetRecordView, W ...@@ -129,8 +129,8 @@ public class WorksheetRecordActivity extends BaseActivity<WorksheetRecordView, W
} }
@Override @Override
public WorksheetRecordPresenter initPresenter() { public WorksheetRecordPresenterPre initPresenter() {
return new WorksheetRecordPresenter(this); return new WorksheetRecordPresenterPre(this);
} }
@OnClick({R.id.receiving_back, R.id.iv_saecher, R.id.quit}) @OnClick({R.id.receiving_back, R.id.iv_saecher, R.id.quit})
...@@ -188,7 +188,7 @@ public class WorksheetRecordActivity extends BaseActivity<WorksheetRecordView, W ...@@ -188,7 +188,7 @@ public class WorksheetRecordActivity extends BaseActivity<WorksheetRecordView, W
@Override @Override
public void OnItemLongClick(View view, int position) { public void OnItemLongClick(View view, int position) {
//跳转工单详情 //跳转工单详情
Intent intent = new Intent(WorksheetRecordActivity.this, OrderDetailsActivity.class); Intent intent = new Intent(WorksRecordActivityPre.this, OrderDetailsActivityPre.class);
id = mList.get(position).getId(); id = mList.get(position).getId();
intent.putExtra("orderId", id + ""); intent.putExtra("orderId", id + "");
startActivity(intent); startActivity(intent);
...@@ -211,7 +211,7 @@ public class WorksheetRecordActivity extends BaseActivity<WorksheetRecordView, W ...@@ -211,7 +211,7 @@ public class WorksheetRecordActivity extends BaseActivity<WorksheetRecordView, W
public void onRefreshLoadMore(MaterialRefreshLayout materialRefreshLayout) { public void onRefreshLoadMore(MaterialRefreshLayout materialRefreshLayout) {
/* if (hasNextPage == true) { /* if (hasNextPage == true) {
page++; page++;
presenter.getData(2, page, userId, 10, siteId); presenter.getUserInfo(2, page, userId, 10, siteId);
} else { } else {
Toast.makeText(getActivity(), "已经到底了", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "已经到底了", Toast.LENGTH_SHORT).show();
}*/ }*/
......
app/src/main/java/com/dayu/bigfish/adapter/AccountBalanceAdapter.java
...@@ -8,7 +8,7 @@ import android.widget.TextView; ...@@ -8,7 +8,7 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.AccountListBean; import com.dayu.bigfish.bean.AccountBalance;
import java.util.List; import java.util.List;
...@@ -19,13 +19,13 @@ import butterknife.ButterKnife; ...@@ -19,13 +19,13 @@ import butterknife.ButterKnife;
* Created by luofan on 2017/11/1. * Created by luofan on 2017/11/1.
*/ */
public class AccountBalanceAdapter extends BaseQuickAdapter<AccountListBean.DataBean.Account, AccountBalanceAdapter.ViewHodler> { public class AccountBalanceAdapter extends BaseQuickAdapter<AccountBalance, AccountBalanceAdapter.ViewHodler> {
public AccountBalanceAdapter(@LayoutRes int layoutResId, @Nullable List<AccountListBean.DataBean.Account> data) { public AccountBalanceAdapter(@LayoutRes int layoutResId, @Nullable List<AccountBalance> data) {
super(layoutResId, data); super(layoutResId, data);
} }
@Override @Override
protected void convert(ViewHodler helper, AccountListBean.DataBean.Account item) { protected void convert(ViewHodler helper, AccountBalance item) {
double balance = item.getStreamPrice(); double balance = item.getStreamPrice();
if (balance > 0) { if (balance > 0) {
helper.mBalance.setText("+" + item.getStreamPrice()); helper.mBalance.setText("+" + item.getStreamPrice());
......
app/src/main/java/com/dayu/bigfish/adapter/HomeOneTabAdapter.java
...@@ -12,8 +12,9 @@ import android.widget.ImageView; ...@@ -12,8 +12,9 @@ import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.activity.SubscribeTimeActivity; import com.dayu.bigfish.activity.CheckTimeActivityPre;
import com.dayu.bigfish.bean.HomeOneTabBean; import com.dayu.bigfish.bean.HomeOneTabBean;
import com.dayu.bigfish.utils.DateUtils; import com.dayu.bigfish.utils.DateUtils;
import com.dayu.bigfish.utils.ToastUtils; import com.dayu.bigfish.utils.ToastUtils;
...@@ -23,20 +24,21 @@ import java.util.List; ...@@ -23,20 +24,21 @@ import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import static android.media.CamcorderProfile.get; import static com.dayu.bigfish.activity.HomeActivityPre.SUBCRIBE_TIME;
/** /**
* 未预约列表的适配器 * 未预约列表的适配器
* 2017/9/9. * 2017/9/9.
*/ */
public class HomeOneTabAdapter extends BaseAdapter{ public class HomeOneTabAdapter extends BaseAdapter {
private Context context; private Context context;
private List<HomeOneTabBean.DataBeanX.DataBean> oneTablist; private List<HomeOneTabBean.DataBeanX.DataBean> oneTablist;
private String dateMD = null; private String dateMD = null;
private String dateTime = null; private String dateTime = null;
private DateUtils dateUtils = new DateUtils(); private DateUtils dateUtils = new DateUtils();
public HomeOneTabAdapter(Context contex, List<HomeOneTabBean.DataBeanX.DataBean> oneTablist) { public HomeOneTabAdapter(Context contex, List<HomeOneTabBean.DataBeanX.DataBean> oneTablist) {
this.context = contex; this.context = contex;
this.oneTablist = oneTablist; this.oneTablist = oneTablist;
...@@ -114,14 +116,14 @@ public class HomeOneTabAdapter extends BaseAdapter{ ...@@ -114,14 +116,14 @@ public class HomeOneTabAdapter extends BaseAdapter{
ViewHolder(View view, final Context context) { ViewHolder(View view, final Context context) {
ButterKnife.bind(this, view); ButterKnife.bind(this, view);
AssetManager mgr = context.getAssets();//得到AssetManager AssetManager mgr = context.getAssets();
Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf");//根据路径得到Typeface Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf");
itemTime.setTypeface(tf);//设置字体 itemTime.setTypeface(tf);//设置字体
} }
} }
private void initData(final int position, final ViewHolder viewHolder) throws Exception{ private void initData(final int position, final ViewHolder viewHolder) throws Exception {
final int value = oneTablist.get(position).getId(); final int value = oneTablist.get(position).getId();
dateMD = dateUtils.stringDateToDate(oneTablist.get(position).getCreateTime()); dateMD = dateUtils.stringDateToDate(oneTablist.get(position).getCreateTime());
viewHolder.itemTody.setText(dateMD); viewHolder.itemTody.setText(dateMD);
...@@ -132,35 +134,29 @@ public class HomeOneTabAdapter extends BaseAdapter{ ...@@ -132,35 +134,29 @@ public class HomeOneTabAdapter extends BaseAdapter{
// 维修类型 // 维修类型
viewHolder.itemTextWeixiuLeixing.setText(oneTablist.get(position).getCategoryName()); viewHolder.itemTextWeixiuLeixing.setText(oneTablist.get(position).getCategoryName());
//拼接省市区街道地址 //拼接省市区街道地址
viewHolder.itemTextDizhi.setText( viewHolder.itemTextDizhi.setText(oneTablist.get(position).getProvinceName()
//省一级城市名称
(String) oneTablist.get(position).getProvinceName()
//市一级城市名称
+ oneTablist.get(position).getCityName() + + oneTablist.get(position).getCityName() +
//区/地区一级城市名称
oneTablist.get(position).getDistrictName() + oneTablist.get(position).getDistrictName() +
//详细到街道
oneTablist.get(position).getAddress()); oneTablist.get(position).getAddress());
//用户名 //用户名
viewHolder.itemTextUserName.setText((String) oneTablist.get(position).getCustomerName()); viewHolder.itemTextUserName.setText( oneTablist.get(position).getCustomerName());
//用户手机号 //用户手机号
viewHolder.itemTextUserPhone.setText((String) oneTablist.get(position).getCustomerMobile()); viewHolder.itemTextUserPhone.setText(oneTablist.get(position).getCustomerMobile());
viewHolder.itemTextPhone.setOnClickListener(new View.OnClickListener() { viewHolder.itemTextPhone.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(Intent.ACTION_DIAL); Intent intent = new Intent(Intent.ACTION_DIAL);
intent.setData(Uri.parse("tel:"+oneTablist.get(position).getCustomerMobile())); intent.setData(Uri.parse("tel:" + oneTablist.get(position).getCustomerMobile()));
context.startActivity(intent); context.startActivity(intent);
ToastUtils.showShortToast("待预约列表phone");
} }
}); });
viewHolder.itemTextTime.setOnClickListener(new View.OnClickListener() { viewHolder.itemTextTime.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
ToastUtils.showShortToast("待预约列表预约时间"); Intent intent = new Intent(context, CheckTimeActivityPre.class);
Intent intent = new Intent(context, SubscribeTimeActivity.class); intent.putExtra("orderId", value + "");
intent.putExtra("orderId",value+""); intent.putExtra(Constants.ORDER_STATE, SUBCRIBE_TIME);
context.startActivity(intent); context.startActivity(intent);
} }
......
app/src/main/java/com/dayu/bigfish/adapter/HomeTwoTabAdapter.java
...@@ -14,9 +14,8 @@ import android.widget.TextView; ...@@ -14,9 +14,8 @@ import android.widget.TextView;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.activity.AgainUpDoorActivity; import com.dayu.bigfish.activity.CheckTimeActivityPre;
import com.dayu.bigfish.activity.OrderFinishActivity; import com.dayu.bigfish.activity.OrderFinishActivityPre;
import com.dayu.bigfish.activity.UpdataSubscribeTimeActivity;
import com.dayu.bigfish.bean.BaseBean; import com.dayu.bigfish.bean.BaseBean;
import com.dayu.bigfish.bean.HomeTwoTabBean; import com.dayu.bigfish.bean.HomeTwoTabBean;
import com.dayu.bigfish.eventbus.AgainUpDoorText; import com.dayu.bigfish.eventbus.AgainUpDoorText;
...@@ -45,6 +44,9 @@ import butterknife.ButterKnife; ...@@ -45,6 +44,9 @@ import butterknife.ButterKnife;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Response; import okhttp3.Response;
import static com.dayu.bigfish.activity.HomeActivityPre.MODIFY_TIME;
import static com.dayu.bigfish.activity.HomeActivityPre.UPDOOR_TIME;
/** /**
* 待服务列表的适配器 * 待服务列表的适配器
* on 2017/9/11. * on 2017/9/11.
...@@ -59,6 +61,7 @@ public class HomeTwoTabAdapter extends BaseAdapter { ...@@ -59,6 +61,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
private String dateTime = null; private String dateTime = null;
private CustomProgressDialog dialog; private CustomProgressDialog dialog;
private List<MyGreenDao> list; //数据库的数据源 private List<MyGreenDao> list; //数据库的数据源
//订单进行状态
ViewHolder viewHolder; ViewHolder viewHolder;
private String mToken; private String mToken;
...@@ -75,7 +78,6 @@ public class HomeTwoTabAdapter extends BaseAdapter { ...@@ -75,7 +78,6 @@ public class HomeTwoTabAdapter extends BaseAdapter {
@Override @Override
public int getCount() { public int getCount() {
//System.out.println(twoTablist.size());
return twoTablist.size(); return twoTablist.size();
} }
...@@ -234,13 +236,9 @@ public class HomeTwoTabAdapter extends BaseAdapter { ...@@ -234,13 +236,9 @@ public class HomeTwoTabAdapter extends BaseAdapter {
viewHolder.itemTextWeixiuLeixing.setText(twoTablist.get(position).getCategoryName()); viewHolder.itemTextWeixiuLeixing.setText(twoTablist.get(position).getCategoryName());
//拼接省市区街道地址 //拼接省市区街道地址
viewHolder.itemTextDizhi.setText( viewHolder.itemTextDizhi.setText(
//省一级城市名称
(String) twoTablist.get(position).getProvinceName() (String) twoTablist.get(position).getProvinceName()
//市一级城市名称
+ twoTablist.get(position).getCityName() + + twoTablist.get(position).getCityName() +
//区/地区一级城市名称
twoTablist.get(position).getDistrictName() + twoTablist.get(position).getDistrictName() +
//详细到街道
twoTablist.get(position).getAddress()); twoTablist.get(position).getAddress());
//用户名 //用户名
...@@ -251,7 +249,6 @@ public class HomeTwoTabAdapter extends BaseAdapter { ...@@ -251,7 +249,6 @@ public class HomeTwoTabAdapter extends BaseAdapter {
Intent intent = new Intent(Intent.ACTION_DIAL); Intent intent = new Intent(Intent.ACTION_DIAL);
intent.setData(Uri.parse("tel:" + twoTablist.get(position).getCustomerMobile())); intent.setData(Uri.parse("tel:" + twoTablist.get(position).getCustomerMobile()));
context.startActivity(intent); context.startActivity(intent);
ToastUtils.showShortToast("待服务列表phone");
}); });
/*开始出发*/ /*开始出发*/
viewHolder.itemStartDepart.setOnClickListener(new View.OnClickListener() { viewHolder.itemStartDepart.setOnClickListener(new View.OnClickListener() {
...@@ -262,21 +259,23 @@ public class HomeTwoTabAdapter extends BaseAdapter { ...@@ -262,21 +259,23 @@ public class HomeTwoTabAdapter extends BaseAdapter {
}); });
//修改预约时间 //修改预约时间
viewHolder.itemUpdataTime.setOnClickListener(v -> { viewHolder.itemUpdataTime.setOnClickListener(v -> {
// Intent intent = new Intent(context, OrderFinishActivity.class); // Intent intent = new Intent(mContext, OrderFinishActivityPre.class);
// intent.putExtra("orderId", orderId + ""); // intent.putExtra("orderId", orderId + "");
// context.startActivity(intent); // mContext.startActivity(intent);
Intent intent = new Intent(context, UpdataSubscribeTimeActivity.class); Intent intent = new Intent(context, CheckTimeActivityPre.class);
intent.putExtra("orderId", orderId + ""); intent.putExtra("orderId", orderId + "");
intent.putExtra("position", position); intent.putExtra("position", position);
intent.putExtra(Constants.ORDER_STATE, MODIFY_TIME);
context.startActivity(intent); context.startActivity(intent);
}); });
//需要再次上门 //需要再次上门
viewHolder.itemRestrt.setOnClickListener(new View.OnClickListener() { viewHolder.itemRestrt.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(context, AgainUpDoorActivity.class); Intent intent = new Intent(context, CheckTimeActivityPre.class);
intent.putExtra("orderId", orderId + ""); intent.putExtra("orderId", orderId + "");
intent.putExtra("position", position); intent.putExtra("position", position);
intent.putExtra(Constants.ORDER_STATE, UPDOOR_TIME);
context.startActivity(intent); context.startActivity(intent);
} }
}); });
...@@ -292,7 +291,7 @@ public class HomeTwoTabAdapter extends BaseAdapter { ...@@ -292,7 +291,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
viewHolder.itemOrder.setOnClickListener(new View.OnClickListener() { viewHolder.itemOrder.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(context, OrderFinishActivity.class); Intent intent = new Intent(context, OrderFinishActivityPre.class);
intent.putExtra("orderId", orderId + ""); intent.putExtra("orderId", orderId + "");
intent.putExtra("position", position); intent.putExtra("position", position);
context.startActivity(intent); context.startActivity(intent);
...@@ -310,7 +309,6 @@ public class HomeTwoTabAdapter extends BaseAdapter { ...@@ -310,7 +309,6 @@ public class HomeTwoTabAdapter extends BaseAdapter {
.execute(new StringCallback() { .execute(new StringCallback() {
@Override @Override
public void onSuccess(String s, Call call, Response response) { public void onSuccess(String s, Call call, Response response) {
System.out.println(s);
Gson gson = new Gson(); Gson gson = new Gson();
BaseBean baseBean = gson.fromJson(s, BaseBean.class); BaseBean baseBean = gson.fromJson(s, BaseBean.class);
if (baseBean.getCode() == 0) { if (baseBean.getCode() == 0) {
...@@ -385,7 +383,6 @@ public class HomeTwoTabAdapter extends BaseAdapter { ...@@ -385,7 +383,6 @@ public class HomeTwoTabAdapter extends BaseAdapter {
.execute(new StringCallback() { .execute(new StringCallback() {
@Override @Override
public void onSuccess(String s, Call call, Response response) { public void onSuccess(String s, Call call, Response response) {
System.out.println(s);
Gson gson = new Gson(); Gson gson = new Gson();
BaseBean baseBean = gson.fromJson(s, BaseBean.class); BaseBean baseBean = gson.fromJson(s, BaseBean.class);
if (baseBean.getCode() == 0) { if (baseBean.getCode() == 0) {
......
app/src/main/java/com/dayu/bigfish/adapter/ReceivingAdapter.java
...@@ -6,18 +6,14 @@ import android.graphics.Typeface; ...@@ -6,18 +6,14 @@ import android.graphics.Typeface;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.activity.ReceivingActivity;
import com.dayu.bigfish.bean.ReceivingBean; import com.dayu.bigfish.bean.ReceivingBean;
import com.dayu.bigfish.moudle.receiving.Receiving; import com.dayu.bigfish.moudle.receiving.Receiving;
import com.dayu.bigfish.utils.DateUtils; import com.dayu.bigfish.utils.DateUtils;
import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.ToastUtils;
import java.util.List; import java.util.List;
......
app/src/main/java/com/dayu/bigfish/adapter/ServeDatailsAdapter.java
...@@ -4,7 +4,6 @@ import android.content.Context; ...@@ -4,7 +4,6 @@ import android.content.Context;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
...@@ -66,8 +65,6 @@ public class ServeDatailsAdapter extends BaseAdapter { ...@@ -66,8 +65,6 @@ public class ServeDatailsAdapter extends BaseAdapter {
TextView itemTime; TextView itemTime;
@BindView(R.id.item_text) @BindView(R.id.item_text)
TextView itemText; TextView itemText;
@BindView(R.id.item_layout)
RelativeLayout itemLayout;
ViewHolder(View view) { ViewHolder(View view) {
ButterKnife.bind(this, view); ButterKnife.bind(this, view);
......
app/src/main/java/com/dayu/bigfish/api/APIException.java 0 → 100644
package com.dayu.bigfish.api;
import android.net.ParseException;
import com.google.gson.JsonParseException;
import org.apache.http.conn.ConnectTimeoutException;
import org.json.JSONException;
import java.net.ConnectException;
import retrofit2.HttpException;
/**
* Created by luofan on 2017/11/15.
*/
public class APIException {
private static final int UNAUTHORIZED = 401;
private static final int FORBIDDEN = 403;
private static final int NOT_FOUND = 404;
private static final int REQUEST_TIMEOUT = 408;
private static final int INTERNAL_SERVER_ERROR = 500;
private static final int BAD_GATEWAY = 502;
private static final int SERVICE_UNAVAILABLE = 503;
private static final int GATEWAY_TIMEOUT = 504;
public static ResponeThrowable APIException(Throwable e) {
ResponeThrowable ex;
if (e instanceof HttpException) {
HttpException httpException = (HttpException) e;
ex = new ResponeThrowable(e, ERROR.HTTP_ERROR);
switch (httpException.code()) {
case FORBIDDEN:
ex.message = "token失效";
ex.code = 403;
//token失效，重新登录.
break;
case UNAUTHORIZED:
case NOT_FOUND:
case REQUEST_TIMEOUT:
case GATEWAY_TIMEOUT:
case INTERNAL_SERVER_ERROR:
case BAD_GATEWAY:
case SERVICE_UNAVAILABLE:
default:
ex.message = "网络错误";
break;
}
return ex;
} else if (e instanceof ServerException) {
ServerException resultException = (ServerException) e;
ex = new ResponeThrowable(resultException, resultException.code);
ex.message = resultException.message;
return ex;
} else if (e instanceof JsonParseException
|| e instanceof JSONException
|| e instanceof ParseException) {
ex = new ResponeThrowable(e, ERROR.PARSE_ERROR);
ex.message = "解析错误";
return ex;
} else if (e instanceof ConnectException) {
ex = new ResponeThrowable(e, ERROR.NETWORD_ERROR);
ex.message = "连接失败";
return ex;
} else if (e instanceof javax.net.ssl.SSLHandshakeException) {
ex = new ResponeThrowable(e, ERROR.SSL_ERROR);
ex.message = "证书验证失败";
return ex;
} else if (e instanceof ConnectTimeoutException) {
ex = new ResponeThrowable(e, ERROR.TIMEOUT_ERROR);
ex.message = "连接超时";
return ex;
} else if (e instanceof java.net.SocketTimeoutException) {
ex = new ResponeThrowable(e, ERROR.TIMEOUT_ERROR);
ex.message = "连接超时";
return ex;
} else {
ex = new ResponeThrowable(e, ERROR.UNKNOWN);
ex.message = "未知错误";
return ex;
}
}
/**
* 约定异常
*/
class ERROR {
/**
* 未知错误
*/
public static final int UNKNOWN = 1000;
/**
* 解析错误
*/
public static final int PARSE_ERROR = 1001;
/**
* 网络错误
*/
public static final int NETWORD_ERROR = 1002;
/**
* 协议出错
*/
public static final int HTTP_ERROR = 1003;
/**
* 证书出错
*/
public static final int SSL_ERROR = 1005;
/**
* 连接超时
*/
public static final int TIMEOUT_ERROR = 1006;
}
public static class ResponeThrowable extends Exception {
public int code;
public String message;
public ResponeThrowable(Throwable throwable, int code) {
super(throwable);
this.code = code;
}
}
public class ServerException extends RuntimeException {
public int code;
public String message;
}
}
app/src/main/java/com/dayu/bigfish/api/Api.java 0 → 100755
package com.dayu.bigfish.api;
import android.text.TextUtils;
import android.util.Log;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BaseResponse;
import com.dayu.bigfish.utils.GetUserInfo;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import okhttp3.HttpUrl;
import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.logging.HttpLoggingInterceptor;
import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
import retrofit2.converter.gson.GsonConverterFactory;
/**
* Created by luofan on 2017/11/09.
*/
public class Api {
private static APIService service;
private static Retrofit retrofit;
private static final int DEFAULT_TIMEOUT = 20;
private static boolean flag = true;
private static String token;
public static APIService getService() {
if (service == null || flag) {
service = getRetrofit().create(APIService.class);
}
return service;
}
private static Retrofit getRetrofit() {
if (retrofit == null || flag) {
token = GetUserInfo.getToken(MyApplication.getContext());
if (!TextUtils.isEmpty(token)) {
flag = false;
}
Gson gson = new GsonBuilder()
.setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
.create();
HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(m -> Log.i("request", m));
httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
TokenInterceptord tokenInterceptord = new TokenInterceptord();
OkHttpClient okHttpClient = new OkHttpClient.Builder()
.addInterceptor(httpLoggingInterceptor)
// .addInterceptor(tokenInterceptord)
.connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS)
.build();
//网络缓存路径文件
// File httpCacheDirectory = new File(BaseApplication.getInstance().getExternalCacheDir(), "responses");
// OkHttpClient client = new OkHttpClient.Builder()
// //设置缓存
// // .cache(new Cache(httpCacheDirectory, 10 * 1024 * 1024))
// (okHttpClient)
// //网络请求缓存，未实现
// // .addInterceptor(cacheInterceptor)
// .build();
retrofit = new Retrofit.Builder()
.client(okHttpClient)
.baseUrl(Constants.BASE_URL)
.addConverterFactory(GsonConverterFactory.create(gson))
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.build();
}
return retrofit;
}
/**
* 对网络接口返回的Response进行分割操作
*
* @param response
* @param <T>
* @return
*/
public static <T> Observable<T> flatResponse(final BaseResponse<T> response) {
return Observable.create(new ObservableOnSubscribe<T>() {
@Override
public void subscribe(ObservableEmitter<T> e) {
if (response.isSuccess()) {
if (!e.isDisposed()) {
e.onNext(response.getData());
}
} else {
if (!e.isDisposed()) {
e.onError(new APIException(response.getCode(), response.getMsg()));
}
return;
}
if (!e.isDisposed()) {
e.onComplete();
}
}
});
}
/**
* 自定义异常，当接口返回的{@link BaseResponse#code}不为{@link #"0"}时，需要跑出此异常
* eg：登陆时验证码错误；参数为传递等
*/
public static class APIException extends Exception {
public int code;
public String message;
public APIException(int code, String message) {
this.code = code;
this.message = message;
}
@Override
public String getMessage() {
return message;
}
}
public static class TokenInterceptord implements Interceptor {
private final String TAG = "respond";
@Override
public Response intercept(Chain chain) throws IOException {
Request oldRequest = chain.request();
// 新的请求,添加参数
HttpUrl.Builder builder = oldRequest.url()
.newBuilder();
if (!TextUtils.isEmpty(token)) {
builder.setEncodedQueryParameter("token", token);
}
Request newRequest = oldRequest.newBuilder()
.method(oldRequest.method(), oldRequest.body())
.url(builder.build())
.build();
return chain.proceed(newRequest);
}
}
}
app/src/main/java/com/dayu/bigfish/api/ApiWrapper.java 0 → 100755
package com.dayu.bigfish.api;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.base.BaseResponse;
import com.dayu.bigfish.bean.AccountBalance;
import com.dayu.bigfish.bean.AlipayInfo;
import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.OrderRecord;
import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.TodayAchievement;
import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.bean.VersionInfo;
import io.reactivex.Observable;
import io.reactivex.ObservableSource;
import io.reactivex.ObservableTransformer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.functions.Function;
import io.reactivex.schedulers.Schedulers;
import okhttp3.RequestBody;
import okhttp3.ResponseBody;
/**
* Created by luofan on 2017/11/09.
*/
public class ApiWrapper extends Api {
//登录
public Observable<UserInfo> login(String phone, String smsCode) {
return getService().login(phone, smsCode)
.compose(applySchedulers());
}
//发送验证码
public Observable<Boolean> sendCode(String phone, int type) {
return getService().sendCode(phone, type)
.compose(applySchedulers());
}
//提交版本信息
public Observable<Boolean> commitVersionInfo(RequestBody object, String token) {
return getService().commitVersionInfo(object, token)
.compose(applySchedulers());
}
//下载apk
public Observable<ResponseBody> downloadApk(String url) {
return getService().downloadApk(url)
.subscribeOn(Schedulers.io());
}
//检查新版本
public Observable<String> CheckVersion(String appId, String token) {
return getService().checkVersion(appId, token)
.compose(applySchedulers());
}
//获取新版本信息
public Observable<VersionInfo> getVersionInfo(String appId, String versionCode, String token) {
return getService().getVersionInfo(appId, versionCode, token)
.compose(applySchedulers());
}
//获取订单列表
public Observable<BasePageBean<Order>> getOrders(String state, String engineerId, String page, String pageSize,
String siteId, String token) {
return getService().getOrders(state, engineerId, page, pageSize, siteId, token)
.compose(applySchedulers());
}
//获取异常订单列表
public Observable<BasePageBean<Order>> getErrorOrders(String siteId, String token) {
return getService().getErrorOrders(siteId, token)
.compose(applySchedulers());
}
//工程师接单
public Observable<Boolean> receiveOrder(String orderId, String engineerId, String token) {
return getService().receiveOrder(orderId, engineerId, token)
.compose(applySchedulers());
}
//预约上门时间
public Observable<Boolean> subcriceTime(String orderId, String doorTime, String doorComment, String token) {
return getService().subcriceTime(orderId, doorTime, doorComment, token)
.compose(applySchedulers());
}
//我已出发
public Observable<Boolean> startOrder(String orderId, String token) {
return getService().startOrder(orderId, token)
.compose(applySchedulers());
}
//开始服务
public Observable<Boolean> startServer(String orderId, String token) {
return getService().startServer(orderId, token)
.compose(applySchedulers());
}
//获取工单详情信息
public Observable<OrderDetail> getOrderInfo(String orderId, String token) {
return getService().getOrderInfo(orderId, token)
.compose(applySchedulers());
}
//提交工单
public Observable<Boolean> getOrderInfo(RequestBody orderInfo, String token) {
return getService().commitOrder(orderInfo, token)
.compose(applySchedulers());
}
//获取工程师信息
public Observable<EngineerInfo> getEngineerInfo(String accountId, String token) {
return getService().getEngineerInfo(accountId, token)
.compose(applySchedulers());
}
//获取今日收益
public Observable<BasePageBean<AccountBalance>> getAccountBalanceList(int page, int pageSzie, int accountId, String token) {
return getService().getAccountBalanceList(page, pageSzie, accountId, token)
.compose(applySchedulers());
}
//获取账户列表
public Observable<TodayBalance> getTodayBalance(String accountId, String token) {
return getService().getTodayBalance(accountId, token)
.compose(applySchedulers());
}
//绑定支付宝账号
public Observable<Boolean> boundAlipay(RequestBody body, String token) {
return getService().boundAlipay(body, token)
.compose(applySchedulers());
}
//获取支付宝信息
public Observable<AlipayInfo> queryAlipay(int accountId, String token) {
return getService().queryAlipay(accountId, token)
.compose(applySchedulers());
}
//修改支付宝账号
public Observable<Boolean> modifyAlipay(RequestBody body, String token) {
return getService().modifyAlipay(body, token)
.compose(applySchedulers());
}
//单表查询工单记录
public Observable<OrderDetail> queryOrderInfo(String accountId, String token) {
return getService().queryOrderInfo(accountId, token)
.compose(applySchedulers());
}
//获取今日业绩
public Observable<TodayAchievement> queryOrderInfo(String siteId, String engineerId, String token) {
return getService().getAchievement(siteId, engineerId, token)
.compose(applySchedulers());
}
//获取工单记录
public Observable<OrderRecord> getRecord(String siteId, String engineerId, String token) {
return getService().getRecord(siteId, engineerId, token)
.compose(applySchedulers());
}
//意见反馈
public Observable<Boolean> postFeedBack(RequestBody body, String token) {
return getService().postFeedBack(body, token)
.compose(applySchedulers());
}
//获取工单记录
public Observable<BasePageBean<Order>> getOrderRecord(String state, String engineerId, String siteId, String page
, String pageSize, String token) {
return getService().getOrderRecord(state, engineerId, siteId, page, pageSize, token)
.compose(applySchedulers());
}
//获取tab数量
public Observable<Tab> getTabNum(String userId, String token) {
return getService().getTabNum(userId, token)
.compose(applySchedulers());
}
//获取环信消息
public Observable<BasePageBean<NewMessage>> getHxMessage(String hxUserId, String category, String page, String pageSize, String token) {
return getService().getHxMessage(hxUserId, category, page, pageSize, token)
.compose(applySchedulers());
}
protected <T> ObservableTransformer<BaseResponse<T>, T> applySchedulers() {
return (ObservableTransformer<BaseResponse<T>, T>) transformer;
}
final ObservableTransformer transformer = new ObservableTransformer() {
@Override
public ObservableSource apply(Observable upstream) {
return upstream.subscribeOn(Schedulers.io())
.doOnSubscribe(new Consumer<Disposable>() {
@Override
public void accept(Disposable disposable) throws Exception {
}
})
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.flatMap((Function) (response) -> flatResponse((BaseResponse<Object>) response));
}
};
}
app/src/main/java/com/dayu/bigfish/base/BaseActivity.java
...@@ -3,70 +3,65 @@ package com.dayu.bigfish.base; ...@@ -3,70 +3,65 @@ package com.dayu.bigfish.base;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.view.View;
import com.dayu.bigfish.tip.DefaultTipsHelper; import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.tip.TipsHelper; import com.dayu.bigfish.utils.TUtil;
import com.umeng.analytics.MobclickAgent; import com.dayu.bigfish.utils.ToastUtils;
import butterknife.ButterKnife;
/** /**
* Activity的基类 * Created by luofan on 17/11/02.
* on 2017/8/20.
*/ */
public abstract class BaseActivity<T extends BasePresenter, E extends BaseModel> extends AppCompatActivity {
public abstract class BaseActivity<V, T extends BasePresenter<V>> extends AppCompatActivity { public T mPresenter;
//交由子类去调用的p层，我一般都是在活动使用成员变量自己记录 public E mModel;
public T presenter; public Activity mContext;
protected Activity mActivity;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
//初始化p层 this.setContentView(this.getLayoutId());
presenter = initPresenter(); ButterKnife.bind(this);
mActivity = this; mContext = this;
//设置友盟数据统计到测试设备,避免数据污染 mPresenter = TUtil.getT(this, 0);
// MobclickAgent.setDebugMode( true ); mModel = TUtil.getT(this, 1);
if (this instanceof BaseView) mPresenter.setVM(this, mModel, mContext);
this.initView();
} }
protected TipsHelper createTipsHelper(View view) { @Override
return new DefaultTipsHelper(this, view); protected void onDestroy() {
super.onDestroy();
if (mPresenter != null) {
mPresenter.onDestroy();
}
} }
@Override @Override
public void onResume() { protected void onResume() {
super.onResume(); super.onResume();
//友盟的基础埋点
MobclickAgent.onResume(this);
presenter.attachView((V) this);
} }
@Override @Override
protected void onPause() { public void setContentView(int layoutResID) {
super.onPause(); super.setContentView(layoutResID);
//友盟的基础埋点
MobclickAgent.onPause(this);
} }
@Override
public void onDestroy() {
presenter.detachView();
super.onDestroy();
} public abstract int getLayoutId();
//强制子类初始化监听的方法
public abstract void initListener();
//强制子类初始化视图的方法
public abstract void initView(); public abstract void initView();
//强制子类初始化数据的方法 public void showToast(String msg) {
public abstract void initData(); ToastUtils.showShortToast(msg);
}
// 强制子类初始化自己的presenter
public abstract T initPresenter();
private long mPressedTime = 0; public void showDialog() {
ProgressUtil.startLoad(mContext, "");
}
public void hideDialog() {
ProgressUtil.stopLoad();
}
} }
app/src/main/java/com/dayu/bigfish/base/BaseFragment.java
...@@ -8,23 +8,18 @@ import android.view.LayoutInflater; ...@@ -8,23 +8,18 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.dayu.bigfish.tip.DefaultTipsHelper; import com.dayu.bigfish.utils.TUtil;
import com.dayu.bigfish.tip.TipsHelper;
import com.lzy.okgo.OkGo;
import org.greenrobot.eventbus.EventBus; import butterknife.ButterKnife;
/** /**
* Fragment的基类，如有具体需求可再添加 * Created by luo on 2017/11/14.
* Created by yu
* on 2017/9/11.
*/ */
public abstract class BaseFragment<T extends BasePresenter, E extends BaseModel> extends Fragment {
public abstract class BaseFragment<V, T extends BasePresenter<V>> extends Fragment {
public T presenter;
//标志位,Fragment是否可见
protected boolean isVisible;
protected Context mContext; protected Context mContext;
public T mPresenter;
public E mModel;
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
...@@ -32,64 +27,30 @@ public abstract class BaseFragment<V, T extends BasePresenter<V>> extends Fragme ...@@ -32,64 +27,30 @@ public abstract class BaseFragment<V, T extends BasePresenter<V>> extends Fragme
mContext = context; mContext = context;
} }
@Nullable
@Override @Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
presenter = initPresenter(); super.onCreate(savedInstanceState);
initEvent(); mPresenter = TUtil.getT(this, 0);
return super.onCreateView(inflater, container, savedInstanceState); mModel = TUtil.getT(this, 1);
} if (this instanceof BaseView) mPresenter.setVM(this, mModel, mContext);
private void initEvent() {
if (!EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().register(this);
}
}
protected TipsHelper createTipsHelper(View view) {
return new DefaultTipsHelper(getContext(), view);
} }
@Nullable
@Override @Override
public void onResume() { public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
super.onResume(); View view = inflater.inflate(getLayoutId(), container, false);
presenter.attachView((V) this); ButterKnife.bind(this, view);
initView(view);
return view;
} }
@Override @Override
public void onDestroy() { public void onDestroy() {
presenter.detachView();
OkGo.getInstance().cancelTag(this);
super.onDestroy(); super.onDestroy();
if (mPresenter != null) mPresenter.onDestroy();
} }
@Override public abstract View initView(View view);
public void onDetach() {
super.onDetach();
mContext = null;
}
protected abstract void initData();
public abstract T initPresenter();
protected void initView(View view, Bundle savedInstanceState) {
}
//强制子类初始化监听的方法
public abstract void initListener();
//强制子类初始化视图的方法 public abstract int getLayoutId();
public abstract void initView();
private long mPressedTime = 0;
protected void onVisible() {
this.lazyLoad();
}
protected abstract void lazyLoad();
protected void onInvisible() {
}
} }
app/src/main/java/com/dayu/bigfish/base/BaseModel.java 0 → 100755
package com.dayu.bigfish.base;
/**
* Created by luofan on 17/11/02.
*/
public interface BaseModel {
}
app/src/main/java/com/dayu/bigfish/base/BasePageBean.java 0 → 100644
package com.dayu.bigfish.base;
import java.util.List;
/**
* 分页的basebean.
* Created by luofan on 2017/11/14.
*/
public class BasePageBean<T> {
private int pageNo;
private int pageSize;
private int totalRows;
private int totalPages;
private int previousPageNo;
private int nextPageNo;
private List<T> 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<T> getData() {
return data;
}
public void setData(List<T> data) {
this.data = data;
}
}
app/src/main/java/com/dayu/bigfish/base/BasePresenter.java
package com.dayu.bigfish.base; package com.dayu.bigfish.base;
import java.lang.ref.Reference; import android.content.Context;
import java.lang.ref.WeakReference;
import com.dayu.bigfish.utils.ProgressUtil;
import java.net.ConnectException;
import java.net.SocketTimeoutException;
import java.util.concurrent.TimeoutException;
import io.reactivex.Observer;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
/** /**
* presenter层基类构建,这里attachView和detachView主要是统一管理view周期 * Created by luofan on 17/11/02.
* 2017/9/20.
*/ */
public abstract class BasePresenter<M, T> {
protected static final String TAG = "PreBasePresenter";
protected Context mContext;
protected M mModel;
protected T mView;
protected CompositeDisposable mComDisposable = new CompositeDisposable();
public void setVM(T v, M m, Context context) {
this.mView = v;
this.mModel = m;
this.mContext = context;
this.onStart();
}
public abstract void onStart();
public void onDestroy() {
mComDisposable.dispose();
}
/**
* 创建观察者
*
* @param consumer
* @return
*/
protected <V> Observer baseObserver(final Consumer<? super V> consumer) {
return new Observer<V>() {
@Override
public void onSubscribe(Disposable d) {
mComDisposable.add(d);
}
@Override
public void onNext(V o) {
ProgressUtil.stopLoad();
try {
consumer.accept(o);
} catch (Exception e) {
e.printStackTrace();
}
}
public abstract class BasePresenter<T> { @Override
protected Reference<T> viewRef; //弱引用,防止内存泄漏 public void onError(Throwable e) {
ProgressUtil.stopLoad();
if (e instanceof ConnectException ||
e instanceof SocketTimeoutException ||
e instanceof TimeoutException) {
((BaseActivity) mView).showToast("网络请求失败");
return;
}
((BaseActivity) mView).showToast(e.getMessage());
}
@Override
public void onComplete() {
public void attachView(T view) { }
viewRef = new WeakReference<T>(view); };
} }
/** /**
* 页面销毁时调用的方法，释放内存 * 创建带错误的观察者
*
* @param consumer
* @return
*/ */
public void detachView() {
if (viewRef != null) { protected <V> Observer baseObserver(final Consumer<? super V> consumer, final Consumer<Throwable> tconsumer) {
viewRef.clear(); return new Observer<V>() {
viewRef = null; @Override
public void onSubscribe(Disposable d) {
mComDisposable.add(d);
}
@Override
public void onNext(V o) {
ProgressUtil.stopLoad();
try {
consumer.accept(o);
} catch (Exception e) {
e.printStackTrace();
} }
} }
@Override
public void onError(Throwable e) {
ProgressUtil.stopLoad();
if (e instanceof ConnectException ||
e instanceof SocketTimeoutException ||
e instanceof TimeoutException) {
((BaseActivity) mView).showToast("网络请求失败");
}
try {
tconsumer.accept(e);
} catch (Exception e1) {
e1.printStackTrace();
}
}
@Override
public void onComplete() {
}
};
}
} }
app/src/main/java/com/dayu/bigfish/base/BaseResponse.java 0 → 100755
package com.dayu.bigfish.base;
/**
* Created by luofan on 2016/07/14.
*/
public class BaseResponse<T> {
private int code;
private String msg;
private T data;
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public T getData() {
return data;
}
public void setData(T data) {
this.data = data;
}
public boolean isSuccess() {
return code == 0;
}
}
app/src/main/java/com/dayu/bigfish/base/BaseView.java 0 → 100755
package com.dayu.bigfish.base;
/**
* Created by luofan on 17/11/02.
*/
public interface BaseView {
}
app/src/main/java/com/dayu/bigfish/base/PreBaseActivity.java 0 → 100755
package com.dayu.bigfish.base;
import android.app.Activity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import com.dayu.bigfish.tip.DefaultTipsHelper;
import com.dayu.bigfish.tip.TipsHelper;
import com.umeng.analytics.MobclickAgent;
/**
* Activity的基类
* on 2017/8/20.
*/
public abstract class PreBaseActivity<V, T extends PreBasePresenter<V>> extends AppCompatActivity {
//交由子类去调用的p层，我一般都是在活动使用成员变量自己记录
public T presenter;
protected Activity mActivity;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//初始化p层
presenter = initPresenter();
mActivity = this;
//设置友盟数据统计到测试设备,避免数据污染
// MobclickAgent.setDebugMode( true );
}
protected TipsHelper createTipsHelper(View view) {
return new DefaultTipsHelper(this, view);
}
@Override
public void onResume() {
super.onResume();
//友盟的基础埋点
MobclickAgent.onResume(this);
presenter.attachView((V) this);
}
@Override
protected void onPause() {
super.onPause();
//友盟的基础埋点
MobclickAgent.onPause(this);
}
@Override
public void onDestroy() {
presenter.detachView();
super.onDestroy();
}
//强制子类初始化监听的方法
public abstract void initListener();
//强制子类初始化视图的方法
public abstract void initView();
//强制子类初始化数据的方法
public abstract void initData();
// 强制子类初始化自己的presenter
public abstract T initPresenter();
private long mPressedTime = 0;
}
app/src/main/java/com/dayu/bigfish/base/PreBaseFragment.java 0 → 100755
package com.dayu.bigfish.base;
import android.content.Context;
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 com.dayu.bigfish.tip.DefaultTipsHelper;
import com.dayu.bigfish.tip.TipsHelper;
import com.lzy.okgo.OkGo;
import org.greenrobot.eventbus.EventBus;
/**
* Fragment的基类，如有具体需求可再添加
* Created by yu
* on 2017/9/11.
*/
public abstract class PreBaseFragment<V, T extends PreBasePresenter<V>> extends Fragment {
public T presenter;
//标志位,Fragment是否可见
protected boolean isVisible;
protected Context mContext;
@Override
public void onAttach(Context context) {
super.onAttach(context);
mContext = context;
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
presenter = initPresenter();
initEvent();
return super.onCreateView(inflater, container, savedInstanceState);
}
private void initEvent() {
if (!EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().register(this);
}
}
protected TipsHelper createTipsHelper(View view) {
return new DefaultTipsHelper(getContext(), view);
}
@Override
public void onResume() {
super.onResume();
presenter.attachView((V) this);
}
@Override
public void onDestroy() {
presenter.detachView();
OkGo.getInstance().cancelTag(this);
super.onDestroy();
}
@Override
public void onDetach() {
super.onDetach();
mContext = null;
}
protected abstract void initData();
public abstract T initPresenter();
protected void initView(View view, Bundle savedInstanceState) {
}
//强制子类初始化监听的方法
public abstract void initListener();
//强制子类初始化视图的方法
public abstract void initView();
private long mPressedTime = 0;
protected void onVisible() {
this.lazyLoad();
}
protected abstract void lazyLoad();
protected void onInvisible() {
}
}
app/src/main/java/com/dayu/bigfish/base/PreBasePresenter.java 0 → 100755
package com.dayu.bigfish.base;
import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
/**
* presenter层基类构建,这里attachView和detachView主要是统一管理view周期
* 2017/9/20.
*/
public abstract class PreBasePresenter<T> {
protected Reference<T> viewRef; //弱引用,防止内存泄漏
public void attachView(T view) {
viewRef = new WeakReference<T>(view);
}
/**
* 页面销毁时调用的方法，释放内存
*/
public void detachView() {
if (viewRef != null) {
viewRef.clear();
viewRef = null;
}
}
}
app/src/main/java/com/dayu/bigfish/base/RxBus.java 0 → 100755
package com.dayu.bigfish.base;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.subjects.PublishSubject;
import io.reactivex.subjects.Subject;
/**
* RxBus1
* Created by luofan on 2016/7/23.
*/
public class RxBus {
private static volatile RxBus mDefaultInstance;
private final Map<Class<?>, Object> mStickyEventMap;
private final Subject<Object> mBus;
public RxBus() {
mBus = PublishSubject.create().toSerialized();
mStickyEventMap = new ConcurrentHashMap<>();
}
public static RxBus getDefault() {
if (mDefaultInstance == null) {
synchronized (RxBus.class) {
if (mDefaultInstance == null) {
mDefaultInstance = new RxBus();
}
}
}
return mDefaultInstance;
}
/**
* 发送事件
*/
public void post(Object event) {
mBus.onNext(event);
}
/**
* 根据传递的 eventType 类型返回特定类型(eventType)的 被观察者
*/
public <T> Observable<T> toObservable(Class<T> eventType) {
return mBus.ofType(eventType);
}
/**
* 判断是否有订阅者
*/
public boolean hasObservers() {
return mBus.hasObservers();
}
public void reset() {
mDefaultInstance = null;
}
/**
* Stciky 相关
*/
/**
* 发送一个新Sticky事件
*/
public void postSticky(Object event) {
synchronized (mStickyEventMap) {
mStickyEventMap.put(event.getClass(), event);
}
post(event);
}
/**
* 根据传递的 eventType 类型返回特定类型(eventType)的 被观察者
*/
public <T> Observable<T> toObservableSticky(final Class<T> eventType) {
synchronized (mStickyEventMap) {
Observable<T> observable = mBus.ofType(eventType);
final Object event = mStickyEventMap.get(eventType);
if (event != null) {
return Observable.merge(observable, Observable.create(new ObservableOnSubscribe<T>() {
@Override
public void subscribe(ObservableEmitter<T> e) throws Exception {
e.onNext(eventType.cast(event));
}
}));
} else {
return observable;
}
}
}
/**
* 根据eventType获取Sticky事件
*/
public <T> T getStickyEvent(Class<T> eventType) {
synchronized (mStickyEventMap) {
return eventType.cast(mStickyEventMap.get(eventType));
}
}
/**
* 移除指定eventType的Sticky事件
*/
public <T> T removeStickyEvent(Class<T> eventType) {
synchronized (mStickyEventMap) {
return eventType.cast(mStickyEventMap.remove(eventType));
}
}
/**
* 移除所有的Sticky事件
*/
public void removeAllStickyEvents() {
synchronized (mStickyEventMap) {
mStickyEventMap.clear();
}
}
}
\ No newline at end of file
app/src/main/java/com/dayu/bigfish/bean/AccountBalance.java 0 → 100644
package com.dayu.bigfish.bean;
/**
* Created by luofan on 2017/11/14.
*/
public class AccountBalance {
private int id;
private int accountId;
private int operateActionStatus;
private String operateActionComment;
private double streamPrice;
private String createTime;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getAccountId() {
return accountId;
}
public void setAccountId(int accountId) {
this.accountId = accountId;
}
public int getOperateActionStatus() {
return operateActionStatus;
}
public void setOperateActionStatus(int operateActionStatus) {
this.operateActionStatus = operateActionStatus;
}
public String getOperateActionComment() {
return operateActionComment;
}
public void setOperateActionComment(String operateActionComment) {
this.operateActionComment = operateActionComment;
}
public double getStreamPrice() {
return streamPrice;
}
public void setStreamPrice(int streamPrice) {
this.streamPrice = streamPrice;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
}
app/src/main/java/com/dayu/bigfish/bean/AlipayInfo.java 0 → 100644
package com.dayu.bigfish.bean;
/**
* Created by luofan on 2017/11/14.
*/
public class AlipayInfo {
/**
* id : 2
* accountId : 454
* alipayAccount : guj
* alipayName : chj
* alipayMobile : 13567810832
* createTime : 2017-11-02 10:06:36
* updateTime : 2017-11-02 11:02:19
*/
private int id;
private int accountId;
private String alipayAccount;
private String alipayName;
private String alipayMobile;
private String createTime;
private String updateTime;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getAccountId() {
return accountId;
}
public void setAccountId(int accountId) {
this.accountId = accountId;
}
public String getAlipayAccount() {
return alipayAccount;
}
public void setAlipayAccount(String alipayAccount) {
this.alipayAccount = alipayAccount;
}
public String getAlipayName() {
return alipayName;
}
public void setAlipayName(String alipayName) {
this.alipayName = alipayName;
}
public String getAlipayMobile() {
return alipayMobile;
}
public void setAlipayMobile(String alipayMobile) {
this.alipayMobile = alipayMobile;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getUpdateTime() {
return updateTime;
}
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
}
app/src/main/java/com/dayu/bigfish/bean/EngineerInfo.java 0 → 100644
package com.dayu.bigfish.bean;
/**
* Created by luofan on 2017/11/14.
*/
public class EngineerInfo {
/**
* id : 30
* accountId : 115
* realName : 工程师
* identity : 110200198802021561
* identityUrl : null
* accountUrl : null
* aduitStatus : 2
* createTime : null
* created : null
* updateTime : null
* updated : null
* gender : 0
* age : 29
* mobile : 15811366263
* siteId : null
* password : null
* categorys : null
* providerTypeList : null
* messageCheckcode : null
*/
private int id;
private int accountId;
private String realName;
private String identity;
private Object identityUrl;
private Object accountUrl;
private int aduitStatus;
private Object createTime;
private Object created;
private Object updateTime;
private Object updated;
private int gender;
private int age;
private String mobile;
private Object siteId;
private Object password;
private Object categorys;
private Object providerTypeList;
private Object messageCheckcode;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getAccountId() {
return accountId;
}
public void setAccountId(int accountId) {
this.accountId = accountId;
}
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public String getIdentity() {
return identity;
}
public void setIdentity(String identity) {
this.identity = identity;
}
public Object getIdentityUrl() {
return identityUrl;
}
public void setIdentityUrl(Object identityUrl) {
this.identityUrl = identityUrl;
}
public Object getAccountUrl() {
return accountUrl;
}
public void setAccountUrl(Object accountUrl) {
this.accountUrl = accountUrl;
}
public int getAduitStatus() {
return aduitStatus;
}
public void setAduitStatus(int aduitStatus) {
this.aduitStatus = aduitStatus;
}
public Object getCreateTime() {
return createTime;
}
public void setCreateTime(Object createTime) {
this.createTime = createTime;
}
public Object getCreated() {
return created;
}
public void setCreated(Object created) {
this.created = created;
}
public Object getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Object updateTime) {
this.updateTime = updateTime;
}
public Object getUpdated() {
return updated;
}
public void setUpdated(Object updated) {
this.updated = updated;
}
public int getGender() {
return gender;
}
public void setGender(int gender) {
this.gender = gender;
}
public int getAge() {
return age;
}
public void setAge(int age) {
this.age = age;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public Object getSiteId() {
return siteId;
}
public void setSiteId(Object siteId) {
this.siteId = siteId;
}
public Object getPassword() {
return password;
}
public void setPassword(Object password) {
this.password = password;
}
public Object getCategorys() {
return categorys;
}
public void setCategorys(Object categorys) {
this.categorys = categorys;
}
public Object getProviderTypeList() {
return providerTypeList;
}
public void setProviderTypeList(Object providerTypeList) {
this.providerTypeList = providerTypeList;
}
public Object getMessageCheckcode() {
return messageCheckcode;
}
public void setMessageCheckcode(Object messageCheckcode) {
this.messageCheckcode = messageCheckcode;
}
}
app/src/main/java/com/dayu/bigfish/bean/HomeOneTabBean.java
...@@ -142,18 +142,18 @@ public class HomeOneTabBean implements Serializable { ...@@ -142,18 +142,18 @@ public class HomeOneTabBean implements Serializable {
private int id; private int id;
private String orderNum; private String orderNum;
private String createTime; private String createTime;
private Object confirmDoorTime; private String confirmDoorTime;
private String providerName; private String providerName;
private String categoryName; private String categoryName;
private Object provinceName; private String provinceName;
private Object cityName; private String cityName;
private Object districtName; private String districtName;
private String address; private String address;
private int customerType; private int customerType;
private Object customerName; private String customerName;
private Object customerCompany; private String customerCompany;
private Object customerMobile; private String customerMobile;
private Object customerTelphome; private String customerTelphome;
private int status; private int status;
public int getId() { public int getId() {
...@@ -184,7 +184,7 @@ public class HomeOneTabBean implements Serializable { ...@@ -184,7 +184,7 @@ public class HomeOneTabBean implements Serializable {
return confirmDoorTime; return confirmDoorTime;
} }
public void setConfirmDoorTime(Object confirmDoorTime) { public void setConfirmDoorTime(String confirmDoorTime) {
this.confirmDoorTime = confirmDoorTime; this.confirmDoorTime = confirmDoorTime;
} }
...@@ -204,11 +204,11 @@ public class HomeOneTabBean implements Serializable { ...@@ -204,11 +204,11 @@ public class HomeOneTabBean implements Serializable {
this.categoryName = categoryName; this.categoryName = categoryName;
} }
public Object getProvinceName() { public String getProvinceName() {
return provinceName; return provinceName;
} }
public void setProvinceName(Object provinceName) { public void setProvinceName(String provinceName) {
this.provinceName = provinceName; this.provinceName = provinceName;
} }
...@@ -216,7 +216,7 @@ public class HomeOneTabBean implements Serializable { ...@@ -216,7 +216,7 @@ public class HomeOneTabBean implements Serializable {
return cityName; return cityName;
} }
public void setCityName(Object cityName) { public void setCityName(String cityName) {
this.cityName = cityName; this.cityName = cityName;
} }
...@@ -224,7 +224,7 @@ public class HomeOneTabBean implements Serializable { ...@@ -224,7 +224,7 @@ public class HomeOneTabBean implements Serializable {
return districtName; return districtName;
} }
public void setDistrictName(Object districtName) { public void setDistrictName(String districtName) {
this.districtName = districtName; this.districtName = districtName;
} }
...@@ -244,11 +244,11 @@ public class HomeOneTabBean implements Serializable { ...@@ -244,11 +244,11 @@ public class HomeOneTabBean implements Serializable {
this.customerType = customerType; this.customerType = customerType;
} }
public Object getCustomerName() { public String getCustomerName() {
return customerName; return customerName;
} }
public void setCustomerName(Object customerName) { public void setCustomerName(String customerName) {
this.customerName = customerName; this.customerName = customerName;
} }
...@@ -256,15 +256,15 @@ public class HomeOneTabBean implements Serializable { ...@@ -256,15 +256,15 @@ public class HomeOneTabBean implements Serializable {
return customerCompany; return customerCompany;
} }
public void setCustomerCompany(Object customerCompany) { public void setCustomerCompany(String customerCompany) {
this.customerCompany = customerCompany; this.customerCompany = customerCompany;
} }
public Object getCustomerMobile() { public String getCustomerMobile() {
return customerMobile; return customerMobile;
} }
public void setCustomerMobile(Object customerMobile) { public void setCustomerMobile(String customerMobile) {
this.customerMobile = customerMobile; this.customerMobile = customerMobile;
} }
...@@ -272,7 +272,7 @@ public class HomeOneTabBean implements Serializable { ...@@ -272,7 +272,7 @@ public class HomeOneTabBean implements Serializable {
return customerTelphome; return customerTelphome;
} }
public void setCustomerTelphome(Object customerTelphome) { public void setCustomerTelphome(String customerTelphome) {
this.customerTelphome = customerTelphome; this.customerTelphome = customerTelphome;
} }
......
app/src/main/java/com/dayu/bigfish/bean/LoginBean.java
...@@ -16,7 +16,7 @@ public class LoginBean implements Serializable { ...@@ -16,7 +16,7 @@ public class LoginBean implements Serializable {
*/ */
private int code; private int code;
private DataBean data; private UserInfo data;
private String msg; private String msg;
public int getCode() { public int getCode() {
...@@ -27,11 +27,11 @@ public class LoginBean implements Serializable { ...@@ -27,11 +27,11 @@ public class LoginBean implements Serializable {
this.code = code; this.code = code;
} }
public DataBean getData() { public UserInfo getUserInfo() {
return data; return data;
} }
public void setData(DataBean data) { public void setUserInfo(UserInfo data) {
this.data = data; this.data = data;
} }
...@@ -43,79 +43,4 @@ public class LoginBean implements Serializable { ...@@ -43,79 +43,4 @@ public class LoginBean implements Serializable {
this.msg = msg; this.msg = msg;
} }
public static class DataBean {
/**
* accountId : 9
* siteId : 1
* hxAccount : 76717b28913c47ab9f421f5b5ff9f6e3
* accessToken : 6dffd7fb44ec41acbc2d4144bab22071
* hxPwd : h7g8P4KK
* headerImg : https://dayuoss.oss-cn-beijing.aliyuncs.com/saas/WechatIMG46.png
* token : e6545561ebe140b3b0205a0324e95a09
*/
private String accountId;
private String siteId;
private String hxAccount;
private String accessToken;
private String hxPwd;
private String headerImg;
private String token;
public String getAccountId() {
return accountId;
}
public void setAccountId(String accountId) {
this.accountId = accountId;
}
public String getSiteId() {
return siteId;
}
public void setSiteId(String siteId) {
this.siteId = siteId;
}
public String getHxAccount() {
return hxAccount;
}
public void setHxAccount(String hxAccount) {
this.hxAccount = hxAccount;
}
public String getAccessToken() {
return accessToken;
}
public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}
public String getHxPwd() {
return hxPwd;
}
public void setHxPwd(String hxPwd) {
this.hxPwd = hxPwd;
}
public String getHeaderImg() {
return headerImg;
}
public void setHeaderImg(String headerImg) {
this.headerImg = headerImg;
}
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
}
} }
app/src/main/java/com/dayu/bigfish/bean/NewMessage.java 0 → 100644
package com.dayu.bigfish.bean;
/**
* Created by luofan on 2017/11/14.
*/
public class NewMessage {
/**
* id : 262
* title : 改派通知
* content : 你的工单被改派，改派原因：
* sender : null
* hxAccount : abbb2f4da566409189441a4ea537de41
* status : 1
* type : 1
* functionType : 1
* category : 1
* action : null
* reason : null
* batchId : null
* createTime : 2017-10-15 14:48:50
* startTime : null
* endTime : null
* customJson : {"orderId":67}
*/
private int id;
private String title;
private String content;
private Object sender;
private String hxAccount;
private int status;
private int type;
private int functionType;
private int category;
private Object action;
private Object reason;
private Object batchId;
private String createTime;
private Object startTime;
private Object endTime;
private String customJson;
private String flag;
public String getFlag() {
return flag;
}
public void setFlag(String flag) {
this.flag = flag;
}
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 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 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;
}
public String getCustomJson() {
return customJson;
}
public void setCustomJson(String customJson) {
this.customJson = customJson;
}
}
app/src/main/java/com/dayu/bigfish/bean/Order.java 0 → 100644
package com.dayu.bigfish.bean;
/**
* 工单列表，异常单列表,工单记录列表的bean
* Created by luofan on 2017/11/14.
*/
public class Order {
/**
* id : 20
* orderNum : 201709249030024287834 接单数
* createTime : 2017-09-06 07:00:24 订单创建时间
* confirmDoorTime : 2017-09-06 06:26:49 确认上门时间
* providerName : string 服务类型 维修
* categoryName : 服务分类名称 维修的物品
* provinceName : string 省一级直辖市城市名
* cityName : 具体城市名称 如郑州市
* districtName : 区域名称 如 海淀区，二七区
* address : string 具体到街道的地址
* customerType : 客户类型
* customerName : 客户名
* customerCompany : 服务商名
* customerMobile : 客户手机号
* customerTelphome : 客户电话号码
* status : 1
*/
private int id;
private String orderNum;
private String createTime;
private String confirmDoorTime;
private String providerName;
private String categoryName;
private String provinceName;
private String cityName;
private String districtName;
private String address;
private int customerType;
private String customerName;
private String customerCompany;
private String customerMobile;
private String customerTelphome;
private int status;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getOrderNum() {
return orderNum;
}
public void setOrderNum(String orderNum) {
this.orderNum = orderNum;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getConfirmDoorTime() {
return confirmDoorTime;
}
public void setConfirmDoorTime(String confirmDoorTime) {
this.confirmDoorTime = confirmDoorTime;
}
public String getProviderName() {
return providerName;
}
public void setProviderName(String providerName) {
this.providerName = providerName;
}
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public String getProvinceName() {
return provinceName;
}
public void setProvinceName(String provinceName) {
this.provinceName = provinceName;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getDistrictName() {
return districtName;
}
public void setDistrictName(String districtName) {
this.districtName = districtName;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public int getCustomerType() {
return customerType;
}
public void setCustomerType(int customerType) {
this.customerType = customerType;
}
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public String getCustomerCompany() {
return customerCompany;
}
public void setCustomerCompany(String customerCompany) {
this.customerCompany = customerCompany;
}
public String getCustomerMobile() {
return customerMobile;
}
public void setCustomerMobile(String customerMobile) {
this.customerMobile = customerMobile;
}
public String getCustomerTelphome() {
return customerTelphome;
}
public void setCustomerTelphome(String customerTelphome) {
this.customerTelphome = customerTelphome;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
}
app/src/main/java/com/dayu/bigfish/bean/OrderDetailsBean.java
...@@ -134,7 +134,7 @@ public class OrderDetailsBean implements Serializable { ...@@ -134,7 +134,7 @@ public class OrderDetailsBean implements Serializable {
private String createTime; private String createTime;
private String appointmentTime; private String appointmentTime;
private String comment; private String comment;
private Object confirmDoorTime; private String confirmDoorTime;
private Object confirmDoorComment; private Object confirmDoorComment;
private Object serviceRecordComment; private Object serviceRecordComment;
private Object customerCheckComment; private Object customerCheckComment;
...@@ -157,6 +157,7 @@ public class OrderDetailsBean implements Serializable { ...@@ -157,6 +157,7 @@ public class OrderDetailsBean implements Serializable {
private Object complait; private Object complait;
private List<RecordBean> record; private List<RecordBean> record;
private List<?> pic; private List<?> pic;
private String sn;
public int getId() { public int getId() {
return id; return id;
...@@ -414,11 +415,11 @@ public class OrderDetailsBean implements Serializable { ...@@ -414,11 +415,11 @@ public class OrderDetailsBean implements Serializable {
this.comment = comment; this.comment = comment;
} }
public Object getConfirmDoorTime() { public String getConfirmDoorTime() {
return confirmDoorTime; return confirmDoorTime;
} }
public void setConfirmDoorTime(Object confirmDoorTime) { public void setConfirmDoorTime(String confirmDoorTime) {
this.confirmDoorTime = confirmDoorTime; this.confirmDoorTime = confirmDoorTime;
} }
...@@ -598,6 +599,14 @@ public class OrderDetailsBean implements Serializable { ...@@ -598,6 +599,14 @@ public class OrderDetailsBean implements Serializable {
this.pic = pic; this.pic = pic;
} }
public String getSn() {
return sn;
}
public void setSn(String sn) {
this.sn = sn;
}
public static class RecordBean { public static class RecordBean {
/** /**
* id : 174 * id : 174
......
app/src/main/java/com/dayu/bigfish/bean/OrderRecord.java 0 → 100644
package com.dayu.bigfish.bean;
/**
* Created by luofan on 2017/11/14.
*/
public class OrderRecord {
/**
* 评分 : 0
* 累计收益 : 0
* 工单记录 : 0
*/
private double 评分;
private double 累计收益;
private int 工单记录;
public double get评分() {
return 评分;
}
public void set评分(int 评分) {
this.评分 = 评分;
}
public double get累计收益() {
return 累计收益;
}
public void set累计收益(int 累计收益) {
this.累计收益 = 累计收益;
}
public int get工单记录() {
return 工单记录;
}
public void set工单记录(int 工单记录) {
this.工单记录 = 工单记录;
}
}
app/src/main/java/com/dayu/bigfish/bean/Tab.java 0 → 100644
package com.dayu.bigfish.bean;
/**
* Created by luofan on 2017/11/14.
*/
public class Tab {
/**
* canceled : 0
* pendingservice : 0
* reservation : 1
* error : 0
*/
private int canceled;
private int pendingservice;
private int reservation;
private int error;
public int getCanceled() {
return canceled;
}
public void setCanceled(int canceled) {
this.canceled = canceled;
}
public int getPendingservice() {
return pendingservice;
}
public void setPendingservice(int pendingservice) {
this.pendingservice = pendingservice;
}
public int getReservation() {
return reservation;
}
public void setReservation(int reservation) {
this.reservation = reservation;
}
public int getError() {
return error;
}
public void setError(int error) {
this.error = error;
}
}
app/src/main/java/com/dayu/bigfish/bean/TodayAchievement.java 0 → 100644
package com.dayu.bigfish.bean;
import com.google.gson.annotations.SerializedName;
/**
* Created by luofan on 2017/11/14.
*/
public class TodayAchievement {
@SerializedName("今日业绩(元)")
private int achievenment; // FIXME check this code
public int getAchievenment() {
return achievenment;
}
public void setAchievenment(int _$208) {
this.achievenment = achievenment;
}
}
app/src/main/java/com/dayu/bigfish/bean/TodayBalance.java 0 → 100644
package com.dayu.bigfish.bean;
/**
* Created by luofan on 2017/11/14.
*/
public class TodayBalance {
private int accountBalance;
private double todaySubSidymoney;
public int getAccountBalance() {
return accountBalance;
}
public void setAccountBalance(int accountBalance) {
this.accountBalance = accountBalance;
}
public double getTodaySubSidymoney() {
return todaySubSidymoney;
}
public void setTodaySubSidymoney(double todaySubSidymoney) {
this.todaySubSidymoney = todaySubSidymoney;
}
}
app/src/main/java/com/dayu/bigfish/bean/UserInfo.java
package com.dayu.bigfish.bean; package com.dayu.bigfish.bean;
import java.io.Serializable;
/** /**
* 储存用户信息的类 * 储存用户信息的类
* *
* @author * @author wangceyu
* wangceyu
* on 2017/8/28. * on 2017/8/28.
*/ */
...@@ -24,36 +21,28 @@ public class UserInfo { ...@@ -24,36 +21,28 @@ public class UserInfo {
* 成功时返回的token * 成功时返回的token
*/ */
private String accessToken; private String accessToken;
public String getImageUrl() {
return imageUrl;
}
public void setImageUrl(String imageUrl) {
this.imageUrl = imageUrl;
}
/** /**
* 成功时返回的头像url * 成功时返回的头像url
*/ */
private String imageUrl; private String headerImg;
private String hxUserId; private String hxAccount;
private String hxUserPwd; private String hxPwd;
private String token;
public String getHxUserId() { public String getHxAccount() {
return hxUserId; return hxAccount;
} }
public void setHxUserId(String hxUserId) { public void setHxAccount(String hxAccount) {
this.hxUserId = hxUserId; this.hxAccount = hxAccount;
} }
public String getHxUserPwd() { public String getHxPwd() {
return hxUserPwd; return hxPwd;
} }
public void setHxUserPwd(String hxUserPwd) { public void setHxPwd(String hxPwd) {
this.hxUserPwd = hxUserPwd; this.hxPwd = hxPwd;
} }
public String getAccountId() { public String getAccountId() {
...@@ -79,4 +68,20 @@ public class UserInfo { ...@@ -79,4 +68,20 @@ public class UserInfo {
public void setAccessToken(String accessToken) { public void setAccessToken(String accessToken) {
this.accessToken = accessToken; this.accessToken = accessToken;
} }
public String getHeaderImg() {
return headerImg;
}
public void setHeaderImg(String headerImg) {
this.headerImg = headerImg;
}
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
} }
app/src/main/java/com/dayu/bigfish/bean/VersionInfo.java 0 → 100644
package com.dayu.bigfish.bean;
/**
* Created by luofan on 2017/11/14.
*/
public class VersionInfo {
/**
* id : 2
* appId : dayushifua_dayu
* versionCode : 1.10.1
* versionCodeNum : 1010001
* type : 1
* downloadUrl : http://dayuoss.oss-cn-beijing.aliyuncs.com/app/test/dayuuf_20170929.apk
* upgradePrompt : 版本升级了！
* platform : 2
* status : 1
* createTime : 2017-09-28 17:09:06
* created : admin
* updateTime : null
* updated : null
*/
private int id;
private String appId;
private String versionCode;
private int versionCodeNum;
private int type;
private String downloadUrl;
private String upgradePrompt;
private int platform;
private int status;
private String createTime;
private String created;
private String updateTime;
private String updated;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getVersionCode() {
return versionCode;
}
public void setVersionCode(String versionCode) {
this.versionCode = versionCode;
}
public int getVersionCodeNum() {
return versionCodeNum;
}
public void setVersionCodeNum(int versionCodeNum) {
this.versionCodeNum = versionCodeNum;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public String getDownloadUrl() {
return downloadUrl;
}
public void setDownloadUrl(String downloadUrl) {
this.downloadUrl = downloadUrl;
}
public String getUpgradePrompt() {
return upgradePrompt;
}
public void setUpgradePrompt(String upgradePrompt) {
this.upgradePrompt = upgradePrompt;
}
public int getPlatform() {
return platform;
}
public void setPlatform(int platform) {
this.platform = platform;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getCreated() {
return created;
}
public void setCreated(String created) {
this.created = created;
}
public String getUpdateTime() {
return updateTime;
}
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
public String getUpdated() {
return updated;
}
public void setUpdated(String updated) {
this.updated = updated;
}
}
app/src/main/java/com/dayu/bigfish/fragment/HomeEndTabFragment.java → app/src/main/java/com/dayu/bigfish/fragment/HomeEndTabFragmentPre.java
...@@ -11,14 +11,14 @@ import android.widget.ListView; ...@@ -11,14 +11,14 @@ import android.widget.ListView;
import com.cjj.MaterialRefreshLayout; import com.cjj.MaterialRefreshLayout;
import com.cjj.MaterialRefreshListener; import com.cjj.MaterialRefreshListener;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.activity.OrderDetailsActivity; import com.dayu.bigfish.activity.OrderDetailsActivityPre;
import com.dayu.bigfish.adapter.HomeEndTabAdapter; import com.dayu.bigfish.adapter.HomeEndTabAdapter;
import com.dayu.bigfish.application.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.PreBaseFragment;
import com.dayu.bigfish.bean.OrderFinishBean; import com.dayu.bigfish.bean.OrderFinishBean;
import com.dayu.bigfish.eventbus.RefreshTabNum; import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.eventbus.TabFourRefresh; import com.dayu.bigfish.eventbus.TabFourRefresh;
import com.dayu.bigfish.moudle.finish.HomeEndTabPresenter; import com.dayu.bigfish.moudle.finish.HomeEndTabPresenterPre;
import com.dayu.bigfish.moudle.finish.HomeEndTabView; import com.dayu.bigfish.moudle.finish.HomeEndTabView;
import com.dayu.bigfish.tip.TipsHelper; import com.dayu.bigfish.tip.TipsHelper;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
...@@ -40,7 +40,7 @@ import butterknife.Unbinder; ...@@ -40,7 +40,7 @@ import butterknife.Unbinder;
* on 2017/8/31. * on 2017/8/31.
*/ */
public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabPresenter> implements HomeEndTabView { public class HomeEndTabFragmentPre extends PreBaseFragment<HomeEndTabView, HomeEndTabPresenterPre> implements HomeEndTabView {
@BindView(R.id.tab_end_list) @BindView(R.id.tab_end_list)
ListView tabEndList; ListView tabEndList;
Unbinder unbinder; Unbinder unbinder;
...@@ -50,7 +50,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP ...@@ -50,7 +50,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
private boolean hasNextPage = false; private boolean hasNextPage = false;
private CustomProgressDialog dialog; private CustomProgressDialog dialog;
private TipsHelper mTipsHelper; private TipsHelper mTipsHelper;
private HomeEndTabPresenter homeEndTabPresenter; private HomeEndTabPresenterPre homeEndTabPresenter;
private HomeEndTabAdapter homeEndTabAdapter; private HomeEndTabAdapter homeEndTabAdapter;
private int siteId = GetUserInfo.getSITE_ID(MyApplication.getContext()); private int siteId = GetUserInfo.getSITE_ID(MyApplication.getContext());
private int userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext()); private int userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
...@@ -93,8 +93,8 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP ...@@ -93,8 +93,8 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
//填充各控件的数据 //填充各控件的数据
} }
@Override @Override
public HomeEndTabPresenter initPresenter() { public HomeEndTabPresenterPre initPresenter() {
this.homeEndTabPresenter = new HomeEndTabPresenter(this); this.homeEndTabPresenter = new HomeEndTabPresenterPre(this);
return homeEndTabPresenter; return homeEndTabPresenter;
} }
...@@ -102,7 +102,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP ...@@ -102,7 +102,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
public void initListener() { public void initListener() {
tabEndList.setOnItemClickListener((parent, view, position, id) -> { tabEndList.setOnItemClickListener((parent, view, position, id) -> {
orderId = finishList.get(position).getId(); orderId = finishList.get(position).getId();
Intent intent = new Intent(mContext, OrderDetailsActivity.class); Intent intent = new Intent(mContext, OrderDetailsActivityPre.class);
intent.putExtra("orderId", orderId + ""); intent.putExtra("orderId", orderId + "");
startActivity(intent); startActivity(intent);
}); });
......
app/src/main/java/com/dayu/bigfish/fragment/HomeOneTabFragment.java → app/src/main/java/com/dayu/bigfish/fragment/HomeOneTabFragmentPre.java
...@@ -11,14 +11,14 @@ import android.widget.ListView; ...@@ -11,14 +11,14 @@ import android.widget.ListView;
import com.cjj.MaterialRefreshLayout; import com.cjj.MaterialRefreshLayout;
import com.cjj.MaterialRefreshListener; import com.cjj.MaterialRefreshListener;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.activity.OrderDetailsActivity; import com.dayu.bigfish.activity.OrderDetailsActivityPre;
import com.dayu.bigfish.adapter.HomeOneTabAdapter; import com.dayu.bigfish.adapter.HomeOneTabAdapter;
import com.dayu.bigfish.application.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.PreBaseFragment;
import com.dayu.bigfish.bean.HomeOneTabBean; import com.dayu.bigfish.bean.HomeOneTabBean;
import com.dayu.bigfish.eventbus.RefreshTabNum; import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.eventbus.TabOneRefresh; import com.dayu.bigfish.eventbus.TabOneRefresh;
import com.dayu.bigfish.moudle.reservation.ReservationPresenter; import com.dayu.bigfish.moudle.reservation.ReservationPresenterPre;
import com.dayu.bigfish.moudle.reservation.ReservationView; import com.dayu.bigfish.moudle.reservation.ReservationView;
import com.dayu.bigfish.tip.TipsHelper; import com.dayu.bigfish.tip.TipsHelper;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
...@@ -40,7 +40,7 @@ import butterknife.Unbinder; ...@@ -40,7 +40,7 @@ import butterknife.Unbinder;
* 待预约的Fragment * 待预约的Fragment
*/ */
public class HomeOneTabFragment extends BaseFragment<ReservationView, ReservationPresenter> implements ReservationView, RefershAdapter { public class HomeOneTabFragmentPre extends PreBaseFragment<ReservationView, ReservationPresenterPre> implements ReservationView, RefershAdapter {
@BindView(R.id.refresh) @BindView(R.id.refresh)
com.cjj.MaterialRefreshLayout refresh; com.cjj.MaterialRefreshLayout refresh;
@BindView(R.id.tab_one_list) @BindView(R.id.tab_one_list)
...@@ -73,8 +73,6 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio ...@@ -73,8 +73,6 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
lazyLoad(); lazyLoad();
initListener(); initListener();
initData(); initData();
System.out.println("首页的工程师id为----->"+userId);
System.out.println("首页的工程师站点id为---->"+siteId);
return rootView; return rootView;
} }
...@@ -90,7 +88,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio ...@@ -90,7 +88,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
public void initListener() { public void initListener() {
tabOneList.setOnItemClickListener((parent, view, position, id) -> { tabOneList.setOnItemClickListener((parent, view, position, id) -> {
orderId = oneTablist.get(position).getId(); orderId = oneTablist.get(position).getId();
Intent intent = new Intent(getContext(), OrderDetailsActivity.class); Intent intent = new Intent(getContext(), OrderDetailsActivityPre.class);
intent.putExtra("orderId", orderId + ""); intent.putExtra("orderId", orderId + "");
startActivity(intent); startActivity(intent);
}); });
...@@ -98,8 +96,6 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio ...@@ -98,8 +96,6 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
@Override @Override
public void initView() { public void initView() {
// initData();
// initListener();
} }
@Override @Override
...@@ -110,9 +106,9 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio ...@@ -110,9 +106,9 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
} }
@Override @Override
public ReservationPresenter initPresenter() { public ReservationPresenterPre initPresenter() {
return new ReservationPresenter(this); return new ReservationPresenterPre(this);
} }
//判断懒加载操作 //判断懒加载操作
...@@ -127,8 +123,6 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio ...@@ -127,8 +123,6 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
@Override @Override
public void refershAdapter() { public void refershAdapter() {
ToastUtils.showShortToast("刷新适配器的回调执行了。。。。。。");
System.out.println("刷新适配器的回调执行了。。。。。。");
} }
private void initRefresh() { private void initRefresh() {
...@@ -150,7 +144,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio ...@@ -150,7 +144,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
/*if (hasNextPage == true) { /*if (hasNextPage == true) {
page++; page++;
presenter.getData(2, page, userId, 10, siteId); presenter.getUserInfo(2, page, userId, 10, siteId);
} else { } else {
Toast.makeText(getActivity(), "已经到底了", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "已经到底了", Toast.LENGTH_SHORT).show();
} }
...@@ -194,7 +188,6 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio ...@@ -194,7 +188,6 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
// initData();
} }
} }
app/src/main/java/com/dayu/bigfish/fragment/HomeThreeTabFragment.java → app/src/main/java/com/dayu/bigfish/fragment/HomeThreeTabFragmentPre.java
...@@ -11,14 +11,14 @@ import android.widget.ListView; ...@@ -11,14 +11,14 @@ import android.widget.ListView;
import com.cjj.MaterialRefreshLayout; import com.cjj.MaterialRefreshLayout;
import com.cjj.MaterialRefreshListener; import com.cjj.MaterialRefreshListener;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.activity.OrderDetailsActivity; import com.dayu.bigfish.activity.OrderDetailsActivityPre;
import com.dayu.bigfish.adapter.HomeThreeTabAdapter; import com.dayu.bigfish.adapter.HomeThreeTabAdapter;
import com.dayu.bigfish.application.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.PreBaseFragment;
import com.dayu.bigfish.bean.ErrorOrderBean; import com.dayu.bigfish.bean.ErrorOrderBean;
import com.dayu.bigfish.eventbus.RefreshTabNum; import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.eventbus.TabThreeRefresh; import com.dayu.bigfish.eventbus.TabThreeRefresh;
import com.dayu.bigfish.moudle.error.ErrorPresenter; import com.dayu.bigfish.moudle.error.ErrorPresenterPre;
import com.dayu.bigfish.moudle.error.ErrorView; import com.dayu.bigfish.moudle.error.ErrorView;
import com.dayu.bigfish.tip.TipsHelper; import com.dayu.bigfish.tip.TipsHelper;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
...@@ -40,7 +40,7 @@ import butterknife.Unbinder; ...@@ -40,7 +40,7 @@ import butterknife.Unbinder;
* on 2017/8/31. * on 2017/8/31.
*/ */
public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter> implements ErrorView { public class HomeThreeTabFragmentPre extends PreBaseFragment<ErrorView, ErrorPresenterPre> implements ErrorView {
@BindView(R.id.refresh) @BindView(R.id.refresh)
com.cjj.MaterialRefreshLayout refresh; com.cjj.MaterialRefreshLayout refresh;
@BindView(R.id.tab_three_list) @BindView(R.id.tab_three_list)
...@@ -85,7 +85,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter ...@@ -85,7 +85,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
public void initListener() { public void initListener() {
tabThreeList.setOnItemClickListener((parent, view, position, id) -> { tabThreeList.setOnItemClickListener((parent, view, position, id) -> {
int orderId = errorlist.get(position).getId(); int orderId = errorlist.get(position).getId();
Intent intent = new Intent(mContext, OrderDetailsActivity.class); Intent intent = new Intent(mContext, OrderDetailsActivityPre.class);
intent.putExtra("orderId", orderId + ""); intent.putExtra("orderId", orderId + "");
startActivity(intent); startActivity(intent);
}); });
...@@ -105,8 +105,8 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter ...@@ -105,8 +105,8 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
} }
@Override @Override
public ErrorPresenter initPresenter() { public ErrorPresenterPre initPresenter() {
return new ErrorPresenter(this); return new ErrorPresenterPre(this);
} }
//判断懒加载操作 //判断懒加载操作
...@@ -119,12 +119,6 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter ...@@ -119,12 +119,6 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
} }
// @Override
// public void refershAdapter() {
// ToastUtils.showShortToast("刷新适配器的回调执行了。。。。。。");
// System.out.println("刷新适配器的回调执行了。。。。。。");
// }
private void initRefresh() { private void initRefresh() {
refresh.setWaveColor(R.color.cl_tab_read); refresh.setWaveColor(R.color.cl_tab_read);
refresh.setIsOverLay(false); refresh.setIsOverLay(false);
...@@ -142,7 +136,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter ...@@ -142,7 +136,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
public void onRefreshLoadMore(MaterialRefreshLayout materialRefreshLayout) { public void onRefreshLoadMore(MaterialRefreshLayout materialRefreshLayout) {
/* if (hasNextPage == true) { /* if (hasNextPage == true) {
page++; page++;
presenter.getData(2, page, userId, 10, siteId); presenter.getUserInfo(2, page, userId, 10, siteId);
} else } else
{ {
...@@ -158,7 +152,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter ...@@ -158,7 +152,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
//返回数据失败 //返回数据失败
/*dialog.dismiss(); /*dialog.dismiss();
mTipsHelper.showError(true, data, v -> { mTipsHelper.showError(true, data, v -> {
presenter.getData(2, page, userId, 10, siteId); presenter.getUserInfo(2, page, userId, 10, siteId);
dialog.show(); dialog.show();
}); });
ToastUtils.showShortToast(data);*/ ToastUtils.showShortToast(data);*/
...@@ -166,8 +160,6 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter ...@@ -166,8 +160,6 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
// initData();
//presenter.getErrorOrder(userId,siteId,token);
} }
@Override @Override
...@@ -204,21 +196,4 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter ...@@ -204,21 +196,4 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
ToastUtils.showShortToast(msg); ToastUtils.showShortToast(msg);
} }
/* @Override
public void getDataSuc(ErrorOrderBean data) {
dialog.dismiss();
mTipsHelper.hideEmpty();
mTipsHelper.hideError();
errorlist = data.getData();
if (errorlist.size() == 0 || errorlist == null) {
mTipsHelper.showEmpty();
dialog.dismiss();
} else {
mTipsHelper.hideEmpty();
//homeOneTabAdapter = new HomeOneTabAdapter(getContext(), oneTablist);
tabThreeList.setAdapter(homeOneTabAdapter);
homeOneTabAdapter.notifyDataSetChanged();
dialog.dismiss();
}*/
//}
} }
app/src/main/java/com/dayu/bigfish/fragment/HomeTwoTabFragment.java → app/src/main/java/com/dayu/bigfish/fragment/HomeTwoTabFragmentPre.java
...@@ -10,18 +10,18 @@ import android.widget.ListView; ...@@ -10,18 +10,18 @@ import android.widget.ListView;
import com.cjj.MaterialRefreshLayout; import com.cjj.MaterialRefreshLayout;
import com.cjj.MaterialRefreshListener; import com.cjj.MaterialRefreshListener;
import com.dayu.bigfish.moudle.beltservice.BeltServicePresenterPre;
import com.dayu.bigfish.sqlbean.MyGreenDao; import com.dayu.bigfish.sqlbean.MyGreenDao;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.activity.OrderDetailsActivity; import com.dayu.bigfish.activity.OrderDetailsActivityPre;
import com.dayu.bigfish.adapter.HomeTwoTabAdapter; import com.dayu.bigfish.adapter.HomeTwoTabAdapter;
import com.dayu.bigfish.application.MyApplication; import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.base.BaseFragment; import com.dayu.bigfish.base.PreBaseFragment;
import com.dayu.bigfish.bean.HomeTwoTabBean; import com.dayu.bigfish.bean.HomeTwoTabBean;
import com.dayu.bigfish.eventbus.RefreshTabNum; import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.eventbus.TabTwoRefresh; import com.dayu.bigfish.eventbus.TabTwoRefresh;
import com.dayu.bigfish.greendao.GreenDaoManager; import com.dayu.bigfish.greendao.GreenDaoManager;
import com.dayu.bigfish.greendao.MyGreenDaoDao; import com.dayu.bigfish.greendao.MyGreenDaoDao;
import com.dayu.bigfish.moudle.beltservice.BeltServicePresenter;
import com.dayu.bigfish.moudle.beltservice.BeltServiceView; import com.dayu.bigfish.moudle.beltservice.BeltServiceView;
import com.dayu.bigfish.tip.TipsHelper; import com.dayu.bigfish.tip.TipsHelper;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
...@@ -45,7 +45,7 @@ import butterknife.Unbinder; ...@@ -45,7 +45,7 @@ import butterknife.Unbinder;
* on 2017/8/31. * on 2017/8/31.
*/ */
public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServicePresenter> implements BeltServiceView { public class HomeTwoTabFragmentPre extends PreBaseFragment<BeltServiceView, BeltServicePresenterPre> implements BeltServiceView {
@BindView(R.id.tab_two_list) @BindView(R.id.tab_two_list)
ListView tabTwoList; ListView tabTwoList;
List<HomeTwoTabBean.DataBeanX.DataBean> list; List<HomeTwoTabBean.DataBeanX.DataBean> list;
...@@ -77,9 +77,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic ...@@ -77,9 +77,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
initRefresh(); initRefresh();
isPrepared = true; isPrepared = true;
initListener(); initListener();
// initData();
lazyLoad(); lazyLoad();
// ToastUtils.showShortToast("预加载了");
return rootView; return rootView;
} }
...@@ -92,8 +90,6 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic ...@@ -92,8 +90,6 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
} }
public void initView() { public void initView() {
// initData();
// initListener();
} }
//判断懒加载操作 //判断懒加载操作
...@@ -112,14 +108,14 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic ...@@ -112,14 +108,14 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
} }
@Override @Override
public BeltServicePresenter initPresenter() { public BeltServicePresenterPre initPresenter() {
return new BeltServicePresenter(this); return new BeltServicePresenterPre(this);
} }
public void initListener() { public void initListener() {
tabTwoList.setOnItemClickListener((parent, view, position, id) -> { tabTwoList.setOnItemClickListener((parent, view, position, id) -> {
orderId = list.get(position).getId(); orderId = list.get(position).getId();
Intent intent = new Intent(mContext, OrderDetailsActivity.class); Intent intent = new Intent(mContext, OrderDetailsActivityPre.class);
intent.putExtra("orderId", orderId + ""); intent.putExtra("orderId", orderId + "");
startActivity(intent); startActivity(intent);
}); });
...@@ -146,7 +142,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic ...@@ -146,7 +142,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
public void onRefreshLoadMore(MaterialRefreshLayout materialRefreshLayout) { public void onRefreshLoadMore(MaterialRefreshLayout materialRefreshLayout) {
/*if (hasNextPage == true) { /*if (hasNextPage == true) {
page++; page++;
presenter.getData(3, page, userId, 10, siteId); presenter.getUserInfo(3, page, userId, 10, siteId);
} }
else else
{ {
......
app/src/main/java/com/dayu/bigfish/fragment/order/OrderDatailsFragment.java
...@@ -21,8 +21,6 @@ import com.google.gson.Gson; ...@@ -21,8 +21,6 @@ import com.google.gson.Gson;
import com.lzy.okgo.OkGo; import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback; import com.lzy.okgo.callback.StringCallback;
import org.w3c.dom.Text;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.Unbinder; import butterknife.Unbinder;
...@@ -125,6 +123,14 @@ public class OrderDatailsFragment extends Fragment { ...@@ -125,6 +123,14 @@ public class OrderDatailsFragment extends Fragment {
RelativeLayout isCharge; RelativeLayout isCharge;
@BindView(R.id.no_charge) @BindView(R.id.no_charge)
RelativeLayout noCharge; RelativeLayout noCharge;
@BindView(R.id.tv_forward_time_detail)
TextView mForwardTimeDetail;
@BindView(R.id.tv_info_detail)
TextView mInfoDetail;
@BindView(R.id.tv_door_time)
TextView mDoorTime;
@BindView(R.id.tv_sn_code)
TextView mSNTv;
private int orderId; private int orderId;
private OrderDetailsBean.DataBean dataBean; private OrderDetailsBean.DataBean dataBean;
private int orderStatu; private int orderStatu;
...@@ -138,6 +144,7 @@ public class OrderDatailsFragment extends Fragment { ...@@ -138,6 +144,7 @@ public class OrderDatailsFragment extends Fragment {
private String totalPrice; private String totalPrice;
private CustomProgressDialog dialog; private CustomProgressDialog dialog;
private String token; private String token;
@Nullable @Nullable
@Override @Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
...@@ -145,32 +152,29 @@ public class OrderDatailsFragment extends Fragment { ...@@ -145,32 +152,29 @@ public class OrderDatailsFragment extends Fragment {
token = GetUserInfo.getToken(getContext()); token = GetUserInfo.getToken(getContext());
orderId = getArguments().getInt("orderId"); orderId = getArguments().getInt("orderId");
unbinder = ButterKnife.bind(this, layout); unbinder = ButterKnife.bind(this, layout);
System.out.println("工单详情页！！！");
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog); dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
initData(orderId,token); initData(orderId, token);
return layout; return layout;
} }
private void initData(int orderId,String token) {
System.out.println("工单详情的id为---->" + orderId); private void initData(int orderId, String token) {
dialog.show(); dialog.show();
//"http://47.94.101.239:7200/orders/" + orderId + "/detail" //"http://47.94.101.239:7200/orders/" + orderId + "/detail"
OkGo.get(Constants.ORDER_DETAILS+ orderId + Constants.ORDER_TEMP) OkGo.get(Constants.ORDER_DETAILS + orderId + Constants.ORDER_TEMP)
.tag(this) .tag(this)
.headers("token",token) .headers("token", token)
.execute(new StringCallback() { .execute(new StringCallback() {
@Override @Override
public void onSuccess(String s, Call call, Response response) { public void onSuccess(String s, Call call, Response response) {
System.out.println("查询工单信息返回的数据--->" + s);
Gson gson = new Gson(); Gson gson = new Gson();
OrderDetailsBean orderDetailsBean = gson.fromJson(s, OrderDetailsBean.class); OrderDetailsBean orderDetailsBean = gson.fromJson(s, OrderDetailsBean.class);
if (orderDetailsBean.getCode() == 0){ if (orderDetailsBean.getCode() == 0) {
dataBean = orderDetailsBean.getData(); dataBean = orderDetailsBean.getData();
if (dataBean==null){ if (dataBean == null) {
return; return;
} }
initDataView(dataBean); initDataView(dataBean);
} } else {
else{
ToastUtils.showShortToast("数据获取失败"); ToastUtils.showShortToast("数据获取失败");
} }
} }
...@@ -217,6 +221,13 @@ public class OrderDatailsFragment extends Fragment { ...@@ -217,6 +221,13 @@ public class OrderDatailsFragment extends Fragment {
twoTextThreeText.setText(dataBean.getCustomerName()); twoTextThreeText.setText(dataBean.getCustomerName());
//customerMobile 客户联系方式 //customerMobile 客户联系方式
twoTextFourText.setText(dataBean.getCustomerMobile()); twoTextFourText.setText(dataBean.getCustomerMobile());
//备注
if (!TextUtils.isEmpty(dataBean.getComment())) {
mInfoDetail.setText(dataBean.getComment());
}
mForwardTimeDetail.setText(dataBean.getAppointmentTime());
mDoorTime.setText(dataBean.getConfirmDoorTime());
//provinceName+cityName+districtName+address 省市区地方 //provinceName+cityName+districtName+address 省市区地方
twoTextFiveText.setText(dataBean.getProvinceName() + dataBean.getCityName() + twoTextFiveText.setText(dataBean.getProvinceName() + dataBean.getCityName() +
dataBean.getDistrictName() + dataBean.getAddress()); dataBean.getDistrictName() + dataBean.getAddress());
...@@ -228,9 +239,9 @@ public class OrderDatailsFragment extends Fragment { ...@@ -228,9 +239,9 @@ public class OrderDatailsFragment extends Fragment {
} }
//productModel 产品型号 //productModel 产品型号
if (!TextUtils.isEmpty(dataBean.getProductModel())) { if (!TextUtils.isEmpty(dataBean.getProductModel())) {
threeTextTwoText.setText(dataBean.getProductModel()); threeTextThreeText.setText(dataBean.getProductModel());
} else { } else {
threeTextTwoText.setText("暂无型号"); threeTextThreeText.setText("暂无型号");
} }
//repairType 保修类型 1保内,2保外 //repairType 保修类型 1保内,2保外
repairType = dataBean.getRepairType(); repairType = dataBean.getRepairType();
...@@ -239,6 +250,9 @@ public class OrderDatailsFragment extends Fragment { ...@@ -239,6 +250,9 @@ public class OrderDatailsFragment extends Fragment {
} else if (repairType == 2) { } else if (repairType == 2) {
threeTextFiveText.setText("保外"); threeTextFiveText.setText("保外");
} }
if (!TextUtils.isEmpty(dataBean.getSn())) {
mSNTv.setText(dataBean.getSn());
}
//isPay 是否付费 1不付费2付费 //isPay 是否付费 1不付费2付费
dataBean.getIsPay(); dataBean.getIsPay();
String isPay = dataBean.getIsPay() + ""; String isPay = dataBean.getIsPay() + "";
......
app/src/main/java/com/dayu/bigfish/fragment/order/OrderDatailsServeFragment.java
...@@ -3,33 +3,21 @@ package com.dayu.bigfish.fragment.order; ...@@ -3,33 +3,21 @@ package com.dayu.bigfish.fragment.order;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.ServeDatailsAdapter; import com.dayu.bigfish.adapter.ServeDatailsAdapter;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.OrderDetailsBean;
import com.dayu.bigfish.bean.ServeDetailsBean; import com.dayu.bigfish.bean.ServeDetailsBean;
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.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils; import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.lzy.okgo.OkGo; import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback; import com.lzy.okgo.callback.StringCallback;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.BindView; import butterknife.BindView;
...@@ -63,33 +51,29 @@ public class OrderDatailsServeFragment extends Fragment { ...@@ -63,33 +51,29 @@ public class OrderDatailsServeFragment extends Fragment {
orderId = getArguments().getInt("orderId"); orderId = getArguments().getInt("orderId");
token = GetUserInfo.getToken(getContext()); token = GetUserInfo.getToken(getContext());
unbinder = ButterKnife.bind(this, layout); unbinder = ButterKnife.bind(this, layout);
// dialog=new CustomProgressDialog(getContext(), R.style.CustomDialog); initData(orderId, token);
// dialog.show();
// presenter.get(orderId);
// initRefresh();
// lazyLoad();
// initListener();
initData(orderId,token);
return layout; return layout;
} }
public void initData(int orderId,String token){
System.out.println("工单详情的id为---->" + orderId); public void initData(int orderId, String token) {
OkGo.get(Constants.ORDER_DETAILS+ orderId + Constants.ORDER_TEMP) OkGo.get(Constants.ORDER_DETAILS + orderId + Constants.ORDER_TEMP)
.tag(this) .tag(this)
.headers("token",token) .headers("token", token)
.execute(new StringCallback() { .execute(new StringCallback() {
@Override @Override
public void onSuccess(String s, Call call, Response response) { public void onSuccess(String s, Call call, Response response) {
System.out.println("查询服务信息返回的数据--->" + s);
Gson gson = new Gson(); Gson gson = new Gson();
ServeDetailsBean serveDetailsBean = gson.fromJson(s, ServeDetailsBean.class); ServeDetailsBean serveDetailsBean = gson.fromJson(s, ServeDetailsBean.class);
if (serveDetailsBean.getCode()==0){ if (serveDetailsBean.getCode() == 0) {
if (serveDetailsBean.getData() == null) {
return;
}
recordBeen = serveDetailsBean.getData().getRecord(); recordBeen = serveDetailsBean.getData().getRecord();
if (recordBeen==null){ if (recordBeen == null) {
return; return;
} }
initDataView(recordBeen); initDataView(recordBeen);
}else{ } else {
ToastUtils.showShortToast("服务记录获取失败"); ToastUtils.showShortToast("服务记录获取失败");
} }
...@@ -98,14 +82,13 @@ public class OrderDatailsServeFragment extends Fragment { ...@@ -98,14 +82,13 @@ public class OrderDatailsServeFragment extends Fragment {
@Override @Override
public void onError(Call call, Response response, Exception e) { public void onError(Call call, Response response, Exception e) {
// System.out.println("");
ToastUtils.showShortToast("网络或服务器异常"); ToastUtils.showShortToast("网络或服务器异常");
} }
}); });
} }
private void initDataView(List<ServeDetailsBean.DataBean.RecordBean> recordBeen) { private void initDataView(List<ServeDetailsBean.DataBean.RecordBean> recordBeen) {
serveDatailsAdapter = new ServeDatailsAdapter(getContext(),recordBeen); serveDatailsAdapter = new ServeDatailsAdapter(getContext(), recordBeen);
serveListView.setAdapter(serveDatailsAdapter); serveListView.setAdapter(serveDatailsAdapter);
//serveDatailsAdapter.notifyDataSetChanged(); //serveDatailsAdapter.notifyDataSetChanged();
} }
......
app/src/main/java/com/dayu/bigfish/fragment/order/message/BigFishMessageFragment.java
...@@ -12,12 +12,12 @@ import android.widget.RelativeLayout; ...@@ -12,12 +12,12 @@ import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.sqlbean.MessageBigFish;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.adapter.BigFishMessageAdapter; import com.dayu.bigfish.adapter.BigFishMessageAdapter;
import com.dayu.bigfish.bean.NewMessageBean; import com.dayu.bigfish.bean.NewMessageBean;
import com.dayu.bigfish.greendao.GreenDaoManager; import com.dayu.bigfish.greendao.GreenDaoManager;
import com.dayu.bigfish.greendao.MessageBigFishDao; import com.dayu.bigfish.greendao.MessageBigFishDao;
import com.dayu.bigfish.sqlbean.MessageBigFish;
import com.dayu.bigfish.utils.DateUtils; import com.dayu.bigfish.utils.DateUtils;
import com.dayu.bigfish.utils.GetUserInfo; import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils; import com.dayu.bigfish.utils.ToastUtils;
...@@ -58,7 +58,7 @@ public class BigFishMessageFragment extends Fragment { ...@@ -58,7 +58,7 @@ public class BigFishMessageFragment extends Fragment {
RelativeLayout bigMessageView; RelativeLayout bigMessageView;
private BigFishMessageAdapter bigFishAdapter; private BigFishMessageAdapter bigFishAdapter;
private CustomProgressDialog dialog; private CustomProgressDialog dialog;
private List<NewMessageBean.DataBeanX.DataBean> bigFishDataList=new ArrayList<>(); private List<NewMessageBean.DataBeanX.DataBean> bigFishDataList = new ArrayList<>();
private String hxUserId; private String hxUserId;
private String token; private String token;
private int orderId; private int orderId;
...@@ -87,9 +87,10 @@ public class BigFishMessageFragment extends Fragment { ...@@ -87,9 +87,10 @@ public class BigFishMessageFragment extends Fragment {
private void initData1() { private void initData1() {
initData(token, hxUserId); initData(token, hxUserId);
bigFishAdapter = new BigFishMessageAdapter(bigFishDataList, getContext(),dateUtils); bigFishAdapter = new BigFishMessageAdapter(bigFishDataList, getContext(), dateUtils);
messageBigfishListview.setAdapter(bigFishAdapter); messageBigfishListview.setAdapter(bigFishAdapter);
} }
private void initListener() { private void initListener() {
messageBigfishListview.setOnItemClickListener((parent, view, position, id) -> { messageBigfishListview.setOnItemClickListener((parent, view, position, id) -> {
NewMessageBean.DataBeanX.DataBean lookMessagesBean = bigFishDataList.get(position); NewMessageBean.DataBeanX.DataBean lookMessagesBean = bigFishDataList.get(position);
...@@ -105,23 +106,6 @@ public class BigFishMessageFragment extends Fragment { ...@@ -105,23 +106,6 @@ public class BigFishMessageFragment extends Fragment {
mMessageBigfishDao.update(types); mMessageBigfishDao.update(types);
} }
} }
/* orderId = bigFishDataList.get(position).getId();
action = (String) bigFishDataList.get(position).getAction();
content = bigFishDataList.get(position).getContent();
messageTitle = bigFishDataList.get(position).getTitle();
try {
time = dateUtils.stringTimeToDate(bigFishDataList.get(position).getCreateTime());
} catch (Exception e) {
e.printStackTrace();
}
if (!(TextUtils.isEmpty(action))){
Intent intent = new Intent(getContext(), BigFishMessageContent.class);
intent.putExtra("message_title",messageTitle);
intent.putExtra("content", action);
intent.putExtra("content_time", time);
startActivity(intent);}*/
}); });
} }
...@@ -145,7 +129,7 @@ public class BigFishMessageFragment extends Fragment { ...@@ -145,7 +129,7 @@ public class BigFishMessageFragment extends Fragment {
Gson gson = new Gson(); Gson gson = new Gson();
NewMessageBean messageBean = gson.fromJson(s, NewMessageBean.class); NewMessageBean messageBean = gson.fromJson(s, NewMessageBean.class);
if (messageBean.getCode() == 0) { if (messageBean.getCode() == 0) {
// bigFishDataList = messageBean.getData().getData(); // bigFishDataList = messageBean.getUserInfo().getUserInfo();
bigFishPager(messageBean.getData().getData()); bigFishPager(messageBean.getData().getData());
} else { } else {
...@@ -153,6 +137,7 @@ public class BigFishMessageFragment extends Fragment { ...@@ -153,6 +137,7 @@ public class BigFishMessageFragment extends Fragment {
dialog.dismiss(); dialog.dismiss();
} }
} }
@Override @Override
public void onError(Call call, Response response, Exception e) { public void onError(Call call, Response response, Exception e) {
super.onError(call, response, e); super.onError(call, response, e);
...@@ -172,7 +157,7 @@ public class BigFishMessageFragment extends Fragment { ...@@ -172,7 +157,7 @@ public class BigFishMessageFragment extends Fragment {
messageBigfishListview.setVisibility(View.VISIBLE); messageBigfishListview.setVisibility(View.VISIBLE);
bigMessageView.setVisibility(View.GONE); bigMessageView.setVisibility(View.GONE);
//查询数据库 当前用户 //查询数据库 当前用户
Query query =mMessageBigfishDao.queryBuilder().where(MessageBigFishDao.Properties.Id1.eq(String.valueOf(GetUserInfo.getACCOUNT_ID(getContext())))) Query query = mMessageBigfishDao.queryBuilder().where(MessageBigFishDao.Properties.Id1.eq(String.valueOf(GetUserInfo.getACCOUNT_ID(getContext()))))
.build(); .build();
// 查询结果以 List 返回 // 查询结果以 List 返回
List<MessageBigFish> list1 = query.list(); List<MessageBigFish> list1 = query.list();
...@@ -185,14 +170,14 @@ public class BigFishMessageFragment extends Fragment { ...@@ -185,14 +170,14 @@ public class BigFishMessageFragment extends Fragment {
//判断接口返回数据与本地数据库值,如果接口数据不包含本地。就添加 //判断接口返回数据与本地数据库值,如果接口数据不包含本地。就添加
for (int j = 0; j < dataBeen.size(); j++) { for (int j = 0; j < dataBeen.size(); j++) {
if (!list.contains(String.valueOf(dataBeen.get(j).getId()))) { if (!list.contains(String.valueOf(dataBeen.get(j).getId()))) {
ss = new MessageBigFish(null, String.valueOf(dataBeen.get(j).getId()),String.valueOf(GetUserInfo.getACCOUNT_ID(getContext())),"0"); ss = new MessageBigFish(null, String.valueOf(dataBeen.get(j).getId()), String.valueOf(GetUserInfo.getACCOUNT_ID(getContext())), "0");
//插入数据 //插入数据
mMessageBigfishDao.insert(ss); mMessageBigfishDao.insert(ss);
} }
} }
} else { } else {
for (int i = 0; i <dataBeen.size(); i++) { for (int i = 0; i < dataBeen.size(); i++) {
ss = new MessageBigFish(null, String.valueOf(dataBeen.get(i).getId()),String.valueOf(GetUserInfo.getACCOUNT_ID(getContext())),"0"); ss = new MessageBigFish(null, String.valueOf(dataBeen.get(i).getId()), String.valueOf(GetUserInfo.getACCOUNT_ID(getContext())), "0");
//插入数据 //插入数据
mMessageBigfishDao.insert(ss); mMessageBigfishDao.insert(ss);
} }
...@@ -204,7 +189,7 @@ public class BigFishMessageFragment extends Fragment { ...@@ -204,7 +189,7 @@ public class BigFishMessageFragment extends Fragment {
NewMessageBean.DataBeanX.DataBean LookMessagesBean2; NewMessageBean.DataBeanX.DataBean LookMessagesBean2;
bigFishDataList.clear(); bigFishDataList.clear();
for (int ixx = 0; ixx < dataBeen.size(); ixx++) { for (int ixx = 0; ixx < dataBeen.size(); ixx++) {
NewMessageBean.DataBeanX.DataBean LookMessagesBean1 =dataBeen.get(ixx); NewMessageBean.DataBeanX.DataBean LookMessagesBean1 = dataBeen.get(ixx);
LookMessagesBean2 = new NewMessageBean.DataBeanX.DataBean(); LookMessagesBean2 = new NewMessageBean.DataBeanX.DataBean();
LookMessagesBean2.setId(LookMessagesBean1.getId()); LookMessagesBean2.setId(LookMessagesBean1.getId());
if (map.containsKey(String.valueOf(LookMessagesBean1.getId()))) { if (map.containsKey(String.valueOf(LookMessagesBean1.getId()))) {
...@@ -240,6 +225,7 @@ public class BigFishMessageFragment extends Fragment { ...@@ -240,6 +225,7 @@ public class BigFishMessageFragment extends Fragment {
super.onDestroyView(); super.onDestroyView();
unbinder.unbind(); unbinder.unbind();
} }
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
......
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