2017/10/14 第三次提交

     消息还未完善,另外还有些许小bug

app/build.gradle

@@ -27,7 +27,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 23
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

app/src/main/AndroidManifest.xml

@@ -89,6 +89,7 @@
         <activity android:name=".activity.AboutUs"/>
         <activity android:name=".activity.IdeaActivity"/>
         <activity android:name=".activity.WorksheetRecordActivity"/>
+        <activity android:name=".activity.MessageActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/dayu/bigfish/Constants.java

@@ -2,21 +2,27 @@ package com.dayu.bigfish;
 
 import com.dayu.bigfish.utils.LogUtils;
 
+import static android.R.id.message;
+
 /**
  * Created by MrWang on 2017/8/20.
  */
 
 public class Constants {
     /**************************微服务测试路径*******************************/
-    public static final String BASE_USER = "http://47.94.101.239:7100/";
-    public static final String BASE_ORDER = "http://47.94.101.239:7200/";
-    public static final String BASE_OTHER = "http://47.94.101.239:7300/";
-    public static final String BASE_COUNT = "http://47.94.101.239:7500/";
-    /**************************正式环境路径*******************************/
-    public static final String BASE_URL = "http://mobile.dayu.ai";
-    /**************************测试环境*******************************/
+    public static final String BASE_USER = "https://47.94.101.239:7100/";
+    public static final String BASE_ORDER = "https://47.94.101.239:7200/";
+    public static final String BASE_OTHER = "https://47.94.101.239:7300/";
+    public static final String BASE_MESSAGE = "https://47.94.101.239:7400/";
+    public static final String BASE_COUNT = "https://47.94.101.239:7500/";
+    public static final String BASE_TEST = "http://47.94.101.239:3112";
+    /**************************正式根环境路径*******************************/
+    public static final String BASE_URL = "https://mobile.dayu.ai";
     //登录的URL
-    public static final String LOGIN_URL = BASE_USER + "account/appLogin";
+    public static final String LOGIN_URL = BASE_URL+"/check";
+    /**************************测试环境*******************************/
+    /*//登录的URL
+    public static final String LOGIN_URL = "http://47.94.101.239:3112/check";
     //登录时发送验证码的URL
     public static final String REGISTER_URL = BASE_USER + "account/loginSms/";
     //根据工单状态获取分页工单信息的路径
@@ -33,6 +39,9 @@ public class Constants {
     //开始服务
     public static final String START_SERVE = BASE_ORDER + "orders/onWorking/";
     //工单详情信息,包含评价,投诉,服务记录
+    //"http://47.94.101.239:7200/orders/" + orderId + "/detail"
+    public static final String ORDER_DETAILS = BASE_ORDER+"orders/";
+    //工单完成,提交验收报告
     public static final String ORDER_FINISH = BASE_ORDER + "orders/waitCustomerCheck";
     //个人中心
     public static final String PERSONAL_CENTER = BASE_USER + "engineerInfo/accountId/";
@@ -56,9 +65,53 @@ public class Constants {
     public final static String WORKSSHEET_RECORD = BASE_ORDER + "orders/findSimpleOrderVOByPage";
     //获取首页tab状态的数量
     public final static String TAB_NUM = BASE_ORDER + "orders/";
+    public final  static  String MESSAGE_HX = BASE_MESSAGE+"hXMessage";
+    */
+    /***********************测试环境2.0配置**********************************/
+  /* //登录的URL
+    public static final String LOGIN_URL = "http://47.94.101.239:3112/check";
+   //登录时发送验证码的URL
+     public static final String REGISTER_URL = BASE_TEST + "/api-user/" + "account/loginSms/";
+    //根据工单状态获取分页工单信息的路径
+     public static final String ORDER_URL = BASE_TEST + "/api-order/" + "orders/findSimpleOrderVOByPage";
+    //异常单获取
+    public static final String ERROR_ORDER = BASE_TEST + "/api-order/" + "orders/findExceptionSimpleOrderVO";
+    //工程师接单
+    public static final String ORDER_RECEIVING = BASE_TEST + "/api-order/" + "orders/";
+    //再次上门、重新预约时间
+     public static final String ORDER_DOOR = BASE_TEST + "/api-order/" + "orders/bespeakDoor";
+    //开始出发
+    public static final String START_ORDER = BASE_TEST + "/api-order/" + "orders/onWay/";
+    //开始服务
+    public static final String START_SERVE = BASE_TEST + "/api-order/" + "orders/onWorking/";
+    //工单详情信息,包含评价,投诉,服务记录
+   public static final String ORDER_DETAILS = BASE_TEST+"/api-order/"+"orders/";
+     //工单完成,提交验收报告
+    public static final String ORDER_FINISH = BASE_TEST + "/api-order/" + "orders/waitCustomerCheck";
+    //个人中心
+     public static final String PERSONAL_CENTER = BASE_TEST + "/api-user/" + "engineerInfo/accountId/";
+    //单表查询工单记录
+    public final static String SELECT_ORDER = BASE_TEST + "/api-order/" + "orders/";
+    //根据工程师id和工程师id获取今日业绩(今日收益)
+    public final static String USER_ORDER_REVENUE = BASE_TEST + "/api-count/" + "ordersStatistics/income/";
+    //根据站点id和工程师id获取工程师今日接单数量
+    public final static String USER_ORDER_RECEIVING = BASE_TEST + "/api-count/" + "ordersStatistics/tasks/";
+    //服务记录、工程师评价
+     public final static String USER_REVENUE = BASE_TEST + "/api-count/" + "ordersStatistics/total/";
+    //反馈提交
+     public final static String SET_IDEA_COMMIT = BASE_TEST + "/api-base/" + "suggest";
+    //版本更新检测
+      public final static String UPDATA_VERSION = BASE_TEST + "/api-base/" + "appVersion/newestVersion/appId/";
+    //版本更新、获取新版本信息
+     public final static String UPGRADE_VERSION = BASE_TEST + "/api-base/" + "appVersion/versionInfo";
+     public final static String COMMIT_VERSION_INFO = BASE_TEST + "/api-base/" + "versionUpgrade";
+    //工单记录/搜索工单
+     public final static String WORKSSHEET_RECORD = BASE_TEST + "/api-order/" + "orders/findSimpleOrderVOByPage";
+    //获取首页tab状态的数量
+    public final static String TAB_NUM = BASE_TEST + "/api-order/" + "orders/";
+    public final  static  String MESSAGE_HX = BASE_TEST+"/api-message/"+"hXMessage";
+    */
      /**************************正式环境*******************************/
-    /*//登录的URL
-     public static final String LOGIN_URL = BASE_URL + "/api-user/" + "account/appLogin";
     //登录时发送验证码的URL
      public static final String REGISTER_URL = BASE_URL + "/api-user/" + "account/loginSms/";
     //根据工单状态获取分页工单信息的路径
@@ -74,6 +127,8 @@ public class Constants {
     //开始服务
     public static final String START_SERVE = BASE_URL + "/api-order/" + "orders/onWorking/";
     //工单详情信息,包含评价,投诉,服务记录
+   public static final String ORDER_DETAILS = BASE_URL+"/api-order/"+"orders/";
+     //工单完成,提交验收报告
     public static final String ORDER_FINISH = BASE_URL + "/api-order/" + "orders/waitCustomerCheck";
     //个人中心
      public static final String PERSONAL_CENTER = BASE_URL + "/api-user/" + "engineerInfo/accountId/";
@@ -95,7 +150,9 @@ public class Constants {
     //工单记录/搜索工单
      public final static String WORKSSHEET_RECORD = BASE_URL + "/api-order/" + "orders/findSimpleOrderVOByPage";
     //获取首页tab状态的数量
-    public final static String TAB_NUM = BASE_URL + "/api-order/" + "orders/";*/
+    public final static String TAB_NUM = BASE_URL + "/api-order/" + "orders/";
+    //环信消息
+    public final  static  String MESSAGE_HX = BASE_URL+"/api-message/"+"hXMessage";
 
 
     /***********************其他配置**********************************/
@@ -111,5 +168,7 @@ public class Constants {
     public final static String SITE_ID = "siteId/";
 
     public final static String TAB_NUM_COUNT = "/count";
+    public final static  String ORDER_TEMP = "/detail";
+
 
 }

app/src/main/java/com/dayu/bigfish/MainActivity.java

@@ -25,7 +25,9 @@ import android.view.WindowManager;
 import android.widget.Toast;
 import com.dayu.bigfish.activity.HomeActivity;
 import com.dayu.bigfish.activity.LoginActivity;
+import com.dayu.bigfish.activity.MessageActivity;
 import com.dayu.bigfish.bean.BaseStringBean;
+import com.dayu.bigfish.bean.InformBean;
 import com.dayu.bigfish.bean.MessageTell;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.bean.VersionBase;
@@ -77,36 +79,7 @@ public class MainActivity extends AppCompatActivity {
         //判断userInfo中是否有数据
         if (UserManager.getInstance().hasUserInfo(this)) {
             //进入主页面,无需登录
-            //联网检测当前是否为最新版本
-            OkGo.get(Constants.UPDATA_VERSION + "dayushifua_dayu")
-                    .tag(this)
-                    .execute(new StringCallback() {
-                        @Override
-                        public void onSuccess(String s, Call call, Response response) {
-                            Gson gson = new Gson();
-                            BaseStringBean baseStringBean = gson.fromJson(s, BaseStringBean.class);
-                            if (baseStringBean.getCode() == 0) {
-                                if (!(getPackageNum().equals(baseStringBean.getData()))) {
-                                    ToastUtils.showShortToast("需要更新");
-                                    upgradeVersion(baseStringBean.getData());
-                                } else {
-                                    //   commitVersionInfo(userId, getIMEI(MainActivity.this), getPackageNum());
-                                    ToastUtils.showShortToast("当前是最新版本,无需更新");
-                                    startHomeActivity();
-
-                                }
-                            } else {
-                                ToastUtils.showShortToast("检测更新版本失败");
-                                startHomeActivity();
-                            }
-                        }
-
-                        @Override
-                        public void onError(Call call, Response response, Exception e) {
-                            ToastUtils.showShortToast("网络或服务器异常,检测版本失败");
-                            startHomeActivity();
-                        }
-                    });
+            startHomeActivity();
         } else {
             //userInfo没有找到关于用户的信息，打开登录页面
             startLoginActivity();
@@ -138,22 +111,26 @@ public class MainActivity extends AppCompatActivity {
             for (EMMessage list : messages) {
                 System.out.println("收到消息" + list.getBody());
                 System.out.println("----->----->" + list.ext());
-                Intent intent = new Intent(MainActivity.this, HomeActivity.class);
+                Intent intent = new Intent(MainActivity.this, MessageActivity.class);
                 PendingIntent pi = PendingIntent.getActivity(MainActivity.this,
                         0, intent, 0);
                 String str=list.getBody().toString();
                 str=str.substring(3);
                 //str=str.Substring(3);
+                Gson gson = new Gson();
+                InformBean informBean = gson.fromJson(list.ext().toString(), InformBean.class);
+
                 Notification.Builder builder = new Notification.Builder(MainActivity.this);
                 builder
                         // 设置打开通知，该通知取消
                         .setAutoCancel(true)
                         // 设置通知提示信息
-                        .setTicker("有新消息")
+                        .setTicker("工单有新消息")
                         // 设置通知的图标
                         .setSmallIcon(R.mipmap.logo)
                         // 设置通知的标题
-                        .setContentTitle(list.getFrom())
+                      //  .setContentTitle(list.getFrom())
+                        .setContentTitle(informBean.getTitle())
                         // 设置通知的内容
                         .setContentText(str)
                         // 设置使用系统默认的声音、LED
@@ -169,7 +146,7 @@ public class MainActivity extends AppCompatActivity {
                 Notification notification = builder.build();
                 NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
                 manager.notify(ID, notification);
-                MessageTell messageTell = new Gson().fromJson(list.ext().toString(), MessageTell.class);
+
 //                if (messageTell.getFunctionType().equals("1")) {
 
 //                 }else{
@@ -230,109 +207,8 @@ public class MainActivity extends AppCompatActivity {
 
     }
 
-    /**
-     * 获取当前应用的版本号
-     */
-    public String getPackageNum() {
-        try {
-            PackageInfo packageInfo = this.getPackageManager().getPackageInfo(this.getPackageName(), 0);
-            String packageName = packageInfo.versionName;
-            return packageName;
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-            return "解析版本号失败";
-        }
 
 
-    }
 
-    /**
-     * 获取新版本的信息
-     */
-    public void upgradeVersion(String versionCode) {
-        //?appId=dayushifua_dayu&versionCode=1.10.1
-        OkGo.get(Constants.UPGRADE_VERSION)
-                .tag(this)
-                .params("appId", "dayushifua_dayu")
-                .params("versionCode", versionCode)
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(String s, Call call, Response response) {
-                        Gson gson = new Gson();
-                        VersionBase versionBase = gson.fromJson(s, VersionBase.class);
-                        if (versionBase.getCode() == 0) {
-                            //弹窗
-                            showUpdateDialog(versionBase.getData().getUpgradePrompt(), versionBase.getData().getDownloadUrl());
-                        } else {
-                            ToastUtils.showShortToast("获取新版本信息失败");
-                            startHomeActivity();
-                            //SPUtils.get(MainActivity.this,"big_fish")
-                        }
-                    }
 
-                    @Override
-                    public void onError(Call call, Response response, Exception e) {
-                        ToastUtils.showShortToast("网络或服务器异常,获取新版本APK失败");
-                        startHomeActivity();
-                    }
-                });
-    }
-
-    /**
-     * 弹窗选择是否更新(软更新)
-     * @param upgradePrompt 提示语
-     * @param downloadPath  下载的路径
-     */
-    private void showUpdateDialog(String upgradePrompt, String downloadPath) {
-        AlertDialog.Builder alertDialog = new AlertDialog.Builder(this);
-        alertDialog.setCancelable(false);//设置点击弹窗外部区域，会话框不能消失
-        alertDialog.setTitle("有新版本啦");
-        alertDialog.setMessage(upgradePrompt);
-        alertDialog.setPositiveButton("下次再说", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                startHomeActivity();
-            }
-        });
-        alertDialog.setNegativeButton("立刻升级", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                pd = new ProgressDialog(MainActivity.this);//创建进度条对话框
-                pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);//设置进度条样式为水平方向
-                pd.show();//显示进度条对话框
-                File sdDir = Environment.getExternalStorageDirectory();
-                File file = new File(sdDir, SystemClock.uptimeMillis() + ".apk");
-                if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-                    HttpUtils httpUtils = new HttpUtils();
-                    httpUtils.download(downloadPath, file.getAbsolutePath(), new RequestCallBack<File>() {
-                        @Override
-                        public void onSuccess(ResponseInfo<File> responseInfo) {
-                            pd.dismiss(); //关闭进度条对话框
-                            Toast.makeText(MainActivity.this, "下载成功", Toast.LENGTH_SHORT).show();
-                               /*覆盖安装APK*/
-                            Intent intent = new Intent();
-                            intent.setAction("android.intent.action.VIEW");
-                            intent.addCategory("android.intent.category.DEFAULT");
-                            intent.setDataAndType(Uri.fromFile(responseInfo.result),
-                                    "application/vnd.android.package-archive");
-                            startActivity(intent);
-                        }
-                        @Override
-                        public void onFailure(HttpException e, String s) {
-                            pd.dismiss();
-                            Toast.makeText(MainActivity.this, "下载失败", Toast.LENGTH_SHORT).show();
-                        }
-                        @Override
-                        public void onLoading(long total, long current, boolean isUploading) {
-                            super.onLoading(total, current, isUploading);
-                            pd.setMax((int) total);    //设置进度条最大值
-                            pd.setProgress((int) current); //设置进度条最小值
-
-                        }
-                    });
-                }
-            }
-        });
-        alertDialog.show();
-    }
 }

