Skip to content

android / dayu

Go to a project
Commit fc87f381 by yu
Options

2017/10/15 第四次提交 

     系统消息完善,大鱼通知还未完全解决
parent 91cdf6f6
Expand all
Inline Side-by-side
Showing with 500 additions and 71 deletions
app/src/main/AndroidManifest.xml
......@@ -26,16 +26,14 @@
<application
android:name=".application.MyApplication"
android:allowBackup="true"
android:icon="@mipmap/logo"
android:icon="@mipmap/wechatimg"
android:label="@string/tv_dayu"
android:roundIcon="@mipmap/logo"
android:roundIcon="@mipmap/wechatimg"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity"
>
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
......@@ -74,7 +72,6 @@
</receiver>
<activity android:name=".activity.LoginActivity"/>
<activity android:name=".activity.ReceivingActivity"/>
<activity android:name=".activity.WorkOrderActivity"/>
<activity android:name=".activity.PersonalCenterActivity"/>
<activity android:name=".activity.SettingActivity"/>
<activity android:name=".activity.SubscribeTimeActivity"/>
......
app/src/main/java/com/dayu/bigfish/Constants.java
......@@ -19,7 +19,7 @@ public class Constants {
/**************************正式根环境路径*******************************/
public static final String BASE_URL = "https://mobile.dayu.ai";
//登录的URL
public static final String LOGIN_URL = BASE_URL+"/check";
// public static final String LOGIN_URL = BASE_URL+"/check";
/**************************测试环境*******************************/
/*//登录的URL
public static final String LOGIN_URL = "http://47.94.101.239:3112/check";
......@@ -68,7 +68,7 @@ public class Constants {
public final static String MESSAGE_HX = BASE_MESSAGE+"hXMessage";
*/
/***********************测试环境2.0配置**********************************/
/* //登录的URL
//登录的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/";
......@@ -109,10 +109,11 @@ public class Constants {
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
/* //登录时发送验证码的URL
public static final String REGISTER_URL = BASE_URL + "/api-user/" + "account/loginSms/";
//根据工单状态获取分页工单信息的路径
public static final String ORDER_URL = BASE_URL + "/api-order/" + "orders/findSimpleOrderVOByPage";
......@@ -152,7 +153,7 @@ public class Constants {
//获取首页tab状态的数量
public final static String TAB_NUM = BASE_URL + "/api-order/" + "orders/";
//环信消息
public final static String MESSAGE_HX = BASE_URL+"/api-message/"+"hXMessage";
public final static String MESSAGE_HX = BASE_URL+"/api-message/"+"hXMessage";*/
/***********************其他配置**********************************/
......
app/src/main/java/com/dayu/bigfish/MainActivity.java
......@@ -31,6 +31,7 @@ import com.dayu.bigfish.bean.InformBean;
import com.dayu.bigfish.bean.MessageTell;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.bean.VersionBase;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.managers.UserManager;
import com.dayu.bigfish.utils.LogUtils;
import com.dayu.bigfish.utils.ToastUtils;
......@@ -44,6 +45,9 @@ import com.lidroid.xutils.http.ResponseInfo;
import com.lidroid.xutils.http.callback.RequestCallBack;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback;
import org.greenrobot.eventbus.EventBus;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
......@@ -109,6 +113,7 @@ public class MainActivity extends AppCompatActivity {
//收到消息
for (EMMessage list : messages) {
EventBus.getDefault().post(new RefreshTabNum(1));
System.out.println("收到消息" + list.getBody());
System.out.println("----->----->" + list.ext());
Intent intent = new Intent(MainActivity.this, MessageActivity.class);
......
app/src/main/java/com/dayu/bigfish/activity/HomeActivity.java
......@@ -30,6 +30,7 @@ import com.dayu.bigfish.adapter.FragmentHomeAdapter;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.TabBean;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.eventbus.TabOneRefresh;
import com.dayu.bigfish.fragment.HomeEndTabFragment;
import com.dayu.bigfish.fragment.HomeOneTabFragment;
import com.dayu.bigfish.fragment.HomeThreeTabFragment;
......@@ -98,7 +99,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
private TextView textView_number;
private int userId;
private String imageUrl;//图片的Url
// private LoginBean loginBean = new LoginBean();
//private LoginBean loginBean = new LoginBean();
private TabBean mTabBean;
private CustomProgressDialog dialog;
private Boolean isTrue = false;
......@@ -276,7 +277,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
// tabBean.getData().
mTabBean = tabBean;
setTabNum(mTabBean);
dialog.dismiss();
} else {
ToastUtils.showShortToast("首页状态获取失败");
dialog.dismiss();
......@@ -304,6 +305,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon(tabNum.getData().getPendingservice() + "", "待服务")));
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon(tabNum.getData().getError() + "", "异常单")));
homeTabLayout.addTab(homeTabLayout.newTab().setCustomView(tab_icon(tabNum.getData().getCanceled() + "", "已取消")));
dialog.dismiss();
}
/**
......@@ -365,9 +367,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
mHomePresenter.get(token, getPackageNum());
initView();
initData();
}
@Override
public void onDestroy() {
super.onDestroy();
......@@ -409,6 +409,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
/* viewPager.setCurrentItem(1);
homeTabLayout.getTabAt(1).select();*/
initNetWorkTabNum(userId, token);
EventBus.getDefault().post(new TabOneRefresh(0));
}
}
......
app/src/main/java/com/dayu/bigfish/activity/LoginActivity.java
......@@ -45,7 +45,6 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import okhttp3.Call;
import okhttp3.Response;
import static com.umeng.analytics.pro.x.O;
import static java.lang.Integer.parseInt;
......@@ -152,6 +151,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
@Override
public void onError(int code, String message) {
System.out.println("环信----->登录聊天服务器失败！");
System.out.println("环信失败信息:---->"+message);
}
});
......
app/src/main/java/com/dayu/bigfish/activity/MessageActivity.java
......@@ -14,6 +14,7 @@ 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 com.dayu.bigfish.views.CustomProgressDialog;
import java.util.ArrayList;
import java.util.List;
......@@ -54,8 +55,8 @@ public class MessageActivity extends FragmentActivity {
orderId = Integer.parseInt(orderValue);
System.out.println("此订单的Id为:----->"+orderId);*/
list = new ArrayList<>();
list.add(new BigFishMessageFragment());
list.add(new SystemMessageFragment());
list.add(new BigFishMessageFragment());
fragmentAdapter = new FragmentOrderAdapter(getSupportFragmentManager(),list);
messageViewPager.setAdapter(fragmentAdapter);
messageTablayout.setupWithViewPager(messageViewPager);
......
app/src/main/java/com/dayu/bigfish/activity/PersonalCenterActivity.java
......@@ -218,12 +218,11 @@ public class PersonalCenterActivity extends BaseActivity<PersonalCenterView, Per
@Override
public void success(PersonalCenterBean personalCenterBean) {
this.data = personalCenterBean.getData();
ToastUtils.showShortToast("请求成功");
ToastUtils.showShortToast("刷新成功");
System.out.println("个人中心页面请求结果:" + personalCenterBean.getMsg());
fillData();
dialog.dismiss();
}
@Override
public void error(String msg) {
dialog.dismiss();
......
app/src/main/java/com/dayu/bigfish/activity/SettingActivity.java
......@@ -25,6 +25,7 @@ import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import com.dayu.bigfish.views.SwitchImage;
import com.hyphenate.chat.EMClient;
import org.w3c.dom.Text;
......@@ -164,6 +165,7 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
case R.id.exit_button:
//清除保存在sp和代码中的账户信息
UserManager.getInstance().clearUserInfo(this);
EMClient.getInstance().logout(true);
//打开登录页面
Intent Intents = new Intent(this, LoginActivity.class);
Intents.setFlags(
......
app/src/main/java/com/dayu/bigfish/adapter/BigFishMessageAdapter.java 0 → 100644
package com.dayu.bigfish.adapter;
import android.content.Context;
import android.content.res.AssetManager;
import android.graphics.Typeface;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.MessageBean;
import com.dayu.bigfish.bean.NewMessageBean;
import com.dayu.bigfish.utils.DateUtils;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* Created by yu on 2017/10/14.
*/
public class BigFishMessageAdapter extends BaseAdapter {
private List<NewMessageBean.DataBeanX.DataBean> bigFishList;
private DateUtils dateUtils = new DateUtils();
private Context context;
private String dataMD;
private String dataTime;
public BigFishMessageAdapter(List<NewMessageBean.DataBeanX.DataBean> bigFishList, Context context) {
this.bigFishList = bigFishList;
this.context = context;
}
@Override
public int getCount() {
return bigFishList.size();
}
@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.big_message_adapter, null);
viewHolder = new ViewHolder(view, context);
view.setTag(viewHolder);
} else {
view = convertView;
viewHolder = (ViewHolder) view.getTag();
}
initData(position, viewHolder);
return view;
}
private void initData(int position, ViewHolder viewHolder) {
try {
dataMD = dateUtils.stringDateToDate(bigFishList.get(position).getCreateTime());
viewHolder.bigMessageTime.setText(dataMD);
dataTime = dateUtils.stringTimeToDate(bigFishList.get(position).getCreateTime());
viewHolder.bigMessageDate.setText(dataTime);
} catch (Exception e) {
e.printStackTrace();
}
viewHolder.bigMessageTextContent.setText(bigFishList.get(position).getContent());
}
static class ViewHolder {
@BindView(R.id.big_line_textView)
TextView bigLineTextView;
@BindView(R.id.big_message_time)
TextView bigMessageTime;
@BindView(R.id.big_message_date)
TextView bigMessageDate;
@BindView(R.id.big_message_text_content)
TextView bigMessageTextContent;
@BindView(R.id.big_item)
RelativeLayout bigItem;
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
bigMessageDate.setTypeface(tf);//设置字体
}
}
}
app/src/main/java/com/dayu/bigfish/adapter/SystemMessageAdapter.java
......@@ -11,6 +11,8 @@ import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.MessageBean;
import com.dayu.bigfish.bean.NewMessageBean;
import com.dayu.bigfish.utils.DateUtils;
import java.util.List;
......@@ -22,18 +24,19 @@ import butterknife.ButterKnife;
*/
public class SystemMessageAdapter extends BaseAdapter {
private List<MessageBean.DataBeanX.DataBean> dataBeenList;
private List<NewMessageBean.DataBeanX.DataBean> dataBeenList;
private DateUtils dateUtils = new DateUtils();
private Context context;
public SystemMessageAdapter(List<MessageBean.DataBeanX.DataBean> dataBeenList, Context context) {
private String dataMD;
private String dataTime;
public SystemMessageAdapter(List<NewMessageBean.DataBeanX.DataBean> dataBeenList, Context context) {
this.dataBeenList = dataBeenList;
this.context = context;
}
@Override
public int getCount() {
// dataBeenList.size()
return 3;
return dataBeenList.size();
}
@Override
......@@ -58,12 +61,20 @@ public class SystemMessageAdapter extends BaseAdapter {
view = convertView;
viewHolder = (ViewHolder) view.getTag();
}
initData();
return convertView;
initData(position, viewHolder);
return view;
}
private void initData() {
private void initData(int position, ViewHolder viewHolder) {
try {
dataMD = dateUtils.stringDateToDate(dataBeenList.get(position).getCreateTime());
viewHolder.messageTime.setText(dataMD);
dataTime =dateUtils.stringTimeToDate(dataBeenList.get(position).getCreateTime());
viewHolder.messageDate.setText(dataTime);
} catch (Exception e) {
e.printStackTrace();
}
viewHolder.messageTextContent.setText(dataBeenList.get(position).getTitle());
}
static class ViewHolder {
......@@ -82,7 +93,7 @@ public class SystemMessageAdapter extends BaseAdapter {
ButterKnife.bind(this, view);
AssetManager mgr = context.getAssets();//得到AssetManager
Typeface tf = Typeface.createFromAsset(mgr, "fonts/DIN Alternate Bold.ttf");//根据路径得到Typeface
messageTime.setTypeface(tf);//设置字体
messageDate.setTypeface(tf);//设置字体
}
}
}
app/src/main/java/com/dayu/bigfish/adapter/Test.java deleted 100755 → 0
package com.dayu.bigfish.adapter;
/**
* Created by yu on 2017/9/8.
*/
public interface Test {
void notiyfl();
}
app/src/main/java/com/dayu/bigfish/bean/MessageJsonBean.java 0 → 100644
package com.dayu.bigfish.bean;
import java.io.Serializable;
/**
* Created by yu on 2017/10/15.
*/
public class MessageJsonBean implements Serializable {
/**
* orderId : 67
*/
private int orderId;
public int getOrderId() {
return orderId;
}
public void setOrderId(int orderId) {
this.orderId = orderId;
}
}
app/src/main/java/com/dayu/bigfish/eventbus/TabOneRefresh.java 0 → 100644
package com.dayu.bigfish.eventbus;
/**
* Created by yu on 2017/10/15.
*/
public class TabOneRefresh {
private int myTab;
public TabOneRefresh(int myTab) {
this.myTab = myTab;
}
public int getMyTab() {
return myTab;
}
public void setMyTab(int myTab) {
this.myTab = myTab;
}
}
app/src/main/java/com/dayu/bigfish/fragment/HomeOneTabFragment.java
......@@ -21,6 +21,7 @@ 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.TabOneRefresh;
import com.dayu.bigfish.eventbus.UpdataTime;
import com.dayu.bigfish.fragment.order.OrderDatailsFragment;
import com.dayu.bigfish.moudle.reservation.ReservationPresenter;
......@@ -35,6 +36,8 @@ import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
......@@ -73,6 +76,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
super.onCreateView(inflater, container, savedInstanceState);
View rootView = inflater.inflate(R.layout.fragment_tab_one, container, false);
unbinder = ButterKnife.bind(this, rootView);
EventBus.getDefault().register(this);
token = GetUserInfo.getToken(getContext());
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
dialog.show();
......@@ -86,7 +90,15 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
return rootView;
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onRefreTabOne(TabOneRefresh tabOneRefresh) {
if (tabOneRefresh.getMyTab() == 0) {
//ToastUtils.showShortToast("刷新了");
/* viewPager.setCurrentItem(1);
homeTabLayout.getTabAt(1).select();*/
initData();
}
}
public void initListener() {
tabOneList.setOnItemClickListener((parent, view, position, id) -> {
orderId = oneTablist.get(position).getId();
......
app/src/main/java/com/dayu/bigfish/fragment/order/OrderDatailsFragment.java
......@@ -165,6 +165,9 @@ public class OrderDatailsFragment extends Fragment {
OrderDetailsBean orderDetailsBean = gson.fromJson(s, OrderDetailsBean.class);
if (orderDetailsBean.getCode() == 0){
dataBean = orderDetailsBean.getData();
if (dataBean==null){
return;
}
initDataView(dataBean);
}
else{
......
app/src/main/java/com/dayu/bigfish/fragment/order/OrderDatailsServeFragment.java
......@@ -83,14 +83,23 @@ public class OrderDatailsServeFragment extends Fragment {
System.out.println("查询服务信息返回的数据--->" + s);
Gson gson = new Gson();
ServeDetailsBean serveDetailsBean = gson.fromJson(s, ServeDetailsBean.class);
if (serveDetailsBean.getCode()==0){
recordBeen = serveDetailsBean.getData().getRecord();
if (recordBeen==null){
return;
}
initDataView(recordBeen);
}else{
ToastUtils.showShortToast("服务记录获取失败");
}
}
@Override
public void onError(Call call, Response response, Exception e) {
// System.out.println("");
System.out.println();
ToastUtils.showShortToast("网络或服务器异常");
}
});
}
......
app/src/main/java/com/dayu/bigfish/fragment/order/message/BigFishMessageFragment.java
package com.dayu.bigfish.fragment.order.message;
import android.content.Intent;
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.AdapterView;
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.activity.OrderDetailsActivity;
import com.dayu.bigfish.adapter.BigFishMessageAdapter;
import com.dayu.bigfish.adapter.SystemMessageAdapter;
import com.dayu.bigfish.bean.MessageBean;
import com.dayu.bigfish.bean.NewMessageBean;
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;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import okhttp3.Call;
import okhttp3.Response;
/**
* 大鱼官方通知
......@@ -22,22 +41,100 @@ import butterknife.Unbinder;
*/
public class BigFishMessageFragment extends Fragment {
Unbinder unbinder;
@BindView(R.id.message_bigfish_listview)
ListView messageBigfishListview;
@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;
private BigFishMessageAdapter bigFishAdapter;
private CustomProgressDialog dialog;
private List<NewMessageBean.DataBeanX.DataBean> bigFishDataList;
private String hxUserId;
private String token;
private int orderId;
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View layout = inflater.inflate(R.layout.fragment_message_bigfish, container, false);
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
token = GetUserInfo.getToken(getContext());
hxUserId = GetUserInfo.getHxUserId(getContext());
unbinder = ButterKnife.bind(this, layout);
initData(token, hxUserId);
initListener();
return layout;
}
private void initListener() {
messageBigfishListview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
orderId = bigFishDataList.get(position).getId();
Intent intent = new Intent(getContext(), OrderDetailsActivity.class);
intent.putExtra("orderId", orderId + "");
startActivity(intent);
}
});
}
/**
* 初始化环信数据
*/
private void initData(String token, String hxUserId) {
dialog.show();
OkGo.get(Constants.MESSAGE_HX)
.tag(this)
.headers("token", token)
.params("hxAccount", hxUserId)
//分类：1、系统消息 2、后台推送
.params("category", 2)
.params("page", 1)
.params("pageSize", 10)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
NewMessageBean messageBean = gson.fromJson(s, NewMessageBean.class);
if (messageBean.getCode() == 0) {
bigFishDataList = messageBean.getData().getData();
bigFishPager();
} else {
ToastUtils.showShortToast("消息列表获取失败");
dialog.dismiss();
}
}
@Override
public void onError(Call call, Response response, Exception e) {
super.onError(call, response, e);
ToastUtils.showShortToast("服务器异常,消息列表获取失败");
dialog.dismiss();
}
});
}
private void bigFishPager() {
if (bigFishDataList.size() == 0 || bigFishDataList == null) {
// mTipsHelper.showEmpty();
bigMessageView.setVisibility(View.VISIBLE);
messageBigfishListview.setVisibility(View.GONE);
dialog.dismiss();
} else {
messageBigfishListview.setVisibility(View.VISIBLE);
bigMessageView.setVisibility(View.GONE);
bigFishAdapter = new BigFishMessageAdapter(bigFishDataList, getContext());
messageBigfishListview.setAdapter(bigFishAdapter);
bigFishAdapter.notifyDataSetChanged();
dialog.dismiss();
}
}
@Override
public void onDestroyView() {
super.onDestroyView();
......
app/src/main/java/com/dayu/bigfish/fragment/order/message/SystemMessageFragment.java
package com.dayu.bigfish.fragment.order.message;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.RelativeLayout;
......@@ -13,11 +16,18 @@ import android.widget.TextView;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.activity.OrderDetailsActivity;
import com.dayu.bigfish.activity.ReceivingActivity;
import com.dayu.bigfish.adapter.SystemMessageAdapter;
import com.dayu.bigfish.bean.MessageBean;
import com.dayu.bigfish.bean.MessageJsonBean;
import com.dayu.bigfish.bean.NewMessageBean;
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.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback;
......@@ -29,78 +39,117 @@ import butterknife.Unbinder;
import okhttp3.Call;
import okhttp3.Response;
import static android.icu.lang.UCharacter.GraphemeClusterBreak.V;
import static android.media.CamcorderProfile.get;
import static com.dayu.bigfish.R.id.view;
import static com.umeng.analytics.pro.x.I;
/**
* 系统通知
* on 2017/10/11.
*/
public class SystemMessageFragment extends Fragment {
/*@BindView(R.id.message_image_empty)
@BindView(R.id.message_system_listview)
ListView messageSystemListview;
@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;
RelativeLayout messageView;
private String token;
private SystemMessageAdapter systemAdapter;
private List<MessageBean.DataBeanX.DataBean> myDataList;
private List<NewMessageBean.DataBeanX.DataBean> myDataList;
private String hxUserId;
private CustomProgressDialog dialog;
private int orderId;
private String stringJson;
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);
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
token = GetUserInfo.getToken(getContext());
hxUserId = GetUserInfo.getHxUserId(getContext());
initData(token,hxUserId);
initData(token, hxUserId);
initListener();
return layout;
}
private void initListener() {
messageSystemListview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
stringJson = myDataList.get(position).getCustomJson();
if (!TextUtils.isEmpty(stringJson)){
JsonObject returnData = new JsonParser().parse(stringJson).getAsJsonObject();
Gson gson = new Gson();
MessageJsonBean mess = gson.fromJson(returnData, MessageJsonBean.class);
orderId = mess.getOrderId();
Intent intent = new Intent(getContext(), OrderDetailsActivity.class);
intent.putExtra("orderId", orderId + "");
startActivity(intent);
}
}
});
}
/**
* 初始化环信数据
*/
private void initData(String token,String hxUserId) {
private void initData(String token, String hxUserId) {
dialog.show();
OkGo.get(Constants.MESSAGE_HX)
.tag(this)
.headers("token", token)
.params("hxAccount",hxUserId)
//功能：1、消息盒子 2、待接单提醒
.params("functionType",1)
.params("hxAccount", hxUserId)
//分类：1、系统消息 2、后台推送
.params("category",1)
.params("page",1)
.params("pageSize",10)
.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);
NewMessageBean messageBean = gson.fromJson(s, NewMessageBean.class);
if (messageBean.getCode() == 0) {
myDataList = messageBean.getData().getData();
loadPager();
}else{
} else {
ToastUtils.showShortToast("消息列表获取失败");
dialog.dismiss();
}
}
@Override
public void onError(Call call, Response response, Exception e) {
super.onError(call, response, e);
ToastUtils.showShortToast("服务器异常,消息列表获取失败");
dialog.dismiss();
}
});
}
private void loadPager() {
if (myDataList.size() == 0 || myDataList == null) {
// mTipsHelper.showEmpty();
messageView.setVisibility(View.VISIBLE);
messageSystemListview.setVisibility(View.GONE);
dialog.dismiss();
} else {
messageSystemListview.setVisibility(View.VISIBLE);
messageView.setVisibility(View.GONE);
systemAdapter = new SystemMessageAdapter(myDataList, getContext());
messageSystemListview.setAdapter(systemAdapter);
systemAdapter.notifyDataSetChanged();
dialog.dismiss();
}
}
@Override
......
app/src/main/java/com/dayu/bigfish/moudle/login/LoginPresenter.java
......@@ -39,7 +39,7 @@ public class LoginPresenter extends BasePresenter<LoginView> {
/**
* 发送验证码的业务逻辑
*/
public void sendRegister(String userPhone,Button btnRegisterSendCode) {
public void sendRegister(String userPhone, Button btnRegisterSendCode) {
//验证码倒计时60秒
TimeCountUtil timeCountUtil = new TimeCountUtil(this, 60000, 1000, btnRegisterSendCode);
timeCountUtil.start();
......@@ -48,12 +48,17 @@ public class LoginPresenter extends BasePresenter<LoginView> {
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, okhttp3.Response response) {
System.out.println("验证码发送:" + s);
Gson gson = new Gson();
RegisterBean registerBean = gson.fromJson(s, RegisterBean.class);
LogUtils.i(s);
System.out.println("验证码发送成功"+s);
if (registerBean.getCode() == 0) {
//回调view层发送验证成功的方法回调,并把解析后的bean类传递过去
mloginView.sendRegisterSuccess(registerBean);
} else {
mloginView.sendRegisterError("验证码发送失败");
}
}
@Override
......@@ -76,14 +81,27 @@ public class LoginPresenter extends BasePresenter<LoginView> {
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
/* Gson gson = new Gson();
LoginBean loginBean = gson.fromJson(s, LoginBean.class);
if (loginBean.getCode() == 0) {
mloginView.loginSuccess(loginBean);
}else{
mloginView.loginFailed("验证码有误或您不是工程师");
}*/
String str = s.substring(8, 9);
if (str.equals("1")) {
mloginView.loginFailed("验证码有误或您不是工程师");
return;
} else {
Gson gson = new Gson();
LoginBean loginBean = gson.fromJson(s, LoginBean.class);
if (loginBean.getCode() == 0) {
mloginView.loginSuccess(loginBean);
}
}
}
@Override
public void onError(Call call, Response response, Exception e) {
mloginView.loginFailed("请检查网络是否连接");
......@@ -92,7 +110,4 @@ public class LoginPresenter extends BasePresenter<LoginView> {
}
}
app/src/main/res/layout/activity_setting.xml
......@@ -163,7 +163,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="33.7dp"
android:gravity="end"
android:text="400-950-6677"
android:text="400-008-6898"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14.7sp"
/>
......
app/src/main/res/layout/big_message_adapter.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/big_item"
android:layout_width="@dimen/dp_333"
android:layout_height="@dimen/dp_80"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/item_shape">
<TextView
android:id="@+id/big_line_textView"
android:layout_width="1dp"
android:background="@color/line_color"
android:layout_height="match_parent"
android:layout_marginLeft="89dp"
/>
<TextView
android:id="@+id/big_message_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_12"
android:textColor="@color/cl_home_title_text_color"
android:layout_marginTop="@dimen/dp_18"
android:layout_alignRight="@id/big_line_textView"
android:layout_marginRight="@dimen/dp_12"
android:text="08-10"
/>
<TextView
android:id="@+id/big_message_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="24sp"
android:layout_marginTop="@dimen/dp_34"
android:textColor="@color/cl_home_title_text_color"
android:textStyle="bold"
android:layout_alignRight="@id/big_line_textView"
android:layout_marginRight="@dimen/dp_12"
android:text="18:72"
/>
<TextView
android:id="@+id/big_message_text_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="工单被改派"
android:textSize="@dimen/sp_13.3"
android:textColor="@color/cl_home_title_text_color"
android:layout_alignLeft="@id/big_line_textView"
android:layout_marginLeft="@dimen/dp_16"
android:layout_centerVertical="true"
/>
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_message_bigfish.xml
......@@ -2,6 +2,14 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:id="@+id/message_bigfish_listview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null"
android:scrollbars="none"
android:background="@color/cl_home_listview_bg"
/>
<RelativeLayout
android:id="@+id/big_message_view"
android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_message_system.xml
......@@ -12,4 +12,30 @@
android:scrollbars="none"
android:background="@color/cl_home_listview_bg"
/>
<RelativeLayout
android:id="@+id/message_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
>
<ImageView
android:id="@+id/message_image_empty"
android:layout_width="wrap_content"
android:src="@mipmap/yu"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/message_textView_empty"
android:layout_marginTop="@dimen/dp_17"
android:layout_below="@id/message_image_empty"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂无工单"
android:textSize="@dimen/sp_13.3"
android:textColor="@color/cl_login_clearedittext_hint"
/>
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_tabtwo_item.xml
......@@ -218,7 +218,6 @@
android:textColor="@color/cl_white"
android:textSize="@dimen/sp_15"
android:visibility="gone" />
<TextView
android:id="@+id/item_order"
android:layout_width="wrap_content"
......@@ -233,10 +232,10 @@
android:id="@+id/item_wait"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_right_selector"
android:background="@color/cl_text"
android:gravity="center"
android:text="@string/wait"
android:textColor="@color/cl_white"
android:textColor="@color/cl_text"
android:textSize="@dimen/sp_15"
android:visibility="gone" />
</RelativeLayout>
......
app/src/main/res/layout/message_adapter.xml
......@@ -14,10 +14,11 @@
android:layout_width="1dp"
android:background="@color/line_color"
android:layout_height="match_parent"
android:layout_marginLeft="89dp"
/>
<TextView
android:id="@+id/message_date"
android:id="@+id/message_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_12"
......@@ -28,7 +29,7 @@
android:text="08-10"
/>
<TextView
android:id="@+id/message_time"
android:id="@+id/message_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="24sp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment