Skip to content

android / dayu

Go to a project
Commit d425bd15 by yu
Options

2017-10-24

parent aa326422
Inline Side-by-side
Showing with 427 additions and 170 deletions
app/src/main/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.bigfish"> package="com.dayu.bigfish">
//网络权限 //网络权限
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET" />
//检测联网方式，区分用户设备使用的是2G、3G或是WiFi //检测联网方式，区分用户设备使用的是2G、3G或是WiFi
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
//获取用户设备的mac地址，在平板设备上，无法通过imei标示设备，我们会将mac地址作为用户的唯一标识 //获取用户设备的mac地址，在平板设备上，无法通过imei标示设备，我们会将mac地址作为用户的唯一标识
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
//获取用户设备的IMEI，通过IMEI和mac来唯一的标识用户 //获取用户设备的IMEI，通过IMEI和mac来唯一的标识用户
<uses-permission android:name="android.permission.READ_PHONE_STATE"/> <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.GET_TASKS" /> <uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.access_network_state" />
<application <application
android:name=".application.MyApplication" android:name=".application.MyApplication"
android:allowBackup="true" android:allowBackup="true"
...@@ -30,59 +33,73 @@ ...@@ -30,59 +33,73 @@
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name=".MainActivity"> <activity android:name=".MainActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".activity.HomeActivity" <activity
android:hardwareAccelerated="true" android:name=".activity.HomeActivity"
/> android:hardwareAccelerated="true" />
//友盟统计相关配置: //友盟统计相关配置:
<uses-sdk android:minSdkVersion="8"></uses-sdk> <uses-sdk android:minSdkVersion="8"></uses-sdk>
//配置应用Appkey //配置应用Appkey
<meta-data android:value="599a41697f2c743210000990" <meta-data
android:name="UMENG_APPKEY"/> android:name="UMENG_APPKEY"
android:value="599a41697f2c743210000990" />
//推广渠道名称(待配置) //推广渠道名称(待配置)
<meta-data android:value="Channel ID" <meta-data
android:name="UMENG_CHANNEL"/> android:name="UMENG_CHANNEL"
android:value="Channel ID" />
<!-- 设置环信应用的AppKey --> <!-- 设置环信应用的AppKey -->
<meta-data android:name="EASEMOB_APPKEY" android:value="1116170816115316#dayuai" /> <meta-data
android:name="EASEMOB_APPKEY"
android:value="1116170816115316#dayuai" />
<!-- 声明SDK所需的service SDK核心功能--> <!-- 声明SDK所需的service SDK核心功能-->
<service android:name="com.hyphenate.chat.EMChatService" android:exported="true"/> <service
<service android:name="com.hyphenate.chat.EMJobService" android:name="com.hyphenate.chat.EMChatService"
android:permission="android.permission.BIND_JOB_SERVICE" android:exported="true" />
android:exported="true" <service
/> android:name="com.hyphenate.chat.EMJobService"
android:exported="true"
android:permission="android.permission.BIND_JOB_SERVICE" />
<!-- 声明SDK所需的receiver --> <!-- 声明SDK所需的receiver -->
<receiver android:name="com.hyphenate.chat.EMMonitorReceiver"> <receiver android:name="com.hyphenate.chat.EMMonitorReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.PACKAGE_REMOVED"/> <action android:name="android.intent.action.PACKAGE_REMOVED" />
<data android:scheme="package"/> <data android:scheme="package" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/> <action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.USER_PRESENT" /> <action android:name="android.intent.action.USER_PRESENT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity android:name=".activity.LoginActivity"/>
<activity android:name=".activity.ReceivingActivity"/> <activity android:name=".activity.LoginActivity" />
<activity android:name=".activity.PersonalCenterActivity"/> <activity android:name=".activity.ReceivingActivity" />
<activity android:name=".activity.SettingActivity"/> <activity android:name=".activity.PersonalCenterActivity" />
<activity android:name=".activity.SubscribeTimeActivity"/> <activity android:name=".activity.SettingActivity" />
<activity android:name=".activity.UpdataSubscribeTimeActivity"/> <activity android:name=".activity.SubscribeTimeActivity" />
<activity android:name=".activity.AgainVisitActivity"/> <activity android:name=".activity.UpdataSubscribeTimeActivity" />
<activity android:name=".activity.OrderDetailsActivity"/> <activity android:name=".activity.AgainVisitActivity" />
<activity android:name=".activity.OrderFinishActivity"/> <activity android:name=".activity.OrderDetailsActivity" />
<activity android:name=".activity.HandleListActivity"/> <activity android:name=".activity.OrderFinishActivity" />
<activity android:name=".activity.DeleteActivty"/> <activity android:name=".activity.HandleListActivity" />
<activity android:name=".activity.AgainUpDoorActivity"/> <activity android:name=".activity.DeleteActivty" />
<activity android:name=".activity.AboutUs"/> <activity android:name=".activity.AgainUpDoorActivity" />
<activity android:name=".activity.IdeaActivity"/> <activity android:name=".activity.AboutUs" />
<activity android:name=".activity.WorksheetRecordActivity"/> <activity android:name=".activity.IdeaActivity" />
<activity android:name=".activity.MessageActivity"/> <activity android:name=".activity.WorksheetRecordActivity" />
<activity android:name=".activity.BigFishMessageContent"/> <activity android:name=".activity.MessageActivity" />
<activity android:name=".activity.BigFishMessageContent" />
<receiver android:name=".utils.NetworkConnectChangedReceiver">
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
<action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
<action android:name="android.net.wifi.STATE_CHANGE" />
</intent-filter>
</receiver>
</application> </application>
</manifest> </manifest>
\ No newline at end of file
app/src/main/java/com/dayu/bigfish/Constants.java
...@@ -10,16 +10,24 @@ import static android.R.id.message; ...@@ -10,16 +10,24 @@ import static android.R.id.message;
public class Constants { public class Constants {
/**************************微服务测试路径*******************************/ /**************************微服务测试路径*******************************/
// /api-user/
public static final String BASE_USER = "https://47.94.101.239:7100/"; public static final String BASE_USER = "https://47.94.101.239:7100/";
// /api-order/
public static final String BASE_ORDER = "https://47.94.101.239:7200/"; public static final String BASE_ORDER = "https://47.94.101.239:7200/";
// /api-base/
public static final String BASE_OTHER = "https://47.94.101.239:7300/"; public static final String BASE_OTHER = "https://47.94.101.239:7300/";
// /api-message/
public static final String BASE_MESSAGE = "https://47.94.101.239:7400/"; public static final String BASE_MESSAGE = "https://47.94.101.239:7400/";
// /api-count/
public static final String BASE_COUNT = "https://47.94.101.239:7500/"; public static final String BASE_COUNT = "https://47.94.101.239:7500/";
/**************************测试环境根路径*******************************/
public static final String BASE_TEST = "http://47.94.101.239:3112"; public static final String BASE_TEST = "http://47.94.101.239:3112";
/**************************正式根环境路径*******************************/ /**************************正式环境根路径*******************************/
public static final String BASE_URL = "https://mobile.dayu.ai"; public static final String BASE_URL = "https://mobile.dayu.ai";
/***********************测试环境2.0配置**********************************/
/* public static final String LOGIN_URL = "http://47.94.101.239:3112/check"; /***********************测试环境配置**********************************/
/* public static final String LOGIN_URL = "http://47.94.101.239:3112/check";
//登录时发送验证码的URL //登录时发送验证码的URL
public static final String REGISTER_URL = BASE_TEST + "/api-user/" + "account/loginSms/"; public static final String REGISTER_URL = BASE_TEST + "/api-user/" + "account/loginSms/";
//根据工单状态获取分页工单信息的路径 //根据工单状态获取分页工单信息的路径
...@@ -61,12 +69,12 @@ public class Constants { ...@@ -61,12 +69,12 @@ public class Constants {
public final static String TAB_NUM = BASE_TEST + "/api-order/" + "orders/"; public final static String TAB_NUM = BASE_TEST + "/api-order/" + "orders/";
//环信 //环信
public final static String MESSAGE_HX = BASE_TEST + "/api-message/" + "hXMessage"; public final static String MESSAGE_HX = BASE_TEST + "/api-message/" + "hXMessage";
//处理工单上传照片 //处理工单上传照片
public final static String UP_PHOTO = "http://47.94.101.239:3111/file/uploadMore"; public final static String UP_PHOTO = "http://47.94.101.239:3111/file/uploadMore";
*/ */
/**************************正式环境*******************************/ /**************************正式环境*******************************/
//登录的URL //登录的URL
public static final String LOGIN_URL = BASE_URL + "/check"; public static final String LOGIN_URL = BASE_URL + "/check";
//登录时发送验证码的URL //登录时发送验证码的URL
public static final String REGISTER_URL = BASE_URL + "/api-user/" + "account/loginSms/"; public static final String REGISTER_URL = BASE_URL + "/api-user/" + "account/loginSms/";
......
app/src/main/java/com/dayu/bigfish/MainActivity.java
...@@ -122,6 +122,7 @@ public class MainActivity extends AppCompatActivity { ...@@ -122,6 +122,7 @@ public class MainActivity extends AppCompatActivity {
System.out.println("----->----->" + list.ext()); System.out.println("----->----->" + list.ext());
//异步刷新各Tab状态数量 //异步刷新各Tab状态数量
EventBus.getDefault().post(new RefreshTabNum(0)); EventBus.getDefault().post(new RefreshTabNum(0));
//打开消息列表界面
Intent intent = new Intent(MainActivity.this, MessageActivity.class); Intent intent = new Intent(MainActivity.this, MessageActivity.class);
PendingIntent pi = PendingIntent.getActivity(MainActivity.this, PendingIntent pi = PendingIntent.getActivity(MainActivity.this,
0, intent, 0); 0, intent, 0);
...@@ -179,7 +180,7 @@ public class MainActivity extends AppCompatActivity { ...@@ -179,7 +180,7 @@ public class MainActivity extends AppCompatActivity {
//收到透传消息 //收到透传消息
for (EMMessage list : messages) { for (EMMessage list : messages) {
// ToastUtils.showShortToast("收到CMD消息"); // ToastUtils.showShortToast("收到CMD消息");
//显示小红点 //异步请求刷新待接单列表数据显示待接单小红点
EventBus.getDefault().post(new RefreReceiveData(0)); EventBus.getDefault().post(new RefreReceiveData(0));
System.out.println("收到CMD消息" + list.getBody()); System.out.println("收到CMD消息" + list.getBody());
LogUtils.d("收到CMD消息", list.getBody().toString()); LogUtils.d("收到CMD消息", list.getBody().toString());
......
app/src/main/java/com/dayu/bigfish/MyGreenDao.java
...@@ -5,16 +5,22 @@ import org.greenrobot.greendao.annotation.Generated; ...@@ -5,16 +5,22 @@ import org.greenrobot.greendao.annotation.Generated;
import org.greenrobot.greendao.annotation.Id; import org.greenrobot.greendao.annotation.Id;
/** /**
* Created by Administrator on 2017/9/18. * 工程师状态保存的表。
* 我已出发-->开始服务-->处理工单
* 我已出发-->修改预约时间-->开始服务--->需要再次上门-->处理工单
* 1：开始服务之前可以修改预约时间，修改预约时间后开始服务变成我已出发。
* 2：开始服务后可以再次上门，再次上门填写下次预约时间后，处理工单变成我已出发
*
* on 2017/9/18.
*/ */
@Entity @Entity
public class MyGreenDao { public class MyGreenDao {
@Id @Id
private Long id; private Long id; //自增长的id
private int ids; //订单orderId private int ids; //订单orderId
private int logid;//userId private int logid;//userId
private String type; //标志我已出发-开始服务-处理工单 private String type; //标志我已出发(0)-开始服务(1)-处理工单(2)，
private String flag; //标志修改预约时间-需要再次上门 private String flag; //标志修改预约时间(a)-需要再次上门(b)
public MyGreenDao() { public MyGreenDao() {
} }
......
app/src/main/java/com/dayu/bigfish/activity/AgainUpDoorActivity.java
...@@ -36,6 +36,7 @@ import org.greenrobot.eventbus.EventBus; ...@@ -36,6 +36,7 @@ import org.greenrobot.eventbus.EventBus;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import butterknife.BindView; import butterknife.BindView;
...@@ -88,7 +89,11 @@ public class AgainUpDoorActivity extends Activity { ...@@ -88,7 +89,11 @@ public class AgainUpDoorActivity extends Activity {
private String edValue; private String edValue;
private String token; private String token;
private DateUtils dateUtils = new DateUtils(); private DateUtils dateUtils = new DateUtils();
private List myList;
private int finshPosition; private int finshPosition;
private int myYears;
private int myMonths;
private int myToday;
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
...@@ -97,6 +102,7 @@ public class AgainUpDoorActivity extends Activity { ...@@ -97,6 +102,7 @@ public class AgainUpDoorActivity extends Activity {
ButterKnife.bind(this); ButterKnife.bind(this);
token = GetUserInfo.getToken(this); token = GetUserInfo.getToken(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog); dialog = new CustomProgressDialog(this, R.style.CustomDialog);
myList = dateUtils.getSystemTime();
initData(); initData();
} }
...@@ -120,8 +126,18 @@ public class AgainUpDoorActivity extends Activity { ...@@ -120,8 +126,18 @@ public class AgainUpDoorActivity extends Activity {
@Override @Override
public void onTimeSelect(Date date2, View v) {//选中事件回调 public void onTimeSelect(Date date2, View v) {//选中事件回调
String time = getTime(date2); String time = getTime(date2);
ToastUtils.showShortToast(time); myYears = Integer.parseInt(getTimeYear(date2));
textDateValue.setText(time); myMonths = Integer.parseInt(getTimeMonth(date2));
myToday = Integer.parseInt(getTimetoday(date2));
int sysYear = (int) myList.get(0);
int sysMoths = (int) myList.get(1);
int sysToday = (int) myList.get(2);
if (myYears < sysYear || myMonths < sysMoths || myToday < sysToday) {
ToastUtils.showShortToast("请选择合法的时间");
return;
}else {
textDateValue.setText(time);
}
} }
}) })
.setType(TimePickerView.Type.YEAR_MONTH_DAY)//默认全部显示 .setType(TimePickerView.Type.YEAR_MONTH_DAY)//默认全部显示
...@@ -252,6 +268,21 @@ public class AgainUpDoorActivity extends Activity { ...@@ -252,6 +268,21 @@ public class AgainUpDoorActivity extends Activity {
SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
return format.format(date); return format.format(date);
} }
public String getTimeYear(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("yyyy");
return format.format(date);
}
public String getTimeMonth(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("MM");
return format.format(date);
}
public String getTimetoday(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("dd");
return format.format(date);
}
public String getTimes(Date date) {//可根据需要自行截取数据显示 public String getTimes(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("HH:mm"); SimpleDateFormat format = new SimpleDateFormat("HH:mm");
return format.format(date); return format.format(date);
......
app/src/main/java/com/dayu/bigfish/activity/HandleListActivity.java
...@@ -111,7 +111,6 @@ public class HandleListActivity extends BaseActivity<HandleListView, HandleListP ...@@ -111,7 +111,6 @@ public class HandleListActivity extends BaseActivity<HandleListView, HandleListP
createPicture(); createPicture();
break; break;
case R.id.iv_2: case R.id.iv_2:
ToastUtils.showShortToast("点击了照片");
Delete(1); Delete(1);
break; break;
case R.id.iv_3: case R.id.iv_3:
......
app/src/main/java/com/dayu/bigfish/activity/HomeActivity.java
...@@ -137,10 +137,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -137,10 +137,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
siteId = GetUserInfo.getSITE_ID(this); siteId = GetUserInfo.getSITE_ID(this);
hxUserId = GetUserInfo.getHxUserId(this); hxUserId = GetUserInfo.getHxUserId(this);
initReceiveData(token); initReceiveData(token);
// Query query2 = messageBigFishDao().queryBuilder() //消息列表数据库的一些判断，判断有无未读数据，判断是否显示小红点
// .where(MessageBigFishDao.Properties.Flag.eq("0"))
// .build();
// List<MessageBigFish> list2 = query2.list();
Query query1 = messageSysDao().queryBuilder() Query query1 = messageSysDao().queryBuilder()
.where(MessageSysDao.Properties.Flag.eq("0")) .where(MessageSysDao.Properties.Flag.eq("0"))
.build(); .build();
...@@ -219,10 +216,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -219,10 +216,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
e.printStackTrace(); e.printStackTrace();
return "解析版本号失败"; return "解析版本号失败";
} }
} }
@Override @Override
public void initData() { public void initData() {
// viewPager.setOffscreenPageLimit(0); // viewPager.setOffscreenPageLimit(0);
...@@ -240,9 +234,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -240,9 +234,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override @Override
public void onPageScrolled(int i, float v, int i1) { public void onPageScrolled(int i, float v, int i1) {
} }
@Override @Override
public void onPageSelected(int i) { public void onPageSelected(int i) {
switch (i) { switch (i) {
...@@ -251,12 +243,15 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -251,12 +243,15 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
ToastUtils.showShortToast("待预约列表"); ToastUtils.showShortToast("待预约列表");
break; break;
case 1: case 1:
ToastUtils.showShortToast("待服务列表");
EventBus.getDefault().post(new TabTwoRefresh(0)); EventBus.getDefault().post(new TabTwoRefresh(0));
break; break;
case 2: case 2:
ToastUtils.showShortToast("异常单列表");
EventBus.getDefault().post(new TabThreeRefresh(0)); EventBus.getDefault().post(new TabThreeRefresh(0));
break; break;
case 3: case 3:
ToastUtils.showShortToast("已取消列表");
EventBus.getDefault().post(new TabFourRefresh(0)); EventBus.getDefault().post(new TabFourRefresh(0));
break; break;
} }
...@@ -267,6 +262,9 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -267,6 +262,9 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
} }
}); });
/**
* 此处是通过反射更改TabLayout下划线的宽度，如果有更好的方法最佳，不推荐反射方式
* */
homeTabLayout.post(new Runnable() { homeTabLayout.post(new Runnable() {
@Override @Override
public void run() { public void run() {
...@@ -320,7 +318,6 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -320,7 +318,6 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
// 找到当前索引对应tab上的文本 // 找到当前索引对应tab上的文本
switch (temp) { switch (temp) {
case 0: case 0:
LogUtils.e("------->", "执行了");
textView_number_one = (TextView) tab.getCustomView().findViewById(R.id.one_tabtex); textView_number_one = (TextView) tab.getCustomView().findViewById(R.id.one_tabtex);
textView_number_one.setTextColor(getResources().getColor(R.color.cl_order_item_date)); textView_number_one.setTextColor(getResources().getColor(R.color.cl_order_item_date));
textView_one = (TextView) tab.getCustomView().findViewById(R.id.one_tabicon); textView_one = (TextView) tab.getCustomView().findViewById(R.id.one_tabicon);
...@@ -377,7 +374,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -377,7 +374,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
} }
/** /**
* 请求服务器tab * 请求服务器数据获取tab各状态的数量
*/ */
private void initNetWorkTabNum(int userId, String token, int tabIndex) { private void initNetWorkTabNum(int userId, String token, int tabIndex) {
dialog.show(); dialog.show();
...@@ -409,10 +406,9 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -409,10 +406,9 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
} }
/** /**
* 初始化tab * 将网络请求到的数据展示到tab上
*/ */
private void setTabNum(TabBean tabNum, int myTabIndex) { private void setTabNum(TabBean tabNum, int myTabIndex) {
homeTabLayout.removeAllTabs(); homeTabLayout.removeAllTabs();
//tabNum.getData().getReservation() 待预约 //tabNum.getData().getReservation() 待预约
//tabNum.getData().getPendingservice() 待服务 //tabNum.getData().getPendingservice() 待服务
...@@ -449,7 +445,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -449,7 +445,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
} }
/** /**
* TabLayout 第一个tab的布局 * TabLayout 第一个tab标签的自定义布局
*/ */
private View tab_icon_one(String number, String iconID) { private View tab_icon_one(String number, String iconID) {
View newtab = LayoutInflater.from(this).inflate(R.layout.activity_home_one, null); View newtab = LayoutInflater.from(this).inflate(R.layout.activity_home_one, null);
...@@ -514,9 +510,6 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -514,9 +510,6 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
startActivity(intentPerson); startActivity(intentPerson);
break; break;
case R.id.image_phone: case R.id.image_phone:
//进入待接单列表
// Intent intentReceiving = new Intent(HomeActivity.this, OrderFinishActivity.class);
//Intent intentReceiving = new Intent(HomeActivity.this, HandleListActivity.class);
Intent intentReceiving = new Intent(HomeActivity.this, ReceivingActivity.class); Intent intentReceiving = new Intent(HomeActivity.this, ReceivingActivity.class);
startActivity(intentReceiving); startActivity(intentReceiving);
break; break;
...@@ -530,9 +523,6 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -530,9 +523,6 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onRefreTabNum(RefreshTabNum refreshTabNum) { public void onRefreTabNum(RefreshTabNum refreshTabNum) {
if (refreshTabNum.getTabNum() == 0) { if (refreshTabNum.getTabNum() == 0) {
//ToastUtils.showShortToast("刷新了");
/* viewPager.setCurrentItem(1);
homeTabLayout.getTabAt(1).select();*/
//请求网络,刷新Tab //请求网络,刷新Tab
initNetWorkTabNum(userId, token, 0); initNetWorkTabNum(userId, token, 0);
//刷新待接单列表小红点 //刷新待接单列表小红点
...@@ -648,6 +638,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen ...@@ -648,6 +638,7 @@ public class HomeActivity extends BaseActivity<HomeView, HomePresenter> implemen
Query query1 = messageSysDao().queryBuilder() Query query1 = messageSysDao().queryBuilder()
.where(MessageSysDao.Properties.Flag.eq("0")) .where(MessageSysDao.Properties.Flag.eq("0"))
.build(); .build();
//initNetWorkTabNum(userId, token, 0);
List<MessageSys> list1 = query1.list(); List<MessageSys> list1 = query1.list();
if (list1.size() == 0) { if (list1.size() == 0) {
......
app/src/main/java/com/dayu/bigfish/activity/LoginActivity.java
...@@ -46,6 +46,7 @@ import butterknife.ButterKnife; ...@@ -46,6 +46,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Response; import okhttp3.Response;
import static com.umeng.analytics.pro.x.O; import static com.umeng.analytics.pro.x.O;
import static java.lang.Integer.parseInt; import static java.lang.Integer.parseInt;
...@@ -109,39 +110,41 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple ...@@ -109,39 +110,41 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
dialog.dismiss(); dialog.dismiss();
ToastUtils.showShortToast("登录成功"); ToastUtils.showShortToast("登录成功");
//取出bean中的值保存到sp中 //取出bean中的值保存到sp中
//正式
accountId = loginBean.getData().getAccountId(); accountId = loginBean.getData().getAccountId();
siteId = loginBean.getData().getSiteId(); siteId = loginBean.getData().getSiteId();
token = loginBean.getData().getAccessToken(); token = loginBean.getData().getToken();
hxUserId = loginBean.getData().getHxAccount(); hxUserId = loginBean.getData().getHxAccount();
hxUserPwd = loginBean.getData().getHxPwd(); hxUserPwd = loginBean.getData().getHxPwd();
imageUrl = loginBean.getData().getHeaderImg(); imageUrl = loginBean.getData().getHeaderImg();
/* accountId = loginTestBean.getData().getAccountId(); //测试
/* accountId = loginTestBean.getData().getAccountId();
siteId = loginTestBean.getData().getSiteId(); siteId = loginTestBean.getData().getSiteId();
token = loginTestBean.getData().getToken(); token = loginTestBean.getData().getToken();
hxUserId = loginTestBean.getData().getHxAccount(); hxUserId = loginTestBean.getData().getHxAccount();
hxUserPwd = loginTestBean.getData().getHxPwd();*/ hxUserPwd = loginTestBean.getData().getHxPwd();*/
//imageUrl = null; //imageUrl = null;
if (TextUtils.isEmpty(imageUrl)){ if (TextUtils.isEmpty(imageUrl)) {
imageUrl = "暂无头像"; imageUrl = "暂无头像";
} }
UserManager.getInstance().saveUserInfo(this,accountId,siteId,token,hxUserId,hxUserPwd,imageUrl); UserManager.getInstance().saveUserInfo(this, accountId, siteId, token, hxUserId, hxUserPwd, imageUrl);
System.out.println("存入的工程师id为----->"+accountId); System.out.println("存入的工程师id为----->" + accountId);
System.out.println("存入的站点id为----->"+siteId); System.out.println("存入的站点id为----->" + siteId);
System.out.println("存入的token为----->"+token); System.out.println("存入的token为----->" + token);
System.out.println("存入的工程师环信账号为----->"+hxUserId); System.out.println("存入的工程师环信账号为----->" + hxUserId);
System.out.println("存入的工程师环信密码为----->"+hxUserPwd); System.out.println("存入的工程师环信密码为----->" + hxUserPwd);
if (TextUtils.isEmpty(imageUrl)) { if (TextUtils.isEmpty(imageUrl)) {
ToastUtils.showShortToast("该工程师暂无头像"); ToastUtils.showShortToast("该工程师暂无头像");
Intent intent = new Intent(this,HomeActivity.class); Intent intent = new Intent(this, HomeActivity.class);
startActivity(intent); startActivity(intent);
finish(); finish();
}else{ } else {
//ToastUtils.showShortToast("该工程师暂无头像"); //ToastUtils.showShortToast("该工程师暂无头像");
Intent intent = new Intent(this,HomeActivity.class); Intent intent = new Intent(this, HomeActivity.class);
startActivity(intent); startActivity(intent);
finish(); finish();
} }
if (!(TextUtils.isEmpty(hxUserId)) && !(TextUtils.isEmpty(hxUserPwd))) { if (!(TextUtils.isEmpty(hxUserId)) && !(TextUtils.isEmpty(hxUserPwd))) {
EMClient.getInstance().login(hxUserId, hxUserPwd, new EMCallBack() { EMClient.getInstance().login(hxUserId, hxUserPwd, new EMCallBack() {
@Override @Override
public void onSuccess() { public void onSuccess() {
...@@ -160,13 +163,13 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple ...@@ -160,13 +163,13 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
@Override @Override
public void onError(int code, String message) { public void onError(int code, String message) {
System.out.println("环信----->登录聊天服务器失败！"); System.out.println("环信----->登录聊天服务器失败！");
System.out.println("环信失败信息:---->"+message); System.out.println("环信失败信息:---->" + message);
} }
}); });
} }
userId = Integer.parseInt(accountId); userId = Integer.parseInt(accountId);
commitVersionInfo(userId,getIMEI(this),getPackageNum(),token); commitVersionInfo(userId, getIMEI(this), getPackageNum(), token);
} }
...@@ -191,6 +194,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple ...@@ -191,6 +194,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
public void sendRegisterError(String msg) { public void sendRegisterError(String msg) {
ToastUtils.showShortToast(msg); ToastUtils.showShortToast(msg);
} }
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
...@@ -219,8 +223,8 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple ...@@ -219,8 +223,8 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
if (!(checkOutPhone(userPhone).equals("succeed"))) { if (!(checkOutPhone(userPhone).equals("succeed"))) {
ToastUtils.showShortToast(checkOutPhone(userPhone)); ToastUtils.showShortToast(checkOutPhone(userPhone));
return; return;
}else{ } else {
mLoginPresenter.sendRegister(userPhone,btnRegisterSendCode); mLoginPresenter.sendRegister(userPhone, btnRegisterSendCode);
} }
break; break;
case R.id.register_button: case R.id.register_button:
...@@ -231,13 +235,14 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple ...@@ -231,13 +235,14 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
if (!(checkOutPhone(userPhone).equals("succeed") && checkOutRegister(register).equals("succeed"))) { if (!(checkOutPhone(userPhone).equals("succeed") && checkOutRegister(register).equals("succeed"))) {
ToastUtils.showShortToast("验证码或手机号不能为空"); ToastUtils.showShortToast("验证码或手机号不能为空");
return; return;
}else{ } else {
mLoginPresenter.login(userPhone, register); mLoginPresenter.login(userPhone, register);
dialog.show(); dialog.show();
} }
break; break;
} }
} }
/** /**
* 手机号码校验 * 手机号码校验
* 非空校验和手机号是否正确的校验 * 非空校验和手机号是否正确的校验
...@@ -250,6 +255,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple ...@@ -250,6 +255,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
} }
return "succeed"; return "succeed";
} }
/** /**
* 验证码校验 * 验证码校验
*/ */
...@@ -259,10 +265,11 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple ...@@ -259,10 +265,11 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
} }
return "succeed"; return "succeed";
} }
/** /**
* 版本第一次使用时要上传的信息 * 版本第一次使用时要上传的信息
*/ */
public void commitVersionInfo(int userId, String imei, String versionCode,String token) { public void commitVersionInfo(int userId, String imei, String versionCode, String token) {
/*{ /*{
"accountId": 145, "accountId": 145,
"createTime": "", "createTime": "",
...@@ -292,7 +299,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple ...@@ -292,7 +299,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
OkGo.post(Constants.COMMIT_VERSION_INFO) OkGo.post(Constants.COMMIT_VERSION_INFO)
.tag(this) .tag(this)
.upJson(jsonObject.toString()) .upJson(jsonObject.toString())
.headers("token",token) .headers("token", token)
.execute(new StringCallback() { .execute(new StringCallback() {
@Override @Override
public void onSuccess(String s, Call call, Response response) { public void onSuccess(String s, Call call, Response response) {
...@@ -322,6 +329,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple ...@@ -322,6 +329,7 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
return imei; return imei;
} }
/** /**
* 获取当前应用的版本号 * 获取当前应用的版本号
*/ */
......
app/src/main/java/com/dayu/bigfish/activity/OrderFinishActivity.java
...@@ -206,13 +206,13 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -206,13 +206,13 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
private String categoryName; //产品名称 private String categoryName; //产品名称
private String token; private String token;
private String value; private String value;
private int finshPosition; private int finshPosition;
private boolean photo;
public void initData() { public void initData() {
Intent intent = getIntent(); Intent intent = getIntent();
value = intent.getStringExtra("orderId"); value = intent.getStringExtra("orderId");
finshPosition = intent.getIntExtra("position",0); finshPosition = intent.getIntExtra("position", 0);
orderId = Integer.parseInt(value); orderId = Integer.parseInt(value);
engineerId = GetUserInfo.getACCOUNT_ID(this); engineerId = GetUserInfo.getACCOUNT_ID(this);
mIvs = new ImageView[]{imageOne, imageTwo, imageThree, imageFoure, imageFive}; mIvs = new ImageView[]{imageOne, imageTwo, imageThree, imageFoure, imageFive};
...@@ -222,6 +222,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -222,6 +222,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
cailiaoCost = (String) SPUtils.get(this, "big_fish_two", "CAILIAO_COST", ""); cailiaoCost = (String) SPUtils.get(this, "big_fish_two", "CAILIAO_COST", "");
otherCost = (String) SPUtils.get(this, "big_fish_two", "OTHER_COST", ""); otherCost = (String) SPUtils.get(this, "big_fish_two", "OTHER_COST", "");
payRemark = (String) SPUtils.get(this, "big_fish_two", "PAY_REMARK", ""); payRemark = (String) SPUtils.get(this, "big_fish_two", "PAY_REMARK", "");
photo = (boolean) SPUtils.get(this, "big_fish_two", "PHOTO_IS", false);
if (!TextUtils.isEmpty(serveValue2)) { if (!TextUtils.isEmpty(serveValue2)) {
etInput.setText(serveValue2); etInput.setText(serveValue2);
} }
...@@ -240,6 +241,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -240,6 +241,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
if (!TextUtils.isEmpty(payRemark)) { if (!TextUtils.isEmpty(payRemark)) {
etUpInput.setText(payRemark); etUpInput.setText(payRemark);
} }
} }
@Override @Override
...@@ -268,14 +270,12 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -268,14 +270,12 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
@Override @Override
public void initView() { public void initView() {
isSwitch = (boolean) get(this, "big_fish", "imageSwitch", false); isSwitch = (boolean) get(this, "big_fish", "imageSwitch", false);
//ToastUtils.showShortToast(isSwitch+""); //ToastUtils.showShortToast(isSwitch+"");
if (isSwitch) { if (isSwitch) {
imageSwitch.setSwitchButton(isSwitch); imageSwitch.setSwitchButton(isSwitch);
playView.setVisibility(View.VISIBLE); playView.setVisibility(View.VISIBLE);
isPay = 2; //支付费用 isPay = 2; //支付费用
System.out.println(isPay);
} else { } else {
imageSwitch.setSwitchButton(isSwitch); imageSwitch.setSwitchButton(isSwitch);
playView.setVisibility(View.GONE); playView.setVisibility(View.GONE);
...@@ -297,12 +297,12 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -297,12 +297,12 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
} }
private void forRequset() { private void forRequset() {
if(ContextCompat.checkSelfPermission( OrderFinishActivity.this, Manifest.permission.CAMERA)!= PackageManager.PERMISSION_GRANTED) if (ContextCompat.checkSelfPermission(OrderFinishActivity.this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
{
ActivityCompat.requestPermissions(OrderFinishActivity.this, new String[]{Manifest.permission.CAMERA}, 1); ActivityCompat.requestPermissions(OrderFinishActivity.this, new String[]{Manifest.permission.CAMERA}, 1);
} }
} }
@Override @Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
if (requestCode == 1) { if (requestCode == 1) {
...@@ -403,6 +403,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -403,6 +403,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
cailiaoCost = editMaterialsValue.getText().toString(); cailiaoCost = editMaterialsValue.getText().toString();
otherCost = editOtherValue.getText().toString(); otherCost = editOtherValue.getText().toString();
payRemark = etUpInput.getText().toString(); payRemark = etUpInput.getText().toString();
SPUtils.putTwo(this, "PHOTO_IS", true);
if (!TextUtils.isEmpty(serveValue1)) { if (!TextUtils.isEmpty(serveValue1)) {
SPUtils.putTwo(this, "SERVE_VALUE", serveValue1); SPUtils.putTwo(this, "SERVE_VALUE", serveValue1);
System.out.println("editText值为---->" + serveValue1); System.out.println("editText值为---->" + serveValue1);
...@@ -493,7 +494,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -493,7 +494,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
case R.id.image_one: case R.id.image_one:
ToastUtils.showShortToast("点击了"); ToastUtils.showShortToast("点击了");
forRequset(); forRequset();
// createPicture(); // createPicture();
break; break;
case R.id.image_two: case R.id.image_two:
delete(1); delete(1);
...@@ -522,6 +523,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -522,6 +523,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
@Override @Override
public void onStart() { public void onStart() {
} }
@Override @Override
public void onSuccess(File file) { public void onSuccess(File file) {
ToastUtils.showShortToast("压缩成功"); ToastUtils.showShortToast("压缩成功");
...@@ -599,7 +601,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -599,7 +601,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
startActivity(intent); startActivity(intent);
return; return;
}*/ }*/
functionConfigBuilder.setEnableCamera(true);//是否开启相机 functionConfigBuilder.setEnableCamera(true);//是否开启相机
// } // }
final FunctionConfig functionConfig = functionConfigBuilder.build(); final FunctionConfig functionConfig = functionConfigBuilder.build();
...@@ -616,6 +618,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -616,6 +618,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
@Override @Override
public void displayImage(Activity activity, String path, final GFImageView imageView, Drawable defaultDrawable, int width, int height) { public void displayImage(Activity activity, String path, final GFImageView imageView, Drawable defaultDrawable, int width, int height) {
Glide.with(activity) Glide.with(activity)
.load("file://" + path) .load("file://" + path)
.override(width, height) .override(width, height)
...@@ -626,6 +629,8 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O ...@@ -626,6 +629,8 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
@Override @Override
protected void setResource(GlideDrawable resource) { protected void setResource(GlideDrawable resource) {
imageView.setImageDrawable(resource); imageView.setImageDrawable(resource);
System.out.println("资源为---->"+resource);
} }
@Override @Override
......
app/src/main/java/com/dayu/bigfish/activity/SubscribeTimeActivity.java
...@@ -44,6 +44,7 @@ import java.text.DateFormat; ...@@ -44,6 +44,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import butterknife.BindView; import butterknife.BindView;
...@@ -96,15 +97,16 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc ...@@ -96,15 +97,16 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
private SubscribeTimePresenter subscribeTimePresenter; private SubscribeTimePresenter subscribeTimePresenter;
private int orderId; private int orderId;
private RefershAdapter refershAdapter; private RefershAdapter refershAdapter;
DateFormat format = DateFormat.getDateTimeInstance();
//获取日期格式器对象
Calendar calendar = Calendar.getInstance(Locale.CHINA);
private String edValue; private String edValue;
private CustomProgressDialog dialog; private CustomProgressDialog dialog;
private String token; private String token;
private DateUtils dateUtils = new DateUtils(); private DateUtils dateUtils = new DateUtils();
private String timeValue; private String timeValue;
private String time; private String time;
private List myList;
private int myYears;
private int myMonths;
private int myToday;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -114,6 +116,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc ...@@ -114,6 +116,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
dialog = new CustomProgressDialog(this, R.style.CustomDialog); dialog = new CustomProgressDialog(this, R.style.CustomDialog);
token = GetUserInfo.getToken(this); token = GetUserInfo.getToken(this);
initData(); initData();
myList = dateUtils.getSystemTime();
// refershAdapter = (RefershAdapter) HomeActivity.list_fragments.get(0); // refershAdapter = (RefershAdapter) HomeActivity.list_fragments.get(0);
} }
...@@ -138,7 +141,8 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc ...@@ -138,7 +141,8 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
/** /**
* 预约时间的网络请求 * 预约时间的网络请求
* 因考虑到此处记录状态操作后期可能会有频繁变化，所以就直接写在活动里了 * 因考虑到此处记录状态操作后期可能会有频繁变化，所以就直接写在活动里了
*建议项目中类似网络请求代码都规范到P层 * 建议项目中类似网络请求代码都规范到P层
*
* @param orderId 工单Id * @param orderId 工单Id
* @param doorTime 上门时间(标准时间戳格式) * @param doorTime 上门时间(标准时间戳格式)
* @param doorComment 上门备注 * @param doorComment 上门备注
...@@ -160,10 +164,8 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc ...@@ -160,10 +164,8 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
if (baseBean.getCode() == 0) { if (baseBean.getCode() == 0) {
ToastUtils.showShortToast("预约时间成功,请移至待服务列表查看"); ToastUtils.showShortToast("预约时间成功,请移至待服务列表查看");
EventBus.getDefault().post(new RefreshTabNum(1)); EventBus.getDefault().post(new RefreshTabNum(1));
//EventBus.getDefault().post(new TabOneRefresh(0));
dialog.dismiss(); dialog.dismiss();
} }
// refershAdapter.refershAdapter();
finish(); finish();
} }
...@@ -194,6 +196,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc ...@@ -194,6 +196,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
return; return;
} else { } else {
ToastUtils.showShortToast("正在提交数据......"); ToastUtils.showShortToast("正在提交数据......");
//将控件拿到的时间 通过DateUtils工具类转换为标准时间戳格式提交到服务器 //将控件拿到的时间 通过DateUtils工具类转换为标准时间戳格式提交到服务器
time = dateUtils.stringTimeTo(textDateValue.getText().toString()); time = dateUtils.stringTimeTo(textDateValue.getText().toString());
...@@ -207,7 +210,18 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc ...@@ -207,7 +210,18 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
@Override @Override
public void onTimeSelect(Date date2, View v) {//选中事件回调 public void onTimeSelect(Date date2, View v) {//选中事件回调
String time = getTime(date2); String time = getTime(date2);
textDateValue.setText(time); myYears = Integer.parseInt(getTimeYear(date2));
myMonths = Integer.parseInt(getTimeMonth(date2));
myToday = Integer.parseInt(getTimetoday(date2));
int sysYear = (int) myList.get(0);
int sysMoths = (int) myList.get(1);
int sysToday = (int) myList.get(2);
if (myYears < sysYear || myMonths < sysMoths || myToday < sysToday) {
ToastUtils.showShortToast("请选择合法的时间");
return;
} else {
textDateValue.setText(time);
}
} }
}) })
.setType(TimePickerView.Type.YEAR_MONTH_DAY)//默认全部显示 .setType(TimePickerView.Type.YEAR_MONTH_DAY)//默认全部显示
...@@ -271,11 +285,28 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc ...@@ -271,11 +285,28 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
} }
} }
//可根据需要自行截取数据显示 //可根据需要自行截取数据显示
public String getTime(Date date) { public String getTime(Date date) {
SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
return format.format(date); return format.format(date);
} }
public String getTimeYear(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("yyyy");
return format.format(date);
}
public String getTimeMonth(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("MM");
return format.format(date);
}
public String getTimetoday(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("dd");
return format.format(date);
}
//可根据需要自行截取数据显示 //可根据需要自行截取数据显示
public String getTimes(Date date) { public String getTimes(Date date) {
SimpleDateFormat format = new SimpleDateFormat("HH:mm"); SimpleDateFormat format = new SimpleDateFormat("HH:mm");
......
app/src/main/java/com/dayu/bigfish/activity/UpdataSubscribeTimeActivity.java
...@@ -31,13 +31,16 @@ import org.greenrobot.eventbus.EventBus; ...@@ -31,13 +31,16 @@ import org.greenrobot.eventbus.EventBus;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import static android.media.CamcorderProfile.get;
import static cn.finalteam.toolsfinal.DateUtils.getTime; import static cn.finalteam.toolsfinal.DateUtils.getTime;
import static java.lang.Integer.parseInt;
/** /**
* 修改预约上门时间 * 修改预约上门时间
...@@ -82,6 +85,11 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim ...@@ -82,6 +85,11 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
private DateUtils dateUtils = new DateUtils(); private DateUtils dateUtils = new DateUtils();
private String token; private String token;
private int finshPosition; private int finshPosition;
private String time;
private List myList;
private int myYears;
private int myMonths;
private int myToday;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -90,6 +98,7 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim ...@@ -90,6 +98,7 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
ButterKnife.bind(this); ButterKnife.bind(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog); dialog = new CustomProgressDialog(this, R.style.CustomDialog);
token = GetUserInfo.getToken(this); token = GetUserInfo.getToken(this);
myList = dateUtils.getSystemTime();
initData(); initData();
} }
...@@ -112,8 +121,8 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim ...@@ -112,8 +121,8 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
public void initData() { public void initData() {
Intent intent = getIntent(); Intent intent = getIntent();
String value = intent.getStringExtra("orderId"); String value = intent.getStringExtra("orderId");
finshPosition = intent.getIntExtra("position",0); finshPosition = intent.getIntExtra("position", 0);
orderId = Integer.parseInt(value); orderId = parseInt(value);
} }
@Override @Override
...@@ -121,6 +130,7 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim ...@@ -121,6 +130,7 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
this.updataSubscribeTimePresenter = new UpdataSubscribeTimePresenter(this); this.updataSubscribeTimePresenter = new UpdataSubscribeTimePresenter(this);
return updataSubscribeTimePresenter; return updataSubscribeTimePresenter;
} }
@OnClick({R.id.submit_button, R.id.receiving_back, R.id.time_one, R.id.time_two}) @OnClick({R.id.submit_button, R.id.receiving_back, R.id.time_one, R.id.time_two})
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
...@@ -132,9 +142,9 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim ...@@ -132,9 +142,9 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
} else { } else {
dialog.show(); dialog.show();
ToastUtils.showShortToast("正在提交数据......"); ToastUtils.showShortToast("正在提交数据......");
String time= dateUtils.stringTimeTo(textDateValue.getText().toString()); String time = dateUtils.stringTimeTo(textDateValue.getText().toString());
String timeValue = time+textTimeValue.getText().toString()+":00"; String timeValue = time + textTimeValue.getText().toString() + ":00";
updataSubscribeTimePresenter.post(orderId, timeValue, edValue,token); updataSubscribeTimePresenter.post(orderId, timeValue, edValue, token);
//initNetWork(orderId, "2017-18-23 15:34:00", edValue); //initNetWork(orderId, "2017-18-23 15:34:00", edValue);
} }
break; break;
...@@ -146,7 +156,19 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim ...@@ -146,7 +156,19 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
@Override @Override
public void onTimeSelect(Date date2, View v) {//选中事件回调 public void onTimeSelect(Date date2, View v) {//选中事件回调
String time = getTime(date2); String time = getTime(date2);
textDateValue.setText(time); myYears = Integer.parseInt(getTimeYear(date2));
myMonths = Integer.parseInt(getTimeMonth(date2));
myToday = Integer.parseInt(getTimetoday(date2));
int sysYear = (int) myList.get(0);
int sysMoths = (int) myList.get(1);
int sysToday = (int)myList.get(2);
if (myYears<sysYear||myMonths<sysMoths||myToday< sysToday){
ToastUtils.showShortToast("请选择合法的时间");
return;
}else {
textDateValue.setText(time);
}
} }
}) })
.setType(TimePickerView.Type.YEAR_MONTH_DAY)//默认全部显示 .setType(TimePickerView.Type.YEAR_MONTH_DAY)//默认全部显示
...@@ -178,7 +200,7 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim ...@@ -178,7 +200,7 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
@Override @Override
public void onTimeSelect(Date date2, View v) {//选中事件回调 public void onTimeSelect(Date date2, View v) {//选中事件回调
String time = getTimes(date2); String time = getTimes(date2);
ToastUtils.showShortToast(time); ToastUtils.showShortToast("时间" + time);
textTimeValue.setText(time); textTimeValue.setText(time);
} }
}) })
...@@ -232,12 +254,28 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim ...@@ -232,12 +254,28 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
// EventBus.getDefault().unregister(this); // EventBus.getDefault().unregister(this);
} }
public String getTime(Date date) {//可根据需要自行截取数据显示 public String getTime(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
return format.format(date); return format.format(date);
} }
public String getTimeYear(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("yyyy");
return format.format(date);
}
public String getTimeMonth(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("MM");
return format.format(date);
}
public String getTimetoday(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("dd");
return format.format(date);
}
public String getTimes(Date date) {//可根据需要自行截取数据显示 public String getTimes(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("HH:mm"); SimpleDateFormat format = new SimpleDateFormat("HH:mm");
return format.format(date); return format.format(date);
......
app/src/main/java/com/dayu/bigfish/adapter/HomeOneTabAdapter.java
...@@ -71,6 +71,7 @@ public class HomeOneTabAdapter extends BaseAdapter{ ...@@ -71,6 +71,7 @@ public class HomeOneTabAdapter extends BaseAdapter{
} }
try { try {
initData(position, viewHolder); initData(position, viewHolder);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
ToastUtils.showShortToast("待预约列表适配器解析异常"); ToastUtils.showShortToast("待预约列表适配器解析异常");
......
app/src/main/java/com/dayu/bigfish/adapter/HomeTwoTabAdapter.java
...@@ -171,6 +171,7 @@ public class HomeTwoTabAdapter extends BaseAdapter { ...@@ -171,6 +171,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
} }
private void initData(final int position, final ViewHolder viewHolder,String token) 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()), Query query = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(position).getId()),
MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context))) MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
......
app/src/main/java/com/dayu/bigfish/application/MyApplication.java
...@@ -4,13 +4,17 @@ import android.app.ActivityManager; ...@@ -4,13 +4,17 @@ import android.app.ActivityManager;
import android.app.Application; import android.app.Application;
import android.app.VoiceInteractor; import android.app.VoiceInteractor;
import android.content.Context; import android.content.Context;
import android.content.IntentFilter;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import android.os.Handler; import android.os.Handler;
import android.text.TextUtils; import android.text.TextUtils;
import com.dayu.bigfish.greendao.DaoMaster; import com.dayu.bigfish.greendao.DaoMaster;
import com.dayu.bigfish.greendao.DaoSession; import com.dayu.bigfish.greendao.DaoSession;
import com.dayu.bigfish.utils.LogUtils; import com.dayu.bigfish.utils.LogUtils;
import com.dayu.bigfish.utils.NetworkConnectChangedReceiver;
import com.dayu.bigfish.utils.SPUtils; import com.dayu.bigfish.utils.SPUtils;
import com.hyphenate.EMCallBack; import com.hyphenate.EMCallBack;
import com.hyphenate.chat.EMClient; import com.hyphenate.chat.EMClient;
...@@ -51,12 +55,18 @@ public class MyApplication extends Application { ...@@ -51,12 +55,18 @@ public class MyApplication extends Application {
public DaoMaster daoMaster; public DaoMaster daoMaster;
private String hxUserId; private String hxUserId;
private String hxUserPwd; private String hxUserPwd;
private NetworkConnectChangedReceiver networkConnectChangedReceiver;
/** /**
* 程序的入口方法 * 程序的入口方法
*/ */
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
IntentFilter filter = new IntentFilter();
filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
registerReceiver(new NetworkConnectChangedReceiver(), filter);
setupDatabase(); setupDatabase();
//捕获错误报告并上传到友盟服务器 //捕获错误报告并上传到友盟服务器
/* public static void reportError(Context context, String error) /* public static void reportError(Context context, String error)
......
app/src/main/java/com/dayu/bigfish/bean/LoginBean.java
...@@ -9,10 +9,9 @@ import java.io.Serializable; ...@@ -9,10 +9,9 @@ import java.io.Serializable;
public class LoginBean implements Serializable { public class LoginBean implements Serializable {
/** /**
* code : 0 * code : 0
* data : {"accountId":"14","siteId":"1","hxAccount":"49098890b5a046928c2b6c18d39a600a","accessToken":"2a8b919aa892408a93da80f78f468b60","hxPwd":"7a5qnMj3","headerImg":"http://dayuoss.oss-cn-beijing.aliyuncs.com/account/headerImg/b8ce5fc949c50a786c58eaba30dc5eab.jpg"} * data : {"accountId":"9","siteId":"1","hxAccount":"76717b28913c47ab9f421f5b5ff9f6e3","accessToken":"6dffd7fb44ec41acbc2d4144bab22071","hxPwd":"h7g8P4KK","headerImg":"https://dayuoss.oss-cn-beijing.aliyuncs.com/saas/WechatIMG46.png","token":"e6545561ebe140b3b0205a0324e95a09"}
* msg : 成功 * msg : 成功
*/ */
...@@ -46,29 +45,22 @@ public class LoginBean implements Serializable { ...@@ -46,29 +45,22 @@ public class LoginBean implements Serializable {
public static class DataBean { public static class DataBean {
/** /**
* accountId : 14 * accountId : 9
* siteId : 1 * siteId : 1
* hxAccount : 49098890b5a046928c2b6c18d39a600a * hxAccount : 76717b28913c47ab9f421f5b5ff9f6e3
* accessToken : 2a8b919aa892408a93da80f78f468b60 * accessToken : 6dffd7fb44ec41acbc2d4144bab22071
* hxPwd : 7a5qnMj3 * hxPwd : h7g8P4KK
* headerImg : http://dayuoss.oss-cn-beijing.aliyuncs.com/account/headerImg/b8ce5fc949c50a786c58eaba30dc5eab.jpg * headerImg : https://dayuoss.oss-cn-beijing.aliyuncs.com/saas/WechatIMG46.png
* token : e6545561ebe140b3b0205a0324e95a09
*/ */
private String accountId; private String accountId;
private String siteId; private String siteId;
private String hxAccount; private String hxAccount;
public String getAccessToken() {
return accessToken;
}
public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}
private String accessToken; private String accessToken;
private String hxPwd; private String hxPwd;
private String headerImg; private String headerImg;
private String token;
public String getAccountId() { public String getAccountId() {
return accountId; return accountId;
...@@ -93,6 +85,15 @@ public class LoginBean implements Serializable { ...@@ -93,6 +85,15 @@ public class LoginBean implements Serializable {
public void setHxAccount(String hxAccount) { public void setHxAccount(String hxAccount) {
this.hxAccount = hxAccount; this.hxAccount = hxAccount;
} }
public String getAccessToken() {
return accessToken;
}
public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}
public String getHxPwd() { public String getHxPwd() {
return hxPwd; return hxPwd;
} }
...@@ -108,5 +109,13 @@ public class LoginBean implements Serializable { ...@@ -108,5 +109,13 @@ public class LoginBean implements Serializable {
public void setHeaderImg(String headerImg) { public void setHeaderImg(String headerImg) {
this.headerImg = headerImg; this.headerImg = headerImg;
} }
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
} }
} }
app/src/main/java/com/dayu/bigfish/bean/LoginTestBean.java
...@@ -6,6 +6,7 @@ package com.dayu.bigfish.bean; ...@@ -6,6 +6,7 @@ package com.dayu.bigfish.bean;
public class LoginTestBean { public class LoginTestBean {
/** /**
* code : 0 * code : 0
* data : {"accountId":"407","siteId":"209","hxAccount":"bff06f06ea094d158b599908296b0aa1","accessToken":"b1ac52a96ab34f76ac42c55073dc0cfa","hxPwd":"ADsj63J8","token":"a53723f05fdd4532843eb5a3c9048a06"} * data : {"accountId":"407","siteId":"209","hxAccount":"bff06f06ea094d158b599908296b0aa1","accessToken":"b1ac52a96ab34f76ac42c55073dc0cfa","hxPwd":"ADsj63J8","token":"a53723f05fdd4532843eb5a3c9048a06"}
......
app/src/main/java/com/dayu/bigfish/eventbus/AgainUpDoorText.java
package com.dayu.bigfish.eventbus; package com.dayu.bigfish.eventbus;
/** /**
* Created by yu on 2017/9/20. * 需要再次上门
* on 2017/9/20.
*/ */
public class AgainUpDoorText { public class AgainUpDoorText {
......
app/src/main/java/com/dayu/bigfish/eventbus/OrderFinish.java
package com.dayu.bigfish.eventbus; package com.dayu.bigfish.eventbus;
/** /**
* Created by yu on 2017/9/20. * 订单完成
* on 2017/9/20.
*/ */
public class OrderFinish { public class OrderFinish {
......
app/src/main/java/com/dayu/bigfish/eventbus/RefreReceiveData.java
package com.dayu.bigfish.eventbus; package com.dayu.bigfish.eventbus;
/** /**
* 刷新待接单列表小圆点 * 刷新待接单列表，判断是否显示小红点
* on 2017/10/19. * on 2017/10/19.
*/ */
......
app/src/main/java/com/dayu/bigfish/eventbus/RefreshTabNum.java
package com.dayu.bigfish.eventbus; package com.dayu.bigfish.eventbus;
/** /**
* Created by yu on 2017/10/11. * 刷新各tab状态的数量
* on 2017/10/11.
*/ */
public class RefreshTabNum { public class RefreshTabNum {
......
app/src/main/java/com/dayu/bigfish/eventbus/TabFourRefresh.java
package com.dayu.bigfish.eventbus; package com.dayu.bigfish.eventbus;
/** /**
* 已取消 * 已取消列表
* on 2017/10/20. * on 2017/10/20.
*/ */
......
app/src/main/java/com/dayu/bigfish/eventbus/TabOneRefresh.java
package com.dayu.bigfish.eventbus; package com.dayu.bigfish.eventbus;
/** /**
* Created by yu on 2017/10/15. * 待预约列表
* on 2017/10/15.
*/ */
public class TabOneRefresh { public class TabOneRefresh {
......
app/src/main/java/com/dayu/bigfish/eventbus/TabThreeRefresh.java
package com.dayu.bigfish.eventbus; package com.dayu.bigfish.eventbus;
/** /**
* 异常单 * 异常单列表
* on 2017/10/20. * on 2017/10/20.
*/ */
......
app/src/main/java/com/dayu/bigfish/eventbus/UpdataTime.java
package com.dayu.bigfish.eventbus; package com.dayu.bigfish.eventbus;
/** /**
* Created by yu on 2017/9/20. * 修改预约时间
* on 2017/9/20.
*/ */
public class UpdataTime { public class UpdataTime {
......
app/src/main/java/com/dayu/bigfish/moudle/login/LoginPresenter.java
...@@ -83,35 +83,19 @@ public class LoginPresenter extends BasePresenter<LoginView> { ...@@ -83,35 +83,19 @@ public class LoginPresenter extends BasePresenter<LoginView> {
.execute(new StringCallback() { .execute(new StringCallback() {
@Override @Override
public void onSuccess(String s, Call call, Response response) { public void onSuccess(String s, Call call, Response response) {
/* Gson gson = new Gson(); str = s.substring(8, 9);
LoginBean loginBean = gson.fromJson(s, LoginBean.class);
if (loginBean.getCode() == 0) {
mloginView.loginSuccess(loginBean);
}else{
mloginView.loginFailed("验证码有误或您不是工程师");
}*/
str = s.substring(8, 9);
if (str.equals("1")) { if (str.equals("1")) {
//mloginView.loginFailed("验证码有误或您不是工程师");
mloginView.loginFailed("您还未通过审核"); mloginView.loginFailed("您还未通过审核");
return; return;
} else { } else {
Gson gson = new Gson(); Gson gson = new Gson();
//解析测试环境的bean
// LoginTestBean loginTestBean = gson.fromJson(s, LoginTestBean.class);
//解析正式环境的bean //解析正式环境的bean
LoginBean loginBean = gson.fromJson(s, LoginBean.class); LoginBean loginBean = gson.fromJson(s, LoginBean.class);
if (loginBean.getCode() == 0) { if (loginBean.getCode() == 0) {
mloginView.loginSuccess(loginBean); mloginView.loginSuccess(loginBean);
}else if (loginBean.getCode()== 4){ } else if (loginBean.getCode() == 2) {
mloginView.loginFailed("您还未通过审核,暂不能登录"); mloginView.loginFailed("验证码有误请重新输入");
} }
/* if (loginTestBean.getCode() == 0) {
mloginView.loginSuccess(loginTestBean);
}else if (loginTestBean.getCode()== 4){
mloginView.loginFailed("您还未通过审核,暂不能登录");
}*/
} }
} }
......
app/src/main/java/com/dayu/bigfish/moudle/login/LoginView.java
...@@ -12,7 +12,7 @@ import com.dayu.bigfish.bean.RegisterBean; ...@@ -12,7 +12,7 @@ import com.dayu.bigfish.bean.RegisterBean;
public interface LoginView { public interface LoginView {
//正式登录成功的回调 //正式登录成功的回调
void loginSuccess(LoginBean loginBean); void loginSuccess(LoginBean loginBean);
//测试登录成功的回调 //测试登录成功的回调
// void loginSuccess(LoginTestBean loginTestBean); // void loginSuccess(LoginTestBean loginTestBean);
//登录失败的回调 //登录失败的回调
......
app/src/main/java/com/dayu/bigfish/utils/DateUtils.java
package com.dayu.bigfish.utils; package com.dayu.bigfish.utils;
import android.util.Log;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import static cn.finalteam.toolsfinal.DateUtils.date; import static cn.finalteam.toolsfinal.DateUtils.date;
...@@ -14,6 +19,9 @@ import static cn.finalteam.toolsfinal.DateUtils.date; ...@@ -14,6 +19,9 @@ import static cn.finalteam.toolsfinal.DateUtils.date;
*/ */
public class DateUtils { public class DateUtils {
private List timeList = new ArrayList();
private String myYear;
/** /**
* 时间数据格式化 * 时间数据格式化
* 格式转换为--->年:月 * 格式转换为--->年:月
...@@ -25,6 +33,19 @@ public class DateUtils { ...@@ -25,6 +33,19 @@ public class DateUtils {
} }
public List getSystemTime() {
Calendar calendar = Calendar.getInstance();
String created = calendar.get(Calendar.YEAR) + "年"
+ (calendar.get(Calendar.MONTH) + 1) + "月"//从0计算
+ calendar.get(Calendar.DAY_OF_MONTH) + "日"
+ calendar.get(Calendar.HOUR_OF_DAY) + "时"
+ calendar.get(Calendar.MINUTE) + "分" + calendar.get(Calendar.SECOND) + "s";
timeList.add(calendar.get(Calendar.YEAR)); //年
timeList.add((calendar.get(Calendar.MONTH) + 1));//月
timeList.add(calendar.get(Calendar.DAY_OF_MONTH));//日
return timeList;
}
/** /**
* 时间数据格式化 * 时间数据格式化
* 格式转换为--->年:月 * 格式转换为--->年:月
...@@ -73,13 +94,14 @@ public class DateUtils { ...@@ -73,13 +94,14 @@ public class DateUtils {
String one;//第一次替换年 String one;//第一次替换年
String two;//第二次替换月 String two;//第二次替换月
String three;//第三次替换日 String three;//第三次替换日
one = time.replace("年","-"); one = time.replace("年", "-");
two = one.replace("月","-"); two = one.replace("月", "-");
three = two.replace("日"," "); three = two.replace("日", " ");
return three; return three;
} }
//获取手机系统时间转换为时间戳 //获取手机系统时间转换为时间戳
public String getTodayDateTime() { public String getTodayDateTime() {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss",
Locale.getDefault()); Locale.getDefault());
return format.format(new Date()); return format.format(new Date());
......
app/src/main/java/com/dayu/bigfish/utils/NetworkConnectChangedReceiver.java 0 → 100644
package com.dayu.bigfish.utils;
/**
* Created by yu on 2017/10/24.
*/
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.wifi.WifiManager;
import android.os.Parcelable;
import android.util.Log;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import org.greenrobot.eventbus.EventBus;
/**
* 网络改变监控广播
* <p>
* 监听网络的改变状态,只有在用户操作网络连接开关(wifi,mobile)的时候接受广播,
* 然后对相应的界面进行相应的操作，并将 状态 保存在我们的APP里面
* <p>
* <p>
* Created by xujun
*/
public class NetworkConnectChangedReceiver extends BroadcastReceiver {
private String getConnectionType(int type) {
String connType = "";
if (type == ConnectivityManager.TYPE_MOBILE) {
connType = "3G网络数据";
} else if (type == ConnectivityManager.TYPE_WIFI) {
connType = "WIFI网络";
}
return connType;
}
@Override
public void onReceive(Context context, Intent intent) {
if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(intent.getAction())) {// 监听wifi的打开与关闭，与wifi的连接无关
int wifiState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, 0);
Log.e("TAG", "wifiState:" + wifiState);
switch (wifiState) {
case WifiManager.WIFI_STATE_DISABLED:
break;
case WifiManager.WIFI_STATE_DISABLING:
break;
}
}
// 监听wifi的连接状态即是否连上了一个有效无线路由
if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(intent.getAction())) {
Parcelable parcelableExtra = intent
.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
if (null != parcelableExtra) {
// 获取联网状态的NetWorkInfo对象
NetworkInfo networkInfo = (NetworkInfo) parcelableExtra;
//获取的State对象则代表着连接成功与否等状态
NetworkInfo.State state = networkInfo.getState();
//判断网络是否已经连接
boolean isConnected = state == NetworkInfo.State.CONNECTED;
Log.e("TAG", "isConnected:" + isConnected);
if (isConnected) {
} else {
}
}
}
// 监听网络连接，包括wifi和移动数据的打开和关闭,以及连接上可用的连接都会接到监听
if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction())) {
//获取联网状态的NetworkInfo对象
NetworkInfo info = intent
.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);
if (info != null) {
//如果当前的网络连接成功并且网络连接可用
if (NetworkInfo.State.CONNECTED == info.getState() && info.isAvailable()) {
if (info.getType() == ConnectivityManager.TYPE_WIFI
|| info.getType() == ConnectivityManager.TYPE_MOBILE) {
EventBus.getDefault().post(new RefreshTabNum(0));
}
} else {
ToastUtils.showShortToast("网络断开,请检查网络");
}
}
}
}
}
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