app/src/main/java/com/dayu/bigfish/activity/AgainUpDoorActivity.java

@@ -24,6 +24,7 @@ import com.dayu.bigfish.bean.BaseBean;
 import com.dayu.bigfish.eventbus.AgainUpDoorText;
 import com.dayu.bigfish.eventbus.UpdataTime;
 import com.dayu.bigfish.utils.DateUtils;
+import com.dayu.bigfish.utils.GetUserInfo;
 import com.dayu.bigfish.utils.ToastUtils;
 import com.dayu.bigfish.views.CustomProgressDialog;
 import com.google.gson.Gson;
@@ -83,6 +84,7 @@ public class AgainUpDoorActivity extends Activity {
     private int orderId;
     Calendar calendar = Calendar.getInstance(Locale.CHINA);
     private String edValue;
+    private String token;
     private DateUtils dateUtils = new DateUtils();
 
     @Override
@@ -90,6 +92,7 @@ public class AgainUpDoorActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_again_door);
         ButterKnife.bind(this);
+        token = GetUserInfo.getToken(this);
         dialog = new CustomProgressDialog(this, R.style.CustomDialog);
         initData();
     }
@@ -186,20 +189,21 @@ public class AgainUpDoorActivity extends Activity {
                     //initNetWork(orderId, "2017-18-23 15:34:00", edValue);
                     String time=  dateUtils.stringTimeTo(textDateValue.getText().toString());
                     String timeValue = time+textTimeValue.getText().toString()+":00";
-                    initNetWork(orderId, timeValue, edValue);
+                    initNetWork(orderId, timeValue, edValue,token);
                 }
                 break;
         }
 
     }
 
-    public void initNetWork(int orderId, String doorTime, String doorComment) {
+    public void initNetWork(int orderId, String doorTime, String doorComment,String token) {
         OkGo.post(Constants.ORDER_DOOR)
                 .tag(this)
                 .params("orderId", orderId)
                 //params("doorTime", calendar.getTime().toString())
                 .params("doorTime", doorTime)
                 .params("doorComment", doorComment)
+                .headers("token",token)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {

app/src/main/java/com/dayu/bigfish/activity/IdeaActivity.java

@@ -52,12 +52,14 @@ public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPre
     private DateUtils dateUtils = new DateUtils();
     private String systemDate;
     private CustomProgressDialog dialog;
+    private String token;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_idea);
         ButterKnife.bind(this);
+        token = GetUserInfo.getToken(this);
         dialog = new CustomProgressDialog(this, R.style.CustomDialog);
         initData();
     }
@@ -92,6 +94,7 @@ public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPre
     public void success() {
         ToastUtils.showShortToast("提交成功");
         dialog.dismiss();
+        finish();
     }
 
     @Override
@@ -125,8 +128,7 @@ public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPre
                         ToastUtils.showShortToast("请输入反馈意见..");
                         return;
                     }
-                    ideaActivityPresenter.getData(comment, userName, userPhone);
-
+                    ideaActivityPresenter.getData(comment, userName, userPhone,token);
                 }
                 break;
         }

app/src/main/java/com/dayu/bigfish/activity/LoginActivity.java

@@ -22,6 +22,7 @@ import com.dayu.bigfish.bean.RegisterBean;
 import com.dayu.bigfish.managers.UserManager;
 import com.dayu.bigfish.moudle.login.LoginPresenter;
 import com.dayu.bigfish.moudle.login.LoginView;
+import com.dayu.bigfish.utils.GetUserInfo;
 import com.dayu.bigfish.utils.IsPhoneUtils;
 import com.dayu.bigfish.utils.LogUtils;
 import com.dayu.bigfish.utils.SPUtils;
@@ -78,6 +79,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
         ButterKnife.bind(this);
+        token = GetUserInfo.getToken(this);
         dialog = new CustomProgressDialog(this, R.style.CustomDialog);
     }
 
@@ -155,7 +157,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
             });
         }
         userId = Integer.parseInt(accountId);
-        commitVersionInfo(userId,getIMEI(this),getPackageNum());
+        commitVersionInfo(userId,getIMEI(this),getPackageNum(),token);
 
     }
 
@@ -252,7 +254,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
     /**
      * 版本第一次使用时要上传的信息
      */
-    public void commitVersionInfo(int userId, String imei, String versionCode) {
+    public void commitVersionInfo(int userId, String imei, String versionCode,String token) {
         /*{
             "accountId": 145,
                 "createTime": "",
@@ -282,6 +284,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
         OkGo.post(Constants.COMMIT_VERSION_INFO)
                 .tag(this)
                 .upJson(jsonObject.toString())
+                .headers("token",token)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {

app/src/main/java/com/dayu/bigfish/activity/MessageActivity.java

+package com.dayu.bigfish.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.view.ViewPager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.dayu.bigfish.R;
+import com.dayu.bigfish.adapter.FragmentOrderAdapter;
+import com.dayu.bigfish.fragment.order.message.BigFishMessageFragment;
+import com.dayu.bigfish.fragment.order.message.SystemMessageFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by yu on 2017/10/14.
+ */
+
+public class MessageActivity extends FragmentActivity {
+    @BindView(R.id.message_back)
+    ImageView messageBack;
+    @BindView(R.id.text_title)
+    TextView textTitle;
+    @BindView(R.id.message_tablayout)
+    TabLayout messageTablayout;
+    @BindView(R.id.message_view_pager)
+    ViewPager messageViewPager;
+    private List<Fragment> list;
+    private String orderValue;
+    private int orderId;
+    private FragmentOrderAdapter fragmentAdapter;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_message);
+        ButterKnife.bind(this);
+        initData();
+    }
+
+    public void initData() {
+       /* Intent intent = getIntent();
+        orderValue = intent.getStringExtra("orderId");
+        orderId = Integer.parseInt(orderValue);
+        System.out.println("此订单的Id为:----->"+orderId);*/
+        list = new ArrayList<>();
+        list.add(new BigFishMessageFragment());
+        list.add(new SystemMessageFragment());
+        fragmentAdapter = new FragmentOrderAdapter(getSupportFragmentManager(),list);
+        messageViewPager.setAdapter(fragmentAdapter);
+        messageTablayout.setupWithViewPager(messageViewPager);
+        messageTablayout.removeAllTabs();
+        messageTablayout.addTab(messageTablayout.newTab().setText("系统通知"));
+        messageTablayout.addTab(messageTablayout.newTab().setText("大鱼通知"));
+        messageTablayout.setTabMode(TabLayout.MODE_FIXED);
+    }
+
+
+    @OnClick(R.id.message_back)
+    public void onViewClicked() {
+        finish();
+    }
+
+
+
+}
\ No newline at end of file

app/src/main/java/com/dayu/bigfish/activity/NotificationActivity.java

-package com.dayu.bigfish.activity;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-
-import com.dayu.bigfish.R;
-
-/**
- * 消息列表
- */
-
-public class NotificationActivity extends Activity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_notification);
-    }
-}

app/src/main/java/com/dayu/bigfish/activity/OrderFinishActivity.java

@@ -28,6 +28,7 @@ import com.dayu.bigfish.base.BaseActivity;
 import com.dayu.bigfish.bean.CheckOrderInit;
 import com.dayu.bigfish.bean.ImageBean;
 import com.dayu.bigfish.eventbus.OrderFinish;
+import com.dayu.bigfish.eventbus.RefreshTabNum;
 import com.dayu.bigfish.moudle.check.OrderFinishActivityPresenter;
 import com.dayu.bigfish.moudle.check.OrderFinishActivityView;
 import com.dayu.bigfish.utils.GetUserInfo;
@@ -197,7 +198,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
     private String payRemark;
     private Boolean isSwitch;
     private String categoryName; //产品名称
-
+    private  String token;
     public void initData() {
         Intent intent = getIntent();
         String value = intent.getStringExtra("orderId");
@@ -242,10 +243,11 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
         setContentView(R.layout.activity_order_finish);
         ButterKnife.bind(this);
         dialog = new CustomProgressDialog(this, R.style.CustomDialog);
+        token = GetUserInfo.getToken(this);
         initData();
         initView();
         dialog.show();
-        orderFinishActivityPresenter.getInitData(orderId);
+        orderFinishActivityPresenter.getInitData(orderId,token);
 
     }
 
@@ -309,21 +311,25 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
     }
 
     public void success() {
-        dialog.dismiss();
         ToastUtils.showShortToast("数据提交成功");
         SPUtils.clear(this, "big_fish_two");
         finish();
+        EventBus.getDefault().post(new RefreshTabNum(1));
         EventBus.getDefault().post(new OrderFinish(3));
+        dialog.dismiss();
     }
 
     public void failed() {
-        dialog.dismiss();
+
+        EventBus.getDefault().post(new RefreshTabNum(1));
         ToastUtils.showShortToast("提交失败!");
+        dialog.dismiss();
     }
 
     public void error() {
+        EventBus.getDefault().post(new RefreshTabNum(1));
+        ToastUtils.showShortToast("服务器异常,提交失败!");
         dialog.dismiss();
-        ToastUtils.showShortToast("提交失败!");
     }
 
     @Override
@@ -337,7 +343,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
         // listTwo = list;
         orderFinishActivityPresenter.postPhotoSubmit(list, orderId, serveValue1,
                 engineerId, isPay, upDoorCost, payRemark,
-                serveCost, cailiaoCost, otherCost);
+                serveCost, cailiaoCost, otherCost,token);
     }
 
     @Override
@@ -449,7 +455,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
                     payRemark = etUpInput.getText().toString();
                     orderFinishActivityPresenter.postSubmit(orderId, serveValue1,
                             engineerId, isPay, upDoorCost, payRemark,
-                            serveCost, cailiaoCost, otherCost);
+                            serveCost, cailiaoCost, otherCost,token);
                 }
                 break;
             //选择图片
@@ -504,7 +510,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
         String path = file.getAbsolutePath();
         mImageList.add(path);
         if (mImageList.size() == iamgeUrl.size()) {
-            orderFinishActivityPresenter.upPhoto(mImageList, orderId);
+            orderFinishActivityPresenter.upPhoto(mImageList, orderId,token);
         }
     }
 

app/src/main/java/com/dayu/bigfish/activity/PersonalCenterActivity.java

@@ -107,12 +107,14 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
     private String imageUrl;//头像信息
     private String userName;
     private String userPhone;
+    private String token;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_personal_center);
         ButterKnife.bind(this);
+        token = GetUserInfo.getToken(this);
        userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
       //  userId = userInfo.getAccountId();
 
@@ -152,13 +154,13 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
     @Override
     public void initData() {
         //获取工程师信息
-        personalCenterPresenter.get(userId);
+        personalCenterPresenter.get(userId,token);
         //获取工程师今日收益(业绩)
-        personalCenterPresenter.getEarnings(siteId,userId);
+        personalCenterPresenter.getEarnings(siteId,userId,token);
         //获取工程师今日接单数量
-        personalCenterPresenter.getReceOrder(siteId,userId);
+        personalCenterPresenter.getReceOrder(siteId,userId,token);
         //获取工程师的累计信息 (评分,累计业绩,工单记录)
-        personalCenterPresenter.getOrderUserInfo(siteId,userId);
+        personalCenterPresenter.getOrderUserInfo(siteId,userId,token);
 
     }
 

app/src/main/java/com/dayu/bigfish/activity/ReceivingActivity.java

 package com.dayu.bigfish.activity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ImageView;
-import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -14,15 +14,17 @@ import com.dayu.bigfish.R;
 import com.dayu.bigfish.adapter.ReceivingAdapter;
 import com.dayu.bigfish.base.BaseActivity;
 import com.dayu.bigfish.bean.ReceivingBean;
-import com.dayu.bigfish.bean.ReceivingOrderBean;
+import com.dayu.bigfish.eventbus.RefreshTabNum;
 import com.dayu.bigfish.moudle.receiving.Receiving;
 import com.dayu.bigfish.moudle.receiving.ReceivingPresenter;
 import com.dayu.bigfish.moudle.receiving.ReceivingView;
 import com.dayu.bigfish.tip.TipsHelper;
 import com.dayu.bigfish.utils.GetUserInfo;
-import com.dayu.bigfish.utils.SPUtils;
 import com.dayu.bigfish.utils.ToastUtils;
 import com.dayu.bigfish.views.CustomProgressDialog;
+import com.dayu.bigfish.views.RefreListView;
+
+import org.greenrobot.eventbus.EventBus;
 
 import java.util.List;
 
@@ -30,10 +32,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-import static com.dayu.bigfish.utils.GetUserInfo.getACCOUNT_ID;
-import static com.dayu.bigfish.utils.SPUtils.get;
-import static com.umeng.analytics.pro.x.G;
-import static com.umeng.analytics.pro.x.S;
 
 /**
  * 接单列表
@@ -43,8 +41,6 @@ import static com.umeng.analytics.pro.x.S;
 public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPresenter> implements ReceivingView, Receiving {
     @BindView(R.id.receiving_back)
     ImageView receivingBack;
-    @BindView(R.id.receiving_listview)
-    ListView receivingListview;
     public ReceivingAdapter mReceiviingAdapter;
     public ReceivingPresenter mReceivingPresenter;
     public List<ReceivingBean.DataBeanX.DataBean> list;
@@ -54,10 +50,22 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
     SwipeRefreshLayout receivingRefersh;
     @BindView(R.id.order_title_num)
     TextView orderTitleNum;
-    @BindView(R.id.image)
-    ImageView view;
+    @BindView(R.id.receiving_listview)
+    RefreListView receivingListview;
+    @BindView(R.id.image_empty)
+    ImageView imageEmpty;
+    @BindView(R.id.textView_empty)
+    TextView textViewEmpty;
+    @BindView(R.id.view)
+    RelativeLayout view;
+   /* @BindView(R.id.receiving_listview)
+    ListView receivingListview;*/
+
     private CustomProgressDialog dialog;
     TipsHelper mTipsHelper;
+    private String token;
+    private int orderId;
+
     // private  Boolean refershState;;
     //  public LayoutInflater inflater; //加载更多的布局
     // private View loadmoreView;//用来接收加载更多的布局
@@ -69,6 +77,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_receiving);
         ButterKnife.bind(this);
+        token = GetUserInfo.getToken(this);
         dialog = new CustomProgressDialog(this, R.style.CustomDialog);
         //初始化receivingRefersh的颜色
         //第一次进入的时候就刷新数据
@@ -81,8 +90,17 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
 
     @Override
     public void initListener() {
+        receivingListview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                orderId = list.get(position).getId();
+                Intent intent = new Intent(ReceivingActivity.this, OrderDetailsActivity.class);
+                intent.putExtra("orderId", orderId + "");
+                startActivity(intent);
+            }
+        });
         receivingRefersh.setOnRefreshListener(
-                () -> initNetWork(1, 1, 10,GetUserInfo.getSITE_ID(ReceivingActivity.this)));
+                () -> initNetWork(1, 1, 10, GetUserInfo.getSITE_ID(ReceivingActivity.this)));
     }
 
     @Override
@@ -110,9 +128,10 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
         //初始化适配器
 
     }
+
     //请求列表数据
-    public void initNetWork(int getState, int pagerId, int PagerSize,int siteId) {
-        mReceivingPresenter.get(getState, pagerId, PagerSize,siteId);
+    public void initNetWork(int getState, int pagerId, int PagerSize, int siteId) {
+        mReceivingPresenter.get(getState, pagerId, PagerSize, siteId, token);
     }
 
     @Override
@@ -146,16 +165,16 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
         // int userId = (int) SPUtils.get(this,"ACCOUNTId","");
         list = receivingBean.getData().getData();
         if (list.size() == 0 || list == null) {
-           // mTipsHelper.showEmpty();
+            // mTipsHelper.showEmpty();
             view.setVisibility(View.VISIBLE);
             receivingListview.setVisibility(View.GONE);
             dialog.dismiss();
             receivingRefersh.post(() -> receivingRefersh.setRefreshing(false));
         } else {
-          //  mTipsHelper.hideEmpty();
+            //  mTipsHelper.hideEmpty();
             view.setVisibility(View.GONE);
             receivingListview.setVisibility(View.VISIBLE);
-            System.out.println("list集合的大小--->"+list.size());
+            System.out.println("list集合的大小--->" + list.size());
             orderTitleNum.setText(getResources().getText(R.string.tv_order_list_num) + (String.valueOf(list.size())) + ")");
             mReceiviingAdapter = new ReceivingAdapter(ReceivingActivity.this, list, this);
             receivingListview.setAdapter(mReceiviingAdapter);
@@ -177,7 +196,8 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
     @Override
     public void receivingSuccess() {
         ToastUtils.showShortToast("接单成功");
-        initNetWork(1,1,10, GetUserInfo.getSITE_ID(this));
+        EventBus.getDefault().post(new RefreshTabNum(1));
+        initNetWork(1, 1, 10, GetUserInfo.getSITE_ID(this));
         dialog.dismiss();
         finish();
     }
@@ -195,10 +215,10 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
     //接单的回调
     @Override
     public void receivingOrder(int orderId) {
-       // ToastUtils.showShortToast(orderId+"");
+        // ToastUtils.showShortToast(orderId+"");
         int userId = GetUserInfo.getACCOUNT_ID(this);
         dialog.show();
-        mReceivingPresenter.receivingOrder(orderId,userId);
+        mReceivingPresenter.receivingOrder(orderId, userId, token);
     }
 
 

app/src/main/java/com/dayu/bigfish/activity/SettingActivity.java

@@ -21,6 +21,7 @@ import com.dayu.bigfish.managers.UserManager;
 import com.dayu.bigfish.moudle.set.SettingActivityPresenter;
 import com.dayu.bigfish.moudle.set.SettingActivityView;
 import com.dayu.bigfish.utils.DataCleanManager;
+import com.dayu.bigfish.utils.GetUserInfo;
 import com.dayu.bigfish.utils.ToastUtils;
 import com.dayu.bigfish.views.CustomProgressDialog;
 import com.dayu.bigfish.views.SwitchImage;
@@ -66,12 +67,14 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
     private CustomProgressDialog dialog;
     private String userName;
     private String userphone;
+    private String token;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_setting);
         ButterKnife.bind(this);
+        token = GetUserInfo.getToken(this);
         dialog = new CustomProgressDialog(this, R.style.CustomDialog);
         initView();
         initData();
@@ -138,12 +141,13 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
                 break;
             //更新
             case R.id.set_jiance_gengxin:
-                settingActivityPresenter.updataVersion();
+                settingActivityPresenter.updataVersion(token);
                 break;
             //客服电话
             case R.id.set_kefu_phone:
                 Intent intent1 = new Intent(Intent.ACTION_DIAL);
-                intent1.setData(Uri.parse("tel:400-950-6677"));
+                //4000086898
+                intent1.setData(Uri.parse("tel:400-008-6898"));
                 startActivity(intent1);
                 break;
             //关于我们

app/src/main/java/com/dayu/bigfish/activity/StartActivity.java

@@ -9,6 +9,7 @@ import android.widget.Button;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.bean.BaseBean;
+import com.dayu.bigfish.utils.GetUserInfo;
 import com.dayu.bigfish.utils.ToastUtils;
 import com.google.gson.Gson;
 import com.lzy.okgo.OkGo;
@@ -33,6 +34,7 @@ public class StartActivity extends Activity {
     Button buttonThree;
     private int orderId;
     private boolean isStart = false;
+    private String token;
 
     // private  boolean isServe = true;
     private void initData() {
@@ -48,6 +50,7 @@ public class StartActivity extends Activity {
         setContentView(R.layout.activity_begin_start);
         // TODO: add setContentView(...) invocation
         ButterKnife.bind(this);
+        token = GetUserInfo.getToken(this);
         initData();
     }
 
@@ -57,11 +60,11 @@ public class StartActivity extends Activity {
             case R.id.button_one:
                 //isStart = false 不等于true 说明工程师还未出发
                 //开始出发
-                initStart(orderId);
+                initStart(orderId,token);
                 break;
             case R.id.button_two:
                 if (isStart) {
-                    initServe(orderId);
+                    initServe(orderId,token);
                     buttonThree.setVisibility(View.VISIBLE);
                 } else {
                     ToastUtils.showShortToast("您还未出发,不能开始服务");
@@ -80,10 +83,11 @@ public class StartActivity extends Activity {
         }
     }
 
-    public void initStart(final int orderId) {
+    public void initStart(final int orderId,String token) {
         System.out.println("开始出发的工单id--->" + orderId);
         OkGo.get(Constants.START_ORDER + orderId)
                 .tag(this)
+                .headers("token",token)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
@@ -105,10 +109,11 @@ public class StartActivity extends Activity {
                 });
     }
 
-    public void initServe(final int orderId) {
+    public void initServe(final int orderId,String token) {
         System.out.println("开始服务的工单id" + orderId);
         OkGo.get(Constants.START_SERVE + orderId)
                 .tag(this)
+                .headers("token",token)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {

app/src/main/java/com/dayu/bigfish/activity/SubscribeTimeActivity.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.database.DatabaseUtils;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.support.v4.media.session.MediaSessionCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
@@ -23,9 +24,11 @@ import com.dayu.bigfish.MainActivity;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.base.BaseActivity;
 import com.dayu.bigfish.bean.BaseBean;
+import com.dayu.bigfish.eventbus.RefreshTabNum;
 import com.dayu.bigfish.moudle.subscribe.SubscribeTimePresenter;
 import com.dayu.bigfish.moudle.subscribe.SubscribeTimeView;
 import com.dayu.bigfish.utils.DateUtils;
+import com.dayu.bigfish.utils.GetUserInfo;
 import com.dayu.bigfish.utils.TimeUtils;
 import com.dayu.bigfish.utils.ToastUtils;
 import com.dayu.bigfish.views.CustomProgressDialog;
@@ -34,6 +37,8 @@ import com.google.gson.Gson;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -95,6 +100,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
     Calendar calendar = Calendar.getInstance(Locale.CHINA);
     private String edValue;
     private CustomProgressDialog dialog;
+    private String token;
     private DateUtils  dateUtils = new DateUtils();
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -102,6 +108,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
         setContentView(R.layout.activity_subscribe_time);
         ButterKnife.bind(this);
         dialog = new CustomProgressDialog(this, R.style.CustomDialog);
+        token = GetUserInfo.getToken(this);
         initData();
         // refershAdapter = (RefershAdapter) HomeActivity.list_fragments.get(0);
 
@@ -123,9 +130,10 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
         orderId = Integer.parseInt(value);
     }
 
-    public void initNetWork(int orderId, String doorTime, String doorComment) {
+    public void initNetWork(int orderId, String doorTime, String doorComment,String token) {
         OkGo.post(Constants.ORDER_DOOR)
                 .tag(this)
+                .headers("token",token)
                 .params("orderId", orderId)
                 //params("doorTime", calendar.getTime().toString())
                 .params("doorTime", doorTime)
@@ -138,6 +146,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
                         BaseBean baseBean = gson.fromJson(s, BaseBean.class);
                         if (baseBean.getCode() == 0) {
                             ToastUtils.showShortToast("预约时间成功,请移至待服务列表查看");
+                             EventBus.getDefault().post(new RefreshTabNum(1));
                             dialog.dismiss();
                         }
                         // refershAdapter.refershAdapter();
@@ -146,8 +155,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
 
                     @Override
                     public void onError(Call call, Response response, Exception e) {
-                        System.out.println("------->" + call);
-                        System.out.println("------->" + response);
+                       ToastUtils.showShortToast("网络异常");
                     }
                 });
     }
@@ -180,7 +188,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
                    String time=  dateUtils.stringTimeTo(textDateValue.getText().toString());
                     String timeValue = time+textTimeValue.getText().toString()+":00";
 
-                    initNetWork(orderId, timeValue, edValue);
+                    initNetWork(orderId, timeValue, edValue,token);
                 }
 
                 break;

app/src/main/java/com/dayu/bigfish/activity/TakePhotoActivity.java

-package com.dayu.bigfish.activity;
-
-
-/**
- * Created by yu
- * on 2017/9/22.
- */
-
-public class TakePhotoActivity {}
-   /* // private CustomHelper customHelper;
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initPhoto();
-    }
-
-    *//*   public void onClick(View view) {
-
-       }
-   *//*
-    public void initPhoto() {
-        File file = new File(Environment.getExternalStorageDirectory(), "/temp/" + System.currentTimeMillis() + ".jpg");
-        if (!file.getParentFile().exists()) file.getParentFile().mkdirs();
-        Uri imageUri = Uri.fromFile(file);
-       *//* //鲁班压缩
-        LubanOptions option = new LubanOptions.Builder()
-                .setMaxHeight(800)
-                .setMaxWidth(width)
-                .setMaxSize(maxSize)
-                .create();
-        config = CompressConfig.ofLuban(option);
-        config.enableReserveRaw(enableRawFile);*//*
-       //调起相机并裁剪
-        getTakePhoto().onPickFromCaptureWithCrop(imageUri, getCropOptions());
-      //  getTakePhoto().onPickMultipleWithCrop(limit, getCropOptions());
-    }
-
-    @Override
-    public void takeCancel() {
-        super.takeCancel();
-    }
-
-    @Override
-    public void takeFail(TResult result, String msg) {
-        super.takeFail(result, msg);
-    }
-
-    @Override
-    public void takeSuccess(TResult result) {
-        super.takeSuccess(result);
-        showImg(result.getImages());
-    }
-
-    private void showImg(ArrayList<TImage> images) {
-        // Intent intent=new Intent(this,ResultActivity.class);
-        //intent.putExtra("images",images);
-        //startActivity(intent);
-    }
-
-    public CropOptions getCropOptions() {
-        CropOptions.Builder builder = new CropOptions.Builder();
-        builder.setAspectX(800).setAspectY(800);
-        builder.setWithOwnCrop(true);
-        return builder.create();
-    }
-}*/

app/src/main/java/com/dayu/bigfish/activity/UpdataSubscribeTimeActivity.java

@@ -22,6 +22,7 @@ import com.dayu.bigfish.eventbus.UpdataTime;
 import com.dayu.bigfish.moudle.updata.UpdataSubscribeTimePresenter;
 import com.dayu.bigfish.moudle.updata.UpdataSubscribeTimeView;
 import com.dayu.bigfish.utils.DateUtils;
+import com.dayu.bigfish.utils.GetUserInfo;
 import com.dayu.bigfish.utils.ToastUtils;
 import com.dayu.bigfish.views.CustomProgressDialog;
 
@@ -79,12 +80,14 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
     private String edValue;
     private CustomProgressDialog dialog;
     private DateUtils dateUtils = new DateUtils();
+    private String token;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_updata_subscribe_time);
         ButterKnife.bind(this);
         dialog = new CustomProgressDialog(this, R.style.CustomDialog);
+        token = GetUserInfo.getToken(this);
         initData();
 
     }
@@ -129,7 +132,7 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
                     ToastUtils.showShortToast("正在提交数据......");
                     String time=  dateUtils.stringTimeTo(textDateValue.getText().toString());
                     String timeValue = time+textTimeValue.getText().toString()+":00";
-                    updataSubscribeTimePresenter.post(orderId, timeValue, edValue);
+                    updataSubscribeTimePresenter.post(orderId, timeValue, edValue,token);
                     //initNetWork(orderId, "2017-18-23 15:34:00", edValue);
                 }
                 break;

app/src/main/java/com/dayu/bigfish/activity/WorkOrderActivity.java

-package com.dayu.bigfish.activity;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
-
-import com.dayu.bigfish.R;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-
-/**
- * 工单详情页面
- * on 2017/9/1.
- */
-
-public class WorkOrderActivity extends AppCompatActivity {
-    @BindView(R.id.work_order_back)
-    ImageView workOrderBack;
-    @BindView(R.id.work_order_title)
-    RelativeLayout workOrderTitle;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_work_order);
-        ButterKnife.bind(this);
-    }
-
-}

app/src/main/java/com/dayu/bigfish/adapter/HomeTwoTabAdapter.java

@@ -69,11 +69,13 @@ public class HomeTwoTabAdapter extends BaseAdapter {
     private List<MyGreenDao> list; //数据库的数据源
     ViewHolder viewHolder;
     int postion;
+    private String mToken;
 
     // int state;//0:默认开始出发,1:开始服务，2:需要再次上门,3:处理工单
-    public HomeTwoTabAdapter(Context context, List<HomeTwoTabBean.DataBeanX.DataBean> list) {
+    public HomeTwoTabAdapter(Context context, List<HomeTwoTabBean.DataBeanX.DataBean> list,String token) {
         this.context = context;
         this.twoTablist = list;
+        this.mToken = token;
         dialog = new CustomProgressDialog(context, R.style.CustomDialog);
         EventBus.getDefault().register(this);
     }
@@ -110,7 +112,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
         //switchView(viewHolder);
         this.postion = position;
         try {
-            initData(position, viewHolder);
+            initData(position, viewHolder,mToken);
         } catch (Exception e) {
             e.printStackTrace();
             ToastUtils.showShortToast("待服务列表适配器解析异常");
@@ -173,7 +175,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
         }
     }
 
-    private void initData(final int position, final ViewHolder viewHolder) throws Exception {
+    private void initData(final int position, final ViewHolder viewHolder,String token) throws Exception {
         //查询数据
         Query query = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(position).getId()),
                 MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
@@ -262,7 +264,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
         viewHolder.itemStartDepart.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                initNetWork(viewHolder, orderId, Constants.START_ORDER, position);
+                initNetWork(viewHolder, orderId, Constants.START_ORDER, position,token);
             }
         });
         //修改预约时间
@@ -287,7 +289,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
         viewHolder.itemServe.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                initNetWork1(viewHolder, orderId, Constants.START_SERVE, position);
+                initNetWork1(viewHolder, orderId, Constants.START_SERVE, position,token);
             }
         });
 
@@ -304,10 +306,11 @@ public class HomeTwoTabAdapter extends BaseAdapter {
     }
 
     /*初始化网络数据*/
-    public void initNetWork(final ViewHolder viewHolder, final int orderId, String url, final int position) {
+    public void initNetWork(final ViewHolder viewHolder, final int orderId, String url, final int position,String token) {
         dialog.show();
         OkGo.get(url + orderId)
                 .tag(this)
+                .headers("token",token)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
@@ -378,9 +381,10 @@ public class HomeTwoTabAdapter extends BaseAdapter {
     }
 
     /*初始化网络数据*/
-    public void initNetWork1(final ViewHolder viewHolder, final int orderId, String url, final int position) {
+    public void initNetWork1(final ViewHolder viewHolder, final int orderId, String url, final int position,String token) {
         dialog.show();
         OkGo.get(url + orderId)
+                .headers("token",token)
                 .tag(this)
                 .execute(new StringCallback() {
                     @Override

app/src/main/java/com/dayu/bigfish/adapter/SystemMessageAdapter.java

+package com.dayu.bigfish.adapter;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.graphics.Typeface;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.dayu.bigfish.R;
+import com.dayu.bigfish.bean.MessageBean;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by yu on 2017/10/14.
+ */
+
+public class SystemMessageAdapter extends BaseAdapter {
+    private List<MessageBean.DataBeanX.DataBean> dataBeenList;
+    private Context context;
+
+    public SystemMessageAdapter(List<MessageBean.DataBeanX.DataBean> dataBeenList, Context context) {
+        this.dataBeenList = dataBeenList;
+        this.context = context;
+    }
+
+    @Override
+    public int getCount() {
+       // dataBeenList.size()
+        return 3;
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return position;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View view;
+        ViewHolder viewHolder;
+        if (convertView == null) {
+            view = View.inflate(context, R.layout.message_adapter, null);
+            viewHolder = new ViewHolder(view,context);
+            view.setTag(viewHolder);
+        } else {
+            view = convertView;
+            viewHolder = (ViewHolder) view.getTag();
+        }
+        initData();
+        return convertView;
+    }
+
+    private void initData() {
+
+    }
+
+    static class ViewHolder {
+        @BindView(R.id.line_textView)
+        TextView lineTextView;
+        @BindView(R.id.message_date)
+        TextView messageDate;
+        @BindView(R.id.message_time)
+        TextView messageTime;
+        @BindView(R.id.message_text_content)
+        TextView messageTextContent;
+        @BindView(R.id.item)
+        RelativeLayout item;
+
+        ViewHolder(View view,Context context) {
+            ButterKnife.bind(this, view);
+            AssetManager mgr = context.getAssets();//得到AssetManager
+            Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf");//根据路径得到Typeface
+            messageTime.setTypeface(tf);//设置字体
+        }
+    }
+}

app/src/main/java/com/dayu/bigfish/application/MyApplication.java

@@ -160,10 +160,11 @@ public class MyApplication extends Application {
         //builder.cookieJar(new CookieJarImpl(new MemoryCookieStore()));            //使用内存保持cookie，app退出后，cookie消失
 
         //https相关设置，以下几种方案根据需要自己设置
+
         //方法一：信任所有证书,不安全有风险
-        // HttpsUtils.SSLParams sslParams1 = HttpsUtils.getSslSocketFactory();
+       //  HttpsUtils.SSLParams sslParams1 = HttpsUtils.getSslSocketFactory();
 //        //方法二：自定义信任规则，校验服务端证书
-//        HttpsUtils.SSLParams sslParams2 = HttpsUtils.getSslSocketFactory(new SafeTrustManager());
+   //    HttpsUtils.SSLParams sslParams2 = HttpsUtils.getSslSocketFactory(new SafeTrustManager());
 //        //方法三：使用预埋证书，校验服务端证书（自签名证书）
 //        //HttpsUtils.SSLParams sslParams3 = HttpsUtils.getSslSocketFactory(getAssets().open("srca.cer"));
 //        //方法四：使用bks证书和密码管理客户端证书（双向认证），使用预埋证书，校验服务端证书（自签名证书）

app/src/main/java/com/dayu/bigfish/base/BaseFragment.java

@@ -18,17 +18,10 @@ public abstract class BaseFragment<V, T extends BasePresenter<V>> extends Fragme
     public T presenter;
     //标志位,Fragment是否可见
     protected boolean isVisible;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        presenter = initPresenter();
-        initData();
-    }
-
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        presenter = initPresenter();
         return super.onCreateView(inflater, container, savedInstanceState);
     }
     protected TipsHelper createTipsHelper(View view) {

app/src/main/java/com/dayu/bigfish/bean/InformBean.java

+package com.dayu.bigfish.bean;
+
+import java.io.Serializable;
+
+/**
+ * Created by yu on 2017/10/11.
+ */
+
+public class InformBean implements Serializable {
+
+    /**
+     * customJson : {"orderId":6}
+     * title : 改派通知
+     * functionType : 1
+     * category : 1
+     * action : order
+     */
+
+    private CustomJsonBean customJson;
+    private String title;
+    private int functionType;
+    private int category;
+    private String action;
+
+    public CustomJsonBean getCustomJson() {
+        return customJson;
+    }
+
+    public void setCustomJson(CustomJsonBean customJson) {
+        this.customJson = customJson;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getFunctionType() {
+        return functionType;
+    }
+
+    public void setFunctionType(int functionType) {
+        this.functionType = functionType;
+    }
+
+    public int getCategory() {
+        return category;
+    }
+
+    public void setCategory(int category) {
+        this.category = category;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public static class CustomJsonBean {
+        /**
+         * orderId : 6
+         */
+
+        private int orderId;
+
+        public int getOrderId() {
+            return orderId;
+        }
+
+        public void setOrderId(int orderId) {
+            this.orderId = orderId;
+        }
+    }
+}

app/src/main/java/com/dayu/bigfish/bean/MessageBean.java

+package com.dayu.bigfish.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 消息的Bean
+ * on 2017/10/14.
+ */
+
+public class MessageBean implements Serializable {
+
+    /**
+     * code : 0
+     * data : {"pageNo":1,"pageSize":10,"totalRows":2,"data":[{"id":228,"title":"预约超时通知","content":"工单编号:20171013194811487890 您还没有预约，请及时与客户协调上门时间","sender":null,"hxAccount":"cfc68f0182484d1f9746a0f15248eafc","status":1,"type":1,"functionType":null,"category":1,"action":null,"reason":null,"batchId":null,"createTime":"2017-10-13 21:01:47","startTime":null,"endTime":null},{"id":229,"title":"预约超时通知","content":"工单编号:20171013194811487890 您还没有预约，请及时与客户协调上门时间","sender":null,"hxAccount":"f2b2a017d7154c75bf6d1f4b8076ab53","status":1,"type":1,"functionType":null,"category":1,"action":null,"reason":null,"batchId":null,"createTime":"2017-10-13 21:01:47","startTime":null,"endTime":null}],"totalPages":1,"previousPageNo":1,"nextPageNo":1}
+     * msg : 成功
+     */
+
+    private int code;
+    private DataBeanX data;
+    private String msg;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public DataBeanX getData() {
+        return data;
+    }
+
+    public void setData(DataBeanX data) {
+        this.data = data;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public static class DataBeanX {
+        /**
+         * pageNo : 1
+         * pageSize : 10
+         * totalRows : 2
+         * data : [{"id":228,"title":"预约超时通知","content":"工单编号:20171013194811487890 您还没有预约，请及时与客户协调上门时间","sender":null,"hxAccount":"cfc68f0182484d1f9746a0f15248eafc","status":1,"type":1,"functionType":null,"category":1,"action":null,"reason":null,"batchId":null,"createTime":"2017-10-13 21:01:47","startTime":null,"endTime":null},{"id":229,"title":"预约超时通知","content":"工单编号:20171013194811487890 您还没有预约，请及时与客户协调上门时间","sender":null,"hxAccount":"f2b2a017d7154c75bf6d1f4b8076ab53","status":1,"type":1,"functionType":null,"category":1,"action":null,"reason":null,"batchId":null,"createTime":"2017-10-13 21:01:47","startTime":null,"endTime":null}]
+         * totalPages : 1
+         * previousPageNo : 1
+         * nextPageNo : 1
+         */
+
+        private int pageNo;
+        private int pageSize;
+        private int totalRows;
+        private int totalPages;
+        private int previousPageNo;
+        private int nextPageNo;
+        private List<DataBean> data;
+
+        public int getPageNo() {
+            return pageNo;
+        }
+
+        public void setPageNo(int pageNo) {
+            this.pageNo = pageNo;
+        }
+
+        public int getPageSize() {
+            return pageSize;
+        }
+
+        public void setPageSize(int pageSize) {
+            this.pageSize = pageSize;
+        }
+
+        public int getTotalRows() {
+            return totalRows;
+        }
+
+        public void setTotalRows(int totalRows) {
+            this.totalRows = totalRows;
+        }
+
+        public int getTotalPages() {
+            return totalPages;
+        }
+
+        public void setTotalPages(int totalPages) {
+            this.totalPages = totalPages;
+        }
+
+        public int getPreviousPageNo() {
+            return previousPageNo;
+        }
+
+        public void setPreviousPageNo(int previousPageNo) {
+            this.previousPageNo = previousPageNo;
+        }
+
+        public int getNextPageNo() {
+            return nextPageNo;
+        }
+
+        public void setNextPageNo(int nextPageNo) {
+            this.nextPageNo = nextPageNo;
+        }
+
+        public List<DataBean> getData() {
+            return data;
+        }
+
+        public void setData(List<DataBean> data) {
+            this.data = data;
+        }
+
+        public static class DataBean {
+            /**
+             * id : 228
+             * title : 预约超时通知
+             * content : 工单编号:20171013194811487890 您还没有预约，请及时与客户协调上门时间
+             * sender : null
+             * hxAccount : cfc68f0182484d1f9746a0f15248eafc
+             * status : 1
+             * type : 1
+             * functionType : null
+             * category : 1
+             * action : null
+             * reason : null
+             * batchId : null
+             * createTime : 2017-10-13 21:01:47
+             * startTime : null
+             * endTime : null
+             */
+
+            private int id;
+            private String title;
+            private String content;
+            private Object sender;
+            private String hxAccount;
+            private int status;
+            private int type;
+            private Object functionType;
+            private int category;
+            private Object action;
+            private Object reason;
+            private Object batchId;
+            private String createTime;
+            private Object startTime;
+            private Object endTime;
+
+            public int getId() {
+                return id;
+            }
+
+            public void setId(int id) {
+                this.id = id;
+            }
+
+            public String getTitle() {
+                return title;
+            }
+
+            public void setTitle(String title) {
+                this.title = title;
+            }
+
+            public String getContent() {
+                return content;
+            }
+
+            public void setContent(String content) {
+                this.content = content;
+            }
+
+            public Object getSender() {
+                return sender;
+            }
+
+            public void setSender(Object sender) {
+                this.sender = sender;
+            }
+
+            public String getHxAccount() {
+                return hxAccount;
+            }
+
+            public void setHxAccount(String hxAccount) {
+                this.hxAccount = hxAccount;
+            }
+
+            public int getStatus() {
+                return status;
+            }
+
+            public void setStatus(int status) {
+                this.status = status;
+            }
+
+            public int getType() {
+                return type;
+            }
+
+            public void setType(int type) {
+                this.type = type;
+            }
+
+            public Object getFunctionType() {
+                return functionType;
+            }
+
+            public void setFunctionType(Object functionType) {
+                this.functionType = functionType;
+            }
+
+            public int getCategory() {
+                return category;
+            }
+
+            public void setCategory(int category) {
+                this.category = category;
+            }
+
+            public Object getAction() {
+                return action;
+            }
+
+            public void setAction(Object action) {
+                this.action = action;
+            }
+
+            public Object getReason() {
+                return reason;
+            }
+
+            public void setReason(Object reason) {
+                this.reason = reason;
+            }
+
+            public Object getBatchId() {
+                return batchId;
+            }
+
+            public void setBatchId(Object batchId) {
+                this.batchId = batchId;
+            }
+
+            public String getCreateTime() {
+                return createTime;
+            }
+
+            public void setCreateTime(String createTime) {
+                this.createTime = createTime;
+            }
+
+            public Object getStartTime() {
+                return startTime;
+            }
+
+            public void setStartTime(Object startTime) {
+                this.startTime = startTime;
+            }
+
+            public Object getEndTime() {
+                return endTime;
+            }
+
+            public void setEndTime(Object endTime) {
+                this.endTime = endTime;
+            }
+        }
+    }
+}

app/src/main/java/com/dayu/bigfish/eventbus/RefreshTabNum.java

+package com.dayu.bigfish.eventbus;
+
+/**
+ * Created by yu on 2017/10/11.
+ */
+
+public class RefreshTabNum {
+    private int tabNum;
+
+    public RefreshTabNum(int tabNum) {
+        this.tabNum = tabNum;
+    }
+    public int getTabNum() {
+        return tabNum;
+    }
+
+    public void setTabNum(int tabNum) {
+        this.tabNum = tabNum;
+    }
+}

app/src/main/java/com/dayu/bigfish/fragment/HomeEndTabFragment.java

@@ -46,7 +46,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
     Unbinder unbinder;
     @BindView(R.id.refresh)
     com.cjj.MaterialRefreshLayout refresh;
-   private List<OrderFinishBean.DataBeanX.DataBean> finishList;
+    private List<OrderFinishBean.DataBeanX.DataBean> finishList;
     private boolean hasNextPage = false;
     private CustomProgressDialog dialog;
     private TipsHelper mTipsHelper;
@@ -56,12 +56,15 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
     private int userId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
     private boolean isPrepared;
     private int orderId;
+    private String token;
 
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
         View rootView = inflater.inflate(R.layout.fragment_tab_end, container, false);
         unbinder = ButterKnife.bind(this, rootView);
         dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
         mTipsHelper = createTipsHelper(tabEndList);
+        token = GetUserInfo.getToken(getContext());
         dialog.show();
         initRefresh();
         isPrepared = true;
@@ -71,11 +74,11 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
     }
 
     public void initView() {
-        initData();
+        //initData();
     }
     @Override
     protected void initData() {
-        homeEndTabPresenter.getFinishOrder(5, 1, userId, 10, siteId);
+        homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
     }
 
 
@@ -120,7 +123,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
             public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
                 //  page = 1;
                 //  initData(2, page, userId,10,siteId);
-                homeEndTabPresenter.getFinishOrder(5, 1, userId, 10, siteId);
+                homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
                 refresh.finishRefresh();
             }
 
@@ -160,7 +163,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
     public void error(String msg) {
         dialog.dismiss();
         mTipsHelper.showError(true, msg, v -> {
-            homeEndTabPresenter.getFinishOrder(5, 1, userId, 10, siteId);
+            homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
             dialog.show();
         });
         ToastUtils.showShortToast(msg);
@@ -170,6 +173,6 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
     @Override
     public void onResume() {
         super.onResume();
-        homeEndTabPresenter.getFinishOrder(5, 1, userId, 10, siteId);
+        homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
     }
 }

app/src/main/java/com/dayu/bigfish/fragment/HomeOneTabFragment.java

@@ -20,6 +20,8 @@ import com.dayu.bigfish.adapter.HomeOneTabAdapter;
 import com.dayu.bigfish.application.MyApplication;
 import com.dayu.bigfish.base.BaseFragment;
 import com.dayu.bigfish.bean.HomeOneTabBean;
+import com.dayu.bigfish.eventbus.RefreshTabNum;
+import com.dayu.bigfish.eventbus.UpdataTime;
 import com.dayu.bigfish.fragment.order.OrderDatailsFragment;
 import com.dayu.bigfish.moudle.reservation.ReservationPresenter;
 import com.dayu.bigfish.moudle.reservation.ReservationView;
@@ -32,6 +34,8 @@ import com.google.gson.Gson;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.List;
 
 import butterknife.BindView;
@@ -60,11 +64,16 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
     // 标志位，标志已经初始化完成。
     private boolean isPrepared;
     private TipsHelper mTipsHelper;
+    private String token;
+    private int orderId;
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
         View rootView = inflater.inflate(R.layout.fragment_tab_one, container, false);
         unbinder = ButterKnife.bind(this, rootView);
+        token = GetUserInfo.getToken(getContext());
         dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
         dialog.show();
         mTipsHelper = createTipsHelper(tabOneList);
@@ -80,7 +89,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
 
     public void initListener() {
         tabOneList.setOnItemClickListener((parent, view, position, id) -> {
-            int orderId = oneTablist.get(position).getId();
+            orderId = oneTablist.get(position).getId();
             Intent intent = new Intent(getContext(), OrderDetailsActivity.class);
             intent.putExtra("orderId", orderId + "");
             startActivity(intent);
@@ -90,13 +99,13 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
 
     @Override
     public void initView() {
-        initData();
+       // initData();
        // initListener();
     }
 
     @Override
     public void initData() {
-        presenter.getData(2, 1, userId, 10, siteId);
+        presenter.getData(2, 1, userId, 10, siteId,token);
 
     }
 
@@ -132,7 +141,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
             @Override
             public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
                 page = 1;
-                presenter.getData(2, page, userId, 10, siteId);
+                presenter.getData(2, page, userId, 10, siteId,token);
                 refresh.finishRefresh();
             }
 
@@ -176,7 +185,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
     public void getDataFail(String data) {
         dialog.dismiss();
         mTipsHelper.showError(true, data, v -> {
-            presenter.getData(2, page, userId, 10, siteId);
+            presenter.getData(2, page, userId, 10, siteId,token);
             dialog.show();
         });
         ToastUtils.showShortToast(data);
@@ -185,7 +194,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
     @Override
     public void onResume() {
         super.onResume();
-        presenter.getData(2, page, userId, 10, siteId);
+        presenter.getData(2, page, userId, 10, siteId,token);
     }
 }
 

app/src/main/java/com/dayu/bigfish/fragment/HomeThreeTabFragment.java

@@ -61,14 +61,14 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
     // 标志位，标志已经初始化完成。
     private boolean isPrepared;
     private TipsHelper mTipsHelper;
-
-
-
+    private String token;
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
         View rootView = inflater.inflate(R.layout.fragment_tab_three, container, false);
         unbinder = ButterKnife.bind(this, rootView);
+        token = GetUserInfo.getToken(getContext());
         dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
         mTipsHelper = createTipsHelper(tabThreeList);
         dialog.show();
@@ -94,13 +94,13 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
 
     @Override
     public void initView() {
-        initData();
+      //  initData();
         //initListener();
     }
 
     @Override
     public void initData() {
-        presenter.getErrorOrder(userId,siteId);
+        presenter.getErrorOrder(userId,siteId,token);
     }
 
     @Override
@@ -133,7 +133,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
             //下拉刷新
             @Override
             public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
-                presenter.getErrorOrder(userId,siteId);
+                presenter.getErrorOrder(userId,siteId,token);
                 refresh.finishRefresh();
             }
 
@@ -165,7 +165,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
     @Override
     public void onResume() {
         super.onResume();
-        presenter.getErrorOrder(userId,siteId);
+        presenter.getErrorOrder(userId,siteId,token);
     }
 
     @Override
@@ -195,7 +195,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
     public void error(String msg) {
         dialog.dismiss();
         mTipsHelper.showError(true, msg, v -> {
-            presenter.getErrorOrder(userId,siteId);
+            presenter.getErrorOrder(userId,siteId,token);
             dialog.show();
         });
         ToastUtils.showShortToast(msg);

app/src/main/java/com/dayu/bigfish/fragment/HomeTwoTabFragment.java

@@ -71,11 +71,14 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
     private MyGreenDao ss;//数据库
     private TipsHelper mTipsHelper;
     private int orderId;
+    private  String token;
 
 
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
         View rootView = inflater.inflate(R.layout.fragment_tab_two, container, false);
         unbinder = ButterKnife.bind(this, rootView);
+        token = GetUserInfo.getToken(getContext());
         dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
         mTipsHelper = createTipsHelper(tabTwoList);
         dialog.show();
@@ -88,7 +91,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
     }
 
     public void initView() {
-        initData();
+       // initData();
        // initListener();
     }
 
@@ -103,7 +106,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
 
     @Override
     protected void initData() {
-        presenter.getData(110, page, userId, 10, siteId);
+        presenter.getData(110, page, userId, 10, siteId,token);
     }
 
     @Override
@@ -131,7 +134,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
             @Override
             public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
                 page = 1;
-                presenter.getData(110, page, userId, 10, siteId);
+                presenter.getData(110, page, userId, 10, siteId,token);
                 refresh.finishRefresh();
             }
 
@@ -160,7 +163,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
             dialog.dismiss();
         } else {
             mTipsHelper.hideEmpty();
-            homeTwoTabAdapter = new HomeTwoTabAdapter(getContext(), list);
+            homeTwoTabAdapter = new HomeTwoTabAdapter(getContext(), list,token);
             tabTwoList.setAdapter(homeTwoTabAdapter);
             homeTwoTabAdapter.notifyDataSetChanged();
             dialog.dismiss();
@@ -200,7 +203,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
     public void getDataFail(String s) {
         dialog.dismiss();
         mTipsHelper.showError(true, s, v -> {
-            presenter.getData(110, page, userId, 10, siteId);
+            presenter.getData(110, page, userId, 10, siteId,token);
             dialog.show();
         });
         ToastUtils.showShortToast(s);
@@ -209,7 +212,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
     @Override
     public void onResume() {
         super.onResume();
-        presenter.getData(110, page, userId, 10, siteId);
+        presenter.getData(110, page, userId, 10, siteId,token);
 
     }
     /**

app/src/main/java/com/dayu/bigfish/fragment/order/OrderDatailsFragment.java

@@ -14,6 +14,9 @@ import android.widget.TextView;
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.bean.OrderDetailsBean;
+import com.dayu.bigfish.utils.GetUserInfo;
+import com.dayu.bigfish.utils.ToastUtils;
+import com.dayu.bigfish.views.CustomProgressDialog;
 import com.google.gson.Gson;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
@@ -123,7 +126,7 @@ public class OrderDatailsFragment extends Fragment {
     @BindView(R.id.no_charge)
     RelativeLayout noCharge;
     private int orderId;
-    public OrderDetailsBean.DataBean dataBean;
+    private OrderDetailsBean.DataBean dataBean;
     private int orderStatu;
     private int customerType;
     private int repairType;
@@ -133,45 +136,50 @@ public class OrderDatailsFragment extends Fragment {
     private String servicePrice;
     private String doorPrice;
     private String totalPrice;
-
+    private CustomProgressDialog dialog;
+    private String token;
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
         View layout = inflater.inflate(R.layout.fragment_order_datails, container, false);
+        token = GetUserInfo.getToken(getContext());
         orderId = getArguments().getInt("orderId");
-        System.out.println("工单详情页！！！");
-        initData(orderId);
         unbinder = ButterKnife.bind(this, layout);
+        System.out.println("工单详情页！！！");
+        dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
+        initData(orderId,token);
         return layout;
-
     }
-
-    private void initData(int orderId) {
+    private void initData(int orderId,String token) {
         System.out.println("工单详情的id为---->" + orderId);
+        dialog.show();
         //"http://47.94.101.239:7200/orders/" + orderId + "/detail"
-        OkGo.get(Constants.BASE_URL+"api-order"+"orders/" + orderId + "/detail")
+        OkGo.get(Constants.ORDER_DETAILS+ orderId + Constants.ORDER_TEMP)
                 .tag(this)
+                .headers("token",token)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
                         System.out.println("查询工单信息返回的数据--->" + s);
                         Gson gson = new Gson();
                         OrderDetailsBean orderDetailsBean = gson.fromJson(s, OrderDetailsBean.class);
+                        if (orderDetailsBean.getCode() == 0){
                         dataBean = orderDetailsBean.getData();
                         initDataView(dataBean);
+                        }
+                        else{
+                            ToastUtils.showShortToast("数据获取失败");
+                        }
                     }
 
                     @Override
                     public void onError(Call call, Response response, Exception e) {
-                        // System.out.println("");
-                        System.out.println();
+                      ToastUtils.showShortToast("网络或服务器异常");
                     }
                 });
     }
 
     public void initDataView(OrderDetailsBean.DataBean dataBean) {
-
         // orderNum 工单编号
         textOneOne.setText(dataBean.getOrderNum());
         // status  工单状态 1未接单2未预约3已预约4进行中5已完成6已取消7订单关闭
@@ -299,6 +307,7 @@ public class OrderDatailsFragment extends Fragment {
             noCharge.setVisibility(View.GONE);
             isCharge.setVisibility(View.VISIBLE);
         }*/
+        dialog.dismiss();
     }
 
     @Override

app/src/main/java/com/dayu/bigfish/fragment/order/OrderDatailsServeFragment.java

@@ -12,6 +12,7 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.adapter.ServeDatailsAdapter;
 import com.dayu.bigfish.base.BaseFragment;
@@ -21,6 +22,7 @@ import com.dayu.bigfish.moudle.orderDatailsServe.BaseHolder;
 import com.dayu.bigfish.moudle.orderDatailsServe.OrderDatailsServePresenter;
 import com.dayu.bigfish.moudle.orderDatailsServe.OrderDatailsServeView;
 import com.dayu.bigfish.tip.TipsHelper;
+import com.dayu.bigfish.utils.GetUserInfo;
 import com.dayu.bigfish.utils.ToastUtils;
 import com.dayu.bigfish.views.CustomProgressDialog;
 import com.google.gson.Gson;
@@ -52,12 +54,14 @@ public class OrderDatailsServeFragment extends Fragment {
     private CustomProgressDialog dialog;*/
    private List<ServeDetailsBean.DataBean.RecordBean> recordBeen;
     private ServeDatailsAdapter serveDatailsAdapter;
+    private String token;
 
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View layout = inflater.inflate(R.layout.fragment_order_serve, container, false);
         orderId = getArguments().getInt("orderId");
+        token = GetUserInfo.getToken(getContext());
         unbinder = ButterKnife.bind(this, layout);
         //  dialog=new CustomProgressDialog(getContext(), R.style.CustomDialog);
         // dialog.show();
@@ -65,13 +69,14 @@ public class OrderDatailsServeFragment extends Fragment {
 //        initRefresh();
         // lazyLoad();
         //  initListener();
-        initData(orderId);
+        initData(orderId,token);
         return layout;
     }
-    public void initData(int orderId){
+    public void initData(int orderId,String token){
         System.out.println("工单详情的id为---->" + orderId);
-        OkGo.get("http://47.94.101.239:7200/orders/" + orderId + "/detail")
+        OkGo.get(Constants.ORDER_DETAILS+ orderId + Constants.ORDER_TEMP)
                 .tag(this)
+                .headers("token",token)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {

app/src/main/java/com/dayu/bigfish/fragment/order/message/BigFishMessageFragment.java

+package com.dayu.bigfish.fragment.order.message;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.dayu.bigfish.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+/**
+ * 大鱼官方通知
+ * on 2017/10/11.
+ */
+
+public class BigFishMessageFragment extends Fragment {
+    @BindView(R.id.big_image_empty)
+    ImageView bigImageEmpty;
+    @BindView(R.id.big_textView_empty)
+    TextView bigTextViewEmpty;
+    @BindView(R.id.big_message_view)
+    RelativeLayout bigMessageView;
+    Unbinder unbinder;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View layout = inflater.inflate(R.layout.fragment_message_bigfish, container, false);
+        unbinder = ButterKnife.bind(this, layout);
+        return layout;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+}

app/src/main/java/com/dayu/bigfish/fragment/order/message/SystemMessageFragment.java

+package com.dayu.bigfish.fragment.order.message;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.dayu.bigfish.Constants;
+import com.dayu.bigfish.R;
+import com.dayu.bigfish.adapter.SystemMessageAdapter;
+import com.dayu.bigfish.bean.MessageBean;
+import com.dayu.bigfish.utils.GetUserInfo;
+import com.dayu.bigfish.utils.ToastUtils;
+import com.google.gson.Gson;
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.callback.StringCallback;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import okhttp3.Call;
+import okhttp3.Response;
+
+/**
+ * 系统通知
+ * on 2017/10/11.
+ */
+
+public class SystemMessageFragment extends Fragment {
+    /*@BindView(R.id.message_image_empty)
+    ImageView messageImageEmpty;
+    @BindView(R.id.message_textView_empty)
+    TextView messageTextViewEmpty;
+    @BindView(R.id.message_view)
+    RelativeLayout messageView;*/
+    @BindView(R.id.message_system_listview)
+    ListView messageSystemListview;
+    private String token;
+    private SystemMessageAdapter systemAdapter;
+    private List<MessageBean.DataBeanX.DataBean> myDataList;
+    private  String hxUserId;
+    Unbinder unbinder;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View layout = inflater.inflate(R.layout.fragment_message_system, container, false);
+        unbinder = ButterKnife.bind(this, layout);
+        token = GetUserInfo.getToken(getContext());
+        hxUserId = GetUserInfo.getHxUserId(getContext());
+        initData(token,hxUserId);
+
+        return layout;
+    }
+
+    /**
+     * 初始化环信数据
+     */
+    private void initData(String token,String hxUserId) {
+        OkGo.get(Constants.MESSAGE_HX)
+                .tag(this)
+                .headers("token", token)
+                .params("hxAccount",hxUserId)
+                //功能：1、消息盒子 2、待接单提醒
+                .params("functionType",1)
+                //分类：1、系统消息 2、后台推送
+                .params("category",1)
+                .params("page",1)
+                .params("pageSize",10)
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        Gson gson = new Gson();
+                        MessageBean messageBean = gson.fromJson(s, MessageBean.class);
+                        if (messageBean.getCode() == 0) {
+                            myDataList = messageBean.getData().getData();
+                            loadPager();
+                        }else{
+                            ToastUtils.showShortToast("消息列表获取失败");
+                        }
+
+                    }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        super.onError(call, response, e);
+                        ToastUtils.showShortToast("服务器异常,消息列表获取失败");
+                    }
+                });
+    }
+
+    private void loadPager() {
+        systemAdapter = new SystemMessageAdapter(myDataList, getContext());
+        messageSystemListview.setAdapter(systemAdapter);
+        systemAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+
+}

app/src/main/java/com/dayu/bigfish/moudle/beltservice/BeltServicePresenter.java

@@ -24,9 +24,10 @@ public class BeltServicePresenter extends BasePresenter<BeltServiceView> {
     public BeltServicePresenter(BeltServiceView reltServiceView) {
         mBeltServiceView = reltServiceView;
     }
-    public void getData(int state,int page,int engineerId,int pageSize,int siteId){
+    public void getData(int state,int page,int engineerId,int pageSize,int siteId,String token){
         OkGo.get(Constants.ORDER_URL)
                 .tag(this)
+                .headers("token",token)
                 .params("state", state)
                 .params("page", page)
                 .params("siteId",siteId)
@@ -36,6 +37,7 @@ public class BeltServicePresenter extends BasePresenter<BeltServiceView> {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
                         Gson gson = new Gson();
+                        System.out.println("待服务列表数据-->"+s);
                         HomeTwoTabBean twoTab = gson.fromJson(s, HomeTwoTabBean.class);
                         if (twoTab.getCode()==0){
                             mBeltServiceView.getDataSuc(twoTab);

app/src/main/java/com/dayu/bigfish/moudle/check/OrderFinishActivityPresenter.java

@@ -41,9 +41,10 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
         this.orderFinishActivityView = orderFinishActivityView;
     }
 
-    public void getInitData(int orderId) {
+    public void getInitData(int orderId,String token) {
         OkGo.get(Constants.SELECT_ORDER + orderId)
                 .tag(this)
+                .headers("token",token)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
@@ -66,7 +67,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
     public void postSubmit(int orderId, String editText, int engineerId,
                            int isPay,
                            String doorPrice, String doorPriceComment,
-                           String servicePrice, String materialCost, String otherPrice) {
+                           String servicePrice, String materialCost, String otherPrice,String token) {
 
         HashMap<String, Object> params = new HashMap<>();
         //服务记录
@@ -99,6 +100,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
         OkGo.post(Constants.ORDER_FINISH)
                 .tag(this)
                 .upJson(jsonObject.toString())
+                .headers("token",token)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
@@ -123,7 +125,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
     public void postPhotoSubmit(List<String> imageUrl, int orderId, String editText, int engineerId,
                                 int isPay,
                                 String doorPrice, String doorPriceComment,
-                                String servicePrice, String materialCost, String otherPrice) {
+                                String servicePrice, String materialCost, String otherPrice,String token) {
 
         HashMap<String, Object> params = new HashMap<>();
         //服务记录
@@ -175,6 +177,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
         OkGo.post(Constants.ORDER_FINISH)
                 .tag(this)
                 .upJson(jsonObject.toString())
+                .headers("token",token)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
@@ -201,7 +204,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
     /**
      * 上传照片至服务器
      */
-    public void upPhoto(List<String> imageUrl, int orderId) {
+    public void upPhoto(List<String> imageUrl, int orderId,String token) {
         System.out.println("该订单id为:" + orderId);
         // http://47.94.101.239:3111/file/uploadOne?
         // targetPath=mobile/business/checkApply/
@@ -214,6 +217,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
         //http://47.94.101.239:3111/file/uploadOne?targetPath=mobile/business/checkApply/{ticketId}
         OkGo.post(Constants.UP_PHOTO)
                 .tag(this)
+                .headers("token",token)
                 .params("targetPath", "mobile/business/checkApply")
                 .params("ticketId", orderId)
                 .addFileParams("fileUpload", files)

app/src/main/java/com/dayu/bigfish/moudle/error/ErrorPresenter.java

@@ -22,15 +22,17 @@ public class ErrorPresenter extends BasePresenter<ErrorView> {
     public ErrorPresenter(ErrorView mErrorView) {
         this.mErrorView = mErrorView;
     }
-    public void getErrorOrder(int userId,int userSite){
+    public void getErrorOrder(int userId,int userSite,String token){
         OkGo.get(Constants.ERROR_ORDER)
                 .tag(this)
+                .headers("token",token)
                 .params("engineerId",userId)
                 .params("siteId",userSite)
                 .execute(new StringCallback() {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
                         Gson gson = new Gson();
+                        System.out.println("异常单列表数据-->"+s);
                     ErrorOrderBean errorOrderBean = gson.fromJson(s, ErrorOrderBean.class);
                         if (errorOrderBean.getCode()==0){
                             mErrorView.getSuccess(errorOrderBean);

app/src/main/java/com/dayu/bigfish/moudle/finish/HomeEndTabPresenter.java

@@ -19,9 +19,10 @@ public class HomeEndTabPresenter extends BasePresenter<HomeEndTabView> {
     public HomeEndTabPresenter(HomeEndTabView homeEndTabView) {
         this.homeEndTabView =  homeEndTabView;
     }
-    public void getFinishOrder(int state,int page,int engineerId,int pageSize,int siteId){
+    public void getFinishOrder(int state,int page,int engineerId,int pageSize,int siteId,String token){
         OkGo.get(Constants.ORDER_URL)
                 .tag(this)
+                .headers("token",token)
                 .params("state", state)
                 .params("page", page)
                 .params("siteId",siteId)
@@ -31,6 +32,7 @@ public class HomeEndTabPresenter extends BasePresenter<HomeEndTabView> {
                     @Override
                     public void onSuccess(String s, Call call, Response response) {
                         Gson gson = new Gson();
+                        System.out.println("已取消列表数据-->"+s);
                         OrderFinishBean orderFinishBean = gson.fromJson(s, OrderFinishBean.class);
                         if (orderFinishBean.getCode()==0){
                             homeEndTabView.finishSuccess(orderFinishBean);

app/src/main/java/com/dayu/bigfish/moudle/home/HomePresenter.java

 package com.dayu.bigfish.moudle.home;
 
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
 import com.dayu.bigfish.Constants;
 import com.dayu.bigfish.base.BasePresenter;
+import com.dayu.bigfish.bean.BaseStringBean;
+import com.dayu.bigfish.bean.VersionBase;
 import com.dayu.bigfish.utils.LogUtils;
+import com.dayu.bigfish.utils.ToastUtils;
+import com.google.gson.Gson;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
 
@@ -22,8 +29,70 @@ public class HomePresenter extends BasePresenter<HomeView> {
         mHomeView = homeView;
     }
 
-    public void get() {
+    public void get(String token,String version) {
+//联网检测当前是否为最新版本
+        OkGo.get(Constants.UPDATA_VERSION + "dayushifua_dayu")
+                .tag(this)
+                .headers("token",token)
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        Gson gson = new Gson();
+                        BaseStringBean baseStringBean = gson.fromJson(s, BaseStringBean.class);
+                        if (baseStringBean.getCode() == 0) {
+                            if (!(version.equals(baseStringBean.getData()))) {
+                                ToastUtils.showShortToast("需要更新");
+                                mHomeView.getDateSuccess(baseStringBean.getData());
+                            } else {
+                                //   commitVersionInfo(userId, getIMEI(MainActivity.this), getPackageNum());
+
+                                mHomeView.getDateFailed("当前是最新版本,无需更新");
+
+                            }
+                        } else {
+
+                            mHomeView.Error("检测更新版本失败");
+                        }
+                    }
+
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                        mHomeView.Error("网络或服务器异常,检测版本失败");
+                    }
+                });
+    }
+    /**
+     * 获取新版本的信息
+     */
+    public void upgradeVersion(String versionCode,String token) {
+        //?appId=dayushifua_dayu&versionCode=1.10.1
+        OkGo.get(Constants.UPGRADE_VERSION)
+                .tag(this)
+                .headers("token", token)
+                .params("appId", "dayushifua_dayu")
+                .params("versionCode", versionCode)
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        Gson gson = new Gson();
+                        System.out.println("新版本返回数据"+s);
+                        VersionBase versionBase = gson.fromJson(s, VersionBase.class);
+                        if (versionBase.getCode() == 0) {
+                            //弹窗
+                            mHomeView.getNewVersionSuccess(versionBase.getData().getUpgradePrompt(), versionBase.getData().getDownloadUrl());
+
+                        } else {
 
+                            mHomeView.getNewVersionFailed("获取新版本信息失败");
+                            //SPUtils.get(MainActivity.this,"big_fish")
+                        }
+                    }
 
+                    @Override
+                    public void onError(Call call, Response response, Exception e) {
+                       mHomeView.Error("网络或服务器异常,获取新版本APK失败");
+                    }
+                });
     }
+
 }
\ No newline at end of file

app/src/main/java/com/dayu/bigfish/moudle/home/HomeView.java

@@ -7,8 +7,13 @@ package com.dayu.bigfish.moudle.home;
 
 public interface HomeView{
     //获取数据成功
-    void getDateSuccess();
+    void getDateSuccess(String msg);
     //获取数据失败
     void getDateFailed(String msg);
-
+    //获取新版本信息成功
+    void getNewVersionSuccess(String msg,String downloadUrl);
+    //获取新版本信息失败
+    void getNewVersionFailed(String msg);
+    //网络异常
+    void Error(String msg);
 }

app/src/main/java/com/dayu/bigfish/moudle/idea/IdeaActivityPresenter.java

@@ -28,7 +28,7 @@ public class IdeaActivityPresenter extends BasePresenter<IdeaActivityView> {
     public IdeaActivityPresenter(IdeaActivityView ideaActivityView) {
         this.ideaActivityView  = ideaActivityView;
     }
-    public void getData(String comment,String userName,String mobile){
+    public void getData(String comment,String userName,String mobile,String token){
         HashMap<String, Object> params = new HashMap<>();
         //建议内容
         params.put("comment",comment);
@@ -49,6 +49,7 @@ public class IdeaActivityPresenter extends BasePresenter<IdeaActivityView> {
      OkGo.post(Constants.SET_IDEA_COMMIT)
             .tag(this)
             .upJson(jsonObject.toString())
+             .headers("token",token)
              .execute(new StringCallback() {
                  @Override
                  public void onSuccess(String s, Call call, Response response) {