Skip to content

android / dayu

Go to a project
Commit 2985d50f by yu
Options

end

parent fc87f381
Expand all
Inline Side-by-side
Showing with 905 additions and 591 deletions
.idea/dictionaries/yu.xml deleted 100755 → 0
<component name="ProjectDictionaryState">
<dictionary name="yu" />
</component>
\ No newline at end of file
.idea/inspectionProfiles/Project_Default.xml deleted 100755 → 0
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="AndroidLintGradleCompatible" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
</inspection_tool>
</profile>
</component>
\ No newline at end of file
.idea/inspectionProfiles/profiles_settings.xml deleted 100755 → 0
<component name="InspectionProjectProfileManager">
<settings>
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_PROFILE" value="true" />
<version value="1.0" />
</settings>
</component>
\ No newline at end of file
.idea/misc.xml
......@@ -43,4 +43,20 @@
<component name="ProjectType">
<option name="id" value="Android" />
</component>
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>
\ No newline at end of file
.idea/modules.xml
......@@ -2,8 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/BigFish.iml" filepath="$PROJECT_DIR$/BigFish.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/dayu-saas-android.iml" filepath="$PROJECT_DIR$/dayu-saas-android.iml" />
</modules>
</component>
</project>
\ No newline at end of file
app/build.gradle
......@@ -59,9 +59,9 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:recyclerview-v7:22.0.2'
compile 'com.android.support:appcompat-v7:24.0.0'
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
//compile 'com.android.support:recyclerview-v7:22.0.2'
//compile 'com.android.support:appcompat-v7:24.0.0'
// compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
testCompile 'junit:junit:4.12'
//网络请求框架 https://github.com/jeasonlzy/okhttp-OkGo
compile 'com.lzy.net:okgo:2.1.4'
......@@ -105,4 +105,6 @@ dependencies {
compile 'com.afollestad.material-dialogs:core:0.8.5.9'
compile files('libs/xUtils-2.6.14.jar')
// compile project(path: ':easeui')
//RxJava扩展支持，根据需要添加
//compile 'com.lzy.net:okrx:+'
}
app/src/main/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?>
<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"/>
//检测联网方式，区分用户设备使用的是2G、3G或是WiFi
......@@ -22,7 +20,6 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<application
android:name=".application.MyApplication"
android:allowBackup="true"
......@@ -42,7 +39,7 @@
android:hardwareAccelerated="true"
/>
//友盟统计相关配置:
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
<uses-sdk android:minSdkVersion="8"></uses-sdk>
//配置应用Appkey
<meta-data android:value="599a41697f2c743210000990"
android:name="UMENG_APPKEY"/>
......@@ -64,7 +61,6 @@
<action android:name="android.intent.action.PACKAGE_REMOVED"/>
<data android:scheme="package"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
<action android:name="android.intent.action.USER_PRESENT" />
......@@ -78,7 +74,6 @@
<activity android:name=".activity.UpdataSubscribeTimeActivity"/>
<activity android:name=".activity.AgainVisitActivity"/>
<activity android:name=".activity.OrderDetailsActivity"/>
<activity android:name=".activity.StartActivity"/>
<activity android:name=".activity.OrderFinishActivity"/>
<activity android:name=".activity.HandleListActivity"/>
<activity android:name=".activity.DeleteActivty"/>
......@@ -87,6 +82,7 @@
<activity android:name=".activity.IdeaActivity"/>
<activity android:name=".activity.WorksheetRecordActivity"/>
<activity android:name=".activity.MessageActivity"/>
<activity android:name=".activity.BigFishMessageContent"/>
</application>
</manifest>
\ No newline at end of file
app/src/main/java/com/dayu/bigfish/MainActivity.java
......@@ -23,6 +23,7 @@ import android.support.v7.app.NotificationCompat;
import android.view.Window;
import android.view.WindowManager;
import android.widget.Toast;
import com.dayu.bigfish.activity.HomeActivity;
import com.dayu.bigfish.activity.LoginActivity;
import com.dayu.bigfish.activity.MessageActivity;
......@@ -31,14 +32,18 @@ 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.RefreReceiveData;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.managers.UserManager;
import com.dayu.bigfish.utils.LogUtils;
import com.dayu.bigfish.utils.ToastUtils;
import com.google.gson.Gson;
import com.hyphenate.EMConnectionListener;
import com.hyphenate.EMError;
import com.hyphenate.EMMessageListener;
import com.hyphenate.chat.EMClient;
import com.hyphenate.chat.EMMessage;
import com.hyphenate.util.NetUtils;
import com.lidroid.xutils.HttpUtils;
import com.lidroid.xutils.exception.HttpException;
import com.lidroid.xutils.http.ResponseInfo;
......@@ -51,14 +56,15 @@ import org.greenrobot.eventbus.EventBus;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import okhttp3.Call;
import okhttp3.Response;
import static android.os.Build.ID;
public class MainActivity extends AppCompatActivity {
/* public String name;
public String pwd;*/
/* public String name;
public String pwd;*/
/* private UserInfo userInfo = new UserInfo();
private String hxUserId;
private String hxUserPwd;
......@@ -67,13 +73,12 @@ public class MainActivity extends AppCompatActivity {
private ProgressDialog pd; //进度条对话框
NotificationManager manager;
int ID = 0x123;
private String str;
private String strTwo;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// hxUserId = (String) SPUtils.get(this, "big_fish", "HXUSER_ID", "");
// hxUserPwd = (String) SPUtils.get(this, "big_fish", "HXUSER_PWD", "");
// supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
//取消状态栏
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
......@@ -88,9 +93,10 @@ public class MainActivity extends AppCompatActivity {
//userInfo没有找到关于用户的信息，打开登录页面
startLoginActivity();
}
//注册监听
//注册环信消息监听
EMClient.getInstance().chatManager().addMessageListener(msgListener);
//注册一个监听连接状态的listener
EMClient.getInstance().addConnectionListener(new MyConnectionListener());
}
private void startHomeActivity() {
......@@ -110,20 +116,22 @@ public class MainActivity extends AppCompatActivity {
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
@Override
public void onMessageReceived(List<EMMessage> messages) {
//收到消息
for (EMMessage list : messages) {
EventBus.getDefault().post(new RefreshTabNum(1));
System.out.println("收到消息" + list.getBody());
System.out.println("----->----->" + list.ext());
//异步刷新各Tab状态数量
EventBus.getDefault().post(new RefreshTabNum(0));
Intent intent = new Intent(MainActivity.this, MessageActivity.class);
PendingIntent pi = PendingIntent.getActivity(MainActivity.this,
0, intent, 0);
String str=list.getBody().toString();
str=str.substring(3);
str = list.getBody().toString();
str = str.substring(5);
strTwo = str.substring(0, str.length() - 1);
//str=str.Substring(3);
Gson gson = new Gson();
InformBean informBean = gson.fromJson(list.ext().toString(), InformBean.class);
//如果getFunctionType==2表示为待接单的消息,不需要通知,直接刷新待接单红点
Notification.Builder builder = new Notification.Builder(MainActivity.this);
builder
......@@ -134,10 +142,10 @@ public class MainActivity extends AppCompatActivity {
// 设置通知的图标
.setSmallIcon(R.mipmap.logo)
// 设置通知的标题
// .setContentTitle(list.getFrom())
// .setContentTitle(list.getFrom())
.setContentTitle(informBean.getTitle())
// 设置通知的内容
.setContentText(str)
.setContentText(strTwo)
// 设置使用系统默认的声音、LED
.setDefaults(
Notification.DEFAULT_LIGHTS
......@@ -171,6 +179,8 @@ public class MainActivity extends AppCompatActivity {
//收到透传消息
for (EMMessage list : messages) {
// ToastUtils.showShortToast("收到CMD消息");
//显示小红点
EventBus.getDefault().post(new RefreReceiveData(0));
System.out.println("收到CMD消息" + list.getBody());
LogUtils.d("收到CMD消息", list.getBody().toString());
}
......@@ -198,6 +208,37 @@ public class MainActivity extends AppCompatActivity {
}
};
//实现ConnectionListener接口 监听环信连接状态
private class MyConnectionListener implements EMConnectionListener {
@Override
public void onConnected() {
}
@Override
public void onDisconnected(final int error) {
runOnUiThread(new Runnable() {
@Override
public void run() {
if (error == EMError.USER_REMOVED) {
// 显示帐号已经被移除
} else if (error == EMError.USER_LOGIN_ANOTHER_DEVICE) {
// 显示帐号在其他设备登录
} else {
if (NetUtils.hasNetwork(MainActivity.this)) {
//连接不到聊天服务器
} else {
//当前网络不可用，请检查网络设置
}
}
}
});
}
}
private void startLoginActivity() {
new Thread(new Runnable() {
@Override
......@@ -213,7 +254,5 @@ public class MainActivity extends AppCompatActivity {
}
}
app/src/main/java/com/dayu/bigfish/activity/AboutUs.java
......@@ -14,6 +14,7 @@ import butterknife.OnClick;
/**
* 关于我们
* on 2017/9/21.
* Created by MrWang
*/
public class AboutUs extends Activity {
......
app/src/main/java/com/dayu/bigfish/activity/AgainUpDoorActivity.java
......@@ -48,7 +48,9 @@ import static cn.finalteam.toolsfinal.DateUtils.calendar;
import static cn.finalteam.toolsfinal.DateUtils.getTime;
/**
* Created by yu on 2017/9/20.
* 修改预约上门时间
* on 2017/9/20.
* Created by MrWang
*/
public class AgainUpDoorActivity extends Activity {
......@@ -86,6 +88,7 @@ public class AgainUpDoorActivity extends Activity {
private String edValue;
private String token;
private DateUtils dateUtils = new DateUtils();
private int finshPosition;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
......@@ -100,6 +103,7 @@ public class AgainUpDoorActivity extends Activity {
public void initData() {
Intent intent = getIntent();
String value = intent.getStringExtra("orderId");
finshPosition = intent.getIntExtra("position",0);
System.out.println("ding订单id为------>" + value);
orderId = Integer.parseInt(value);
}
......@@ -231,7 +235,7 @@ public class AgainUpDoorActivity extends Activity {
ToastUtils.showShortToast("数据提交成功");
dialog.dismiss();
finish();
EventBus.getDefault().post(new AgainUpDoorText(2));
EventBus.getDefault().post(new AgainUpDoorText(finshPosition));
}
public void failed() {
......
app/src/main/java/com/dayu/bigfish/activity/AgainVisitActivity.java
......@@ -19,7 +19,9 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* Created by yu on 2017/9/13.
* 需要再次上门
* on 2017/9/13.
* Created by MrWang
*/
public class AgainVisitActivity extends BaseActivity<AgainVisitView, AgainVisitPresenter> implements AgainVisitView {
......
app/src/main/java/com/dayu/bigfish/activity/BigFishMessageContent.java 0 → 100644
package com.dayu.bigfish.activity;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.widget.ImageView;
import android.widget.TextView;
import com.dayu.bigfish.R;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 大鱼通知详情页，可跟具体需求决定这个页面要还是不要
* on 2017/10/16.
* Created by MrWang
*/
public class BigFishMessageContent extends Activity {
@BindView(R.id.message_content_back_image)
ImageView messageContentBackImage;
@BindView(R.id.message_text_title)
TextView messageTextTitle;
@BindView(R.id.message_time)
TextView messageTime;
@BindView(R.id.message_content)
TextView messageContent;
private String message_content;
private String message_time;
private String message_title;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_message_content);
ButterKnife.bind(this);
initData();
initView();
}
public void initData() {
Intent intent = getIntent();
message_title = intent.getStringExtra("message_title");
message_content = intent.getStringExtra("content");
message_time = intent.getStringExtra("content_time");
}
public void initView() {
messageTextTitle.setText(message_title);
messageTime.setText(message_time);
messageContent.setText(message_content);
}
@OnClick(R.id.message_content_back_image)
public void onViewClicked() {
finish();
}
}
app/src/main/java/com/dayu/bigfish/activity/DeleteActivty.java
......@@ -24,8 +24,9 @@ import butterknife.OnClick;
import cn.finalteam.galleryfinal.model.PhotoInfo;
/**
* Created by Administration on 2016/12/2.
* 删除图片页面
* 删除选中图片页面
* on 2016/12/2.
* Created by MrWang
*/
public class DeleteActivty extends Activity {
@BindView(R.id.gallery_back)
......
app/src/main/java/com/dayu/bigfish/activity/HandleListActivity.java
......@@ -42,8 +42,9 @@ import cn.finalteam.galleryfinal.widget.GFImageView;
import static com.dayu.bigfish.R.mipmap.photo_icon;
/**
* Created by Administrator on 2017/9/19.
* 处理工单
* 处理工单-选择图片
* on 2017/9/19.
* Created by MrWang
*/
public class HandleListActivity extends BaseActivity<HandleListView, HandleListPresenter> implements HandleListView {
......@@ -159,7 +160,7 @@ public class HandleListActivity extends BaseActivity<HandleListView, HandleListP
startActivity(intent);
return;
}*/
functionConfigBuilder.setEnableCamera(true);//是否开启相机
functionConfigBuilder.setEnableCamera(true);//是否开启相机
// }
final FunctionConfig functionConfig = functionConfigBuilder.build();
CoreConfig coreConfig = new CoreConfig.Builder(HandleListActivity.this, imageLoader, theme)
......
app/src/main/java/com/dayu/bigfish/activity/IdeaActivity.java
......@@ -19,7 +19,6 @@ import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
......@@ -28,7 +27,9 @@ import static android.R.attr.id;
import static com.dayu.bigfish.utils.GetUserInfo.getACCOUNT_ID;
/**
* Created by yu on 2017/9/26.
* 设置页面 --反馈提交
* on 2017/9/26.
* Created by yu
*/
public class IdeaActivity extends BaseActivity<IdeaActivityView, IdeaActivityPresenter> implements IdeaActivityView {
......
app/src/main/java/com/dayu/bigfish/activity/LoginActivity.java
......@@ -113,13 +113,16 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
token = loginBean.getData().getAccessToken();
hxUserId = loginBean.getData().getHxAccount();
hxUserPwd = loginBean.getData().getHxPwd();
UserManager.getInstance().saveUserInfo(this,accountId,siteId,token,hxUserId,hxUserPwd);
imageUrl = loginBean.getData().getHeaderImg();
if (TextUtils.isEmpty(imageUrl)){
imageUrl = "暂无头像";
}
UserManager.getInstance().saveUserInfo(this,accountId,siteId,token,hxUserId,hxUserPwd,imageUrl);
System.out.println("存入的工程师id为----->"+accountId);
System.out.println("存入的站点id为----->"+siteId);
System.out.println("存入的token为----->"+token);
System.out.println("存入的工程师环信账号为----->"+hxUserId);
System.out.println("存入的工程师环信密码为----->"+hxUserPwd);
imageUrl = loginBean.getData().getHeaderImg();
if (TextUtils.isEmpty(imageUrl)) {
ToastUtils.showShortToast("该工程师暂无头像");
Intent intent = new Intent(this,HomeActivity.class);
......@@ -128,7 +131,6 @@ public class LoginActivity extends BaseActivity<LoginView, LoginPresenter> imple
}else{
//ToastUtils.showShortToast("该工程师暂无头像");
Intent intent = new Intent(this,HomeActivity.class);
intent.putExtra("imageUrl",imageUrl);
startActivity(intent);
finish();
}
......
app/src/main/java/com/dayu/bigfish/activity/MessageActivity.java 100644 → 100755
......@@ -24,7 +24,9 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* Created by yu on 2017/10/14.
* 消息中心页面，包含两个Fragment
* 2017/10/14.
* Created by yu
*/
public class MessageActivity extends FragmentActivity {
......@@ -57,7 +59,7 @@ public class MessageActivity extends FragmentActivity {
list = new ArrayList<>();
list.add(new SystemMessageFragment());
list.add(new BigFishMessageFragment());
fragmentAdapter = new FragmentOrderAdapter(getSupportFragmentManager(),list);
fragmentAdapter = new FragmentOrderAdapter(getSupportFragmentManager(), list);
messageViewPager.setAdapter(fragmentAdapter);
messageTablayout.setupWithViewPager(messageViewPager);
messageTablayout.removeAllTabs();
......@@ -73,5 +75,4 @@ public class MessageActivity extends FragmentActivity {
}
}
\ No newline at end of file
app/src/main/java/com/dayu/bigfish/activity/OrderDetailsActivity.java
......@@ -29,7 +29,7 @@ import static android.net.wifi.p2p.nsd.WifiP2pServiceRequest.newInstance;
import static java.lang.Integer.parseInt;
/**
* 工单详情和服务记录
* 工单详情信息页面，包含工单详情和服务记录
* on 2017/9/13.
*/
......
app/src/main/java/com/dayu/bigfish/activity/OrderFinishActivity.java
package com.dayu.bigfish.activity;
import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Environment;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
......@@ -16,6 +20,7 @@ import android.widget.EditText;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
......@@ -77,8 +82,9 @@ import static com.dayu.bigfish.utils.SPUtils.get;
import static com.umeng.analytics.pro.dm.i;
/**
* 工程师提交验收报告
* 工程师提交验收报告，包含上传照片
* on 2017/9/15.
* Created by yu
*/
public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, OrderFinishActivityPresenter> implements OrderFinishActivityView {
......@@ -198,10 +204,15 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
private String payRemark;
private Boolean isSwitch;
private String categoryName; //产品名称
private String token;
private String token;
private String value;
private int finshPosition;
public void initData() {
Intent intent = getIntent();
String value = intent.getStringExtra("orderId");
value = intent.getStringExtra("orderId");
finshPosition = intent.getIntExtra("position",0);
orderId = Integer.parseInt(value);
engineerId = GetUserInfo.getACCOUNT_ID(this);
mIvs = new ImageView[]{imageOne, imageTwo, imageThree, imageFoure, imageFive};
......@@ -247,7 +258,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
initData();
initView();
dialog.show();
orderFinishActivityPresenter.getInitData(orderId,token);
orderFinishActivityPresenter.getInitData(orderId, token);
}
......@@ -257,6 +268,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
@Override
public void initView() {
isSwitch = (boolean) get(this, "big_fish", "imageSwitch", false);
//ToastUtils.showShortToast(isSwitch+"");
if (isSwitch) {
......@@ -284,6 +296,28 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
mIvs[4].setClickable(false);
}
private void forRequset() {
if(ContextCompat.checkSelfPermission( OrderFinishActivity.this, Manifest.permission.CAMERA)!= PackageManager.PERMISSION_GRANTED)
{
ActivityCompat.requestPermissions(OrderFinishActivity.this, new String[]{Manifest.permission.CAMERA}, 1);
}
}
@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
if (requestCode == 1) {
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
//权限获取成功
createPicture();
} else {
//权限被拒绝
Toast.makeText(OrderFinishActivity.this, "很遗憾你把相机权限禁用了。请务必开启相机权限享受我们提供的服务吧。", Toast.LENGTH_SHORT)
.show();
return;
}
}
}
@Override
public void initDataSuccess(CheckOrderInit checkOrderInit) {
......@@ -313,14 +347,13 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
public void success() {
ToastUtils.showShortToast("数据提交成功");
SPUtils.clear(this, "big_fish_two");
finish();
EventBus.getDefault().post(new RefreshTabNum(1));
EventBus.getDefault().post(new OrderFinish(3));
//EventBus.getDefault().post(new RefreshTabNum(1));
EventBus.getDefault().post(new OrderFinish(finshPosition));
dialog.dismiss();
finish();
}
public void failed() {
EventBus.getDefault().post(new RefreshTabNum(1));
ToastUtils.showShortToast("提交失败!");
dialog.dismiss();
......@@ -343,7 +376,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
// listTwo = list;
orderFinishActivityPresenter.postPhotoSubmit(list, orderId, serveValue1,
engineerId, isPay, upDoorCost, payRemark,
serveCost, cailiaoCost, otherCost,token);
serveCost, cailiaoCost, otherCost, token);
}
@Override
......@@ -444,9 +477,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
iamgeUrl.add(mInfos.get(a).getPhotoPath());
}
compressWithLs(iamgeUrl);
}
else
{
} else {
serveValue1 = etInput.getText().toString();
upDoorCost = editDoorValue.getText().toString();
serveCost = editServeValue.getText().toString();
......@@ -455,13 +486,14 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
payRemark = etUpInput.getText().toString();
orderFinishActivityPresenter.postSubmit(orderId, serveValue1,
engineerId, isPay, upDoorCost, payRemark,
serveCost, cailiaoCost, otherCost,token);
serveCost, cailiaoCost, otherCost, token);
}
break;
//选择图片
case R.id.image_one:
ToastUtils.showShortToast("点击了");
createPicture();
forRequset();
// createPicture();
break;
case R.id.image_two:
delete(1);
......@@ -490,7 +522,6 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
@Override
public void onStart() {
}
@Override
public void onSuccess(File file) {
ToastUtils.showShortToast("压缩成功");
......@@ -510,7 +541,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
String path = file.getAbsolutePath();
mImageList.add(path);
if (mImageList.size() == iamgeUrl.size()) {
orderFinishActivityPresenter.upPhoto(mImageList, orderId,token);
orderFinishActivityPresenter.upPhoto(mImageList, orderId, token);
}
}
......@@ -538,6 +569,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
}
return path;
}
private void delete(int i) {
Intent intent = new Intent(this, DeleteActivty.class);
intent.putExtra(Constants.BUNDLE_KEY_ID, i);
......@@ -567,6 +599,7 @@ public class OrderFinishActivity extends BaseActivity<OrderFinishActivityView, O
startActivity(intent);
return;
}*/
functionConfigBuilder.setEnableCamera(true);//是否开启相机
// }
final FunctionConfig functionConfig = functionConfigBuilder.build();
......
app/src/main/java/com/dayu/bigfish/activity/ReceivingActivity.java
......@@ -7,6 +7,7 @@ import android.support.v4.widget.SwipeRefreshLayout;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.TextView;
......@@ -22,7 +23,6 @@ import com.dayu.bigfish.tip.TipsHelper;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import com.dayu.bigfish.views.RefreListView;
import org.greenrobot.eventbus.EventBus;
......@@ -34,8 +34,9 @@ import butterknife.OnClick;
/**
* 接单列表
* 待接单列表
* on 2017/8/28.
* Created by yu
*/
public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPresenter> implements ReceivingView, Receiving {
......@@ -50,17 +51,18 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
SwipeRefreshLayout receivingRefersh;
@BindView(R.id.order_title_num)
TextView orderTitleNum;
@BindView(R.id.receiving_listview)
RefreListView receivingListview;
@BindView(R.id.image_empty)
ImageView imageEmpty;
@BindView(R.id.textView_empty)
TextView textViewEmpty;
@BindView(R.id.view)
RelativeLayout view;
/* @BindView(R.id.receiving_listview)
ListView receivingListview;*/
@BindView(R.id.receiving_listview)
ListView receivingListview;
/* @BindView(R.id.receiving_listview)
ListView receivingListview;*/
private int userId;
private CustomProgressDialog dialog;
TipsHelper mTipsHelper;
private String token;
......@@ -77,6 +79,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_receiving);
ButterKnife.bind(this);
userId = GetUserInfo.getACCOUNT_ID(this);
token = GetUserInfo.getToken(this);
dialog = new CustomProgressDialog(this, R.style.CustomDialog);
//初始化receivingRefersh的颜色
......@@ -84,7 +87,6 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
initView();
//下拉刷新的监听
initListener();
// initData();
}
......@@ -100,7 +102,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
}
});
receivingRefersh.setOnRefreshListener(
() -> initNetWork(1, 1, 10, GetUserInfo.getSITE_ID(ReceivingActivity.this)));
() -> initNetWork(1, 1, 20, GetUserInfo.getSITE_ID(ReceivingActivity.this)));
}
@Override
......@@ -120,18 +122,16 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
receivingRefersh.setRefreshing(true);
}
});
initNetWork(1, 1, 10, GetUserInfo.getSITE_ID(this));
initNetWork(1, 1, 20, GetUserInfo.getSITE_ID(this));
}
@Override
public void initData() {
//初始化适配器
}
//请求列表数据
public void initNetWork(int getState, int pagerId, int PagerSize, int siteId) {
mReceivingPresenter.get(getState, pagerId, PagerSize, siteId, token);
mReceivingPresenter.get(getState, pagerId, PagerSize, siteId, token, userId);
}
@Override
......@@ -144,16 +144,6 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
public void onViewClicked() {
finish();
}
//网络请求成功的回调
/* @Override
public void loginSuccess(ReceivingBean receivingBean) {
list = receivingBean.getData().getData();
mReceiviingAdapter = new ReceivingAdapter(this, list, this);
receivingListview.setAdapter(mReceiviingAdapter);
}*/
@Override
public void loginSuccess(ReceivingBean receivingBean) {
......@@ -189,15 +179,18 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
//网络请求失败的回调
@Override
public void loginFailed(String msg) {
ToastUtils.showShortToast(msg);
}
//接单成功之后的回调
/**
* 接单成功的回调
* */
@Override
public void receivingSuccess() {
ToastUtils.showShortToast("接单成功");
EventBus.getDefault().post(new RefreshTabNum(1));
initNetWork(1, 1, 10, GetUserInfo.getSITE_ID(this));
//initNetWork(1, 1, 20, GetUserInfo.getSITE_ID(this));
//接单成功,刷新首页tab状态数量
EventBus.getDefault().post(new RefreshTabNum(0));
dialog.dismiss();
finish();
}
......@@ -206,81 +199,15 @@ public class ReceivingActivity extends BaseActivity<ReceivingView, ReceivingPres
public void refershFailed(String msg) {
dialog.dismiss();
receivingRefersh.post(() -> receivingRefersh.setRefreshing(false));
mTipsHelper.showError(true, msg, v -> {
initNetWork(1, 1, 10, GetUserInfo.getSITE_ID(this));
dialog.show();
});
view.setVisibility(View.VISIBLE);
receivingListview.setVisibility(View.GONE);
}
//接单的回调
@Override
public void receivingOrder(int orderId) {
// ToastUtils.showShortToast(orderId+"");
int userId = GetUserInfo.getACCOUNT_ID(this);
dialog.show();
mReceivingPresenter.receivingOrder(orderId, userId, token);
}
/* @Override
public void onScrollStateChanged(AbsListView view, int scrollState) {
if(last_index == total_index && (scrollState == AbsListView.OnScrollListener.SCROLL_STATE_IDLE))
{
//表示此时需要显示刷新视图界面进行新数据的加载(要等滑动停止)
if(!isLoading)
{
//不处于加载状态的话对其进行加载
isLoading = true;
//设置刷新界面可见
loadmoreView.setVisibility(View.VISIBLE);
onLoad();
}
}
}
*/
/* private void onLoad() {
try {
//模拟耗时操作
Thread.sleep(2000);
} catch (InterruptedException e) {
e.printStackTrace();
}
initNetWork(1,3,10);
if(mReceiviingAdapter == null) {
mReceiviingAdapter = new ReceivingAdapter(this, list, this);
receivingListview.setAdapter(mReceiviingAdapter);
}else
{
mReceiviingAdapter.updataView(list);
}
loadComplete();//刷新结束
}
*/
/**
* 加载完成
*/
/* public void loadComplete()
{
loadmoreView.setVisibility(View.GONE);//设置刷新界面不可见
isLoading = false;//设置正在刷新标志位false
//this.invalidateOptionsMenu();
receivingListview.removeFooterView(loadmoreView);//如果是最后一页的话，则将其从ListView中移出
}*/
/* @Override
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
last_index = firstVisibleItem+visibleItemCount;
total_index = totalItemCount;
System.out.println("last: "+last_index);
System.out.println("total: "+total_index);
}
*/
/* @Override
public void notiyfl() {
//刷新了适配器
mReceiviingAdapter.notifyDataSetChanged();
ToastUtils.showShortToast("!!!!刷新了适配器");
}*/
}
app/src/main/java/com/dayu/bigfish/activity/SettingActivity.java
......@@ -148,7 +148,7 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
case R.id.set_kefu_phone:
Intent intent1 = new Intent(Intent.ACTION_DIAL);
//4000086898
intent1.setData(Uri.parse("tel:400-008-6898"));
intent1.setData(Uri.parse("tel:400-0086-898"));
startActivity(intent1);
break;
//关于我们
......@@ -175,17 +175,23 @@ public class SettingActivity extends BaseActivity<SettingActivityView, SettingAc
break;
}
}
/**
* 获取新版本成功的回调,此回调内如果升级可直接进行更新升级操作
* */
@Override
public void updata_success(BaseStringBean baseStringBeanBean) {
ToastUtils.showShortToast("新版本号为:"+baseStringBeanBean.getData());
}
/**
* 获取新版本失败的回调
* */
@Override
public void updata_failed(String msg) {
ToastUtils.showShortToast(msg);
}
/**
* 网络请求失败或者异常的回调
* */
@Override
public void error(String msg) {
ToastUtils.showShortToast(msg);
......
app/src/main/java/com/dayu/bigfish/activity/StartActivity.java deleted 100755 → 0
package com.dayu.bigfish.activity;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.BaseBean;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.google.gson.Gson;
import com.lzy.okgo.OkGo;
import com.lzy.okgo.callback.StringCallback;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import okhttp3.Call;
import okhttp3.Response;
/**
* on 2017/9/14.
*/
public class StartActivity extends Activity {
@BindView(R.id.button_one)
Button buttonOne;
@BindView(R.id.button_two)
Button buttonTwo;
@BindView(R.id.button_three)
Button buttonThree;
private int orderId;
private boolean isStart = false;
private String token;
// private boolean isServe = true;
private void initData() {
Intent intent = getIntent();
String value = intent.getStringExtra("orderId");
orderId = Integer.parseInt(value);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_begin_start);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
token = GetUserInfo.getToken(this);
initData();
}
@OnClick({R.id.button_one, R.id.button_two,R.id.button_three})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.button_one:
//isStart = false 不等于true 说明工程师还未出发
//开始出发
initStart(orderId,token);
break;
case R.id.button_two:
if (isStart) {
initServe(orderId,token);
buttonThree.setVisibility(View.VISIBLE);
} else {
ToastUtils.showShortToast("您还未出发,不能开始服务");
return;
}
//关闭本页面
// finish();
break;
case R.id.button_three:
Intent intent = new Intent(StartActivity.this,OrderFinishActivity.class);
intent.putExtra("orderId",orderId+"");
startActivity(intent);
ToastUtils.showShortToast("处理工单,申请验收");
finish();
break;
}
}
public void initStart(final int orderId,String token) {
System.out.println("开始出发的工单id--->" + orderId);
OkGo.get(Constants.START_ORDER + orderId)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
System.out.println(s);
Gson gson = new Gson();
BaseBean baseBean = gson.fromJson(s, BaseBean.class);
if (baseBean.getCode()==0){
ToastUtils.showShortToast("订单编号为:" + orderId + "--工程师已开始出发");
isStart = true;
}else{
ToastUtils.showShortToast("数据提交失败");
}
}
@Override
public void onError(Call call, Response response, Exception e) {
System.out.println(call);
}
});
}
public void initServe(final int orderId,String token) {
System.out.println("开始服务的工单id" + orderId);
OkGo.get(Constants.START_SERVE + orderId)
.tag(this)
.headers("token",token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
Gson gson = new Gson();
BaseBean baseBean = gson.fromJson(s, BaseBean.class);
if(baseBean.getCode()==0){
ToastUtils.showShortToast("订单编号为:" + orderId + "--工程师已开始服务");
isStart = false;
}else{
ToastUtils.showShortToast("开始服务数据提交失败");
}
}
@Override
public void onError(Call call, Response response, Exception e) {
super.onError(call, response, e);
}
});
}
/*public void againVisit(final int orderId) {
System.out.println("开始服务的工单id" + orderId);
OkGo.get(Constants.START_SERVE + orderId)
.tag(this)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
ToastUtils.showShortToast("订单编号为:" + orderId + "--工程师已开始服务");
isStart = false;
}
@Override
public void onError(Call call, Response response, Exception e) {
super.onError(call, response, e);
}
});
}*/
}
app/src/main/java/com/dayu/bigfish/activity/SubscribeTimeActivity.java
......@@ -25,6 +25,7 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.BaseBean;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.eventbus.TabOneRefresh;
import com.dayu.bigfish.moudle.subscribe.SubscribeTimePresenter;
import com.dayu.bigfish.moudle.subscribe.SubscribeTimeView;
import com.dayu.bigfish.utils.DateUtils;
......@@ -60,7 +61,7 @@ import static com.dayu.bigfish.utils.TimeUtils.Date2ms;
import static com.dayu.bigfish.utils.TimeUtils.dataOne;
/**
* wangceyu
* 预约上门时间
* on 2017/9/9.
*/
......@@ -101,7 +102,10 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
private String edValue;
private CustomProgressDialog dialog;
private String token;
private DateUtils dateUtils = new DateUtils();
private DateUtils dateUtils = new DateUtils();
private String timeValue;
private String time;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -116,6 +120,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
@Override
public void initListener() {
}
@Override
......@@ -130,10 +135,18 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
orderId = Integer.parseInt(value);
}
public void initNetWork(int orderId, String doorTime, String doorComment,String token) {
/**
* 预约时间的网络请求
* 因考虑到此处记录状态操作后期可能会有频繁变化，所以就直接写在活动里了
*建议项目中类似网络请求代码都规范到P层
* @param orderId 工单Id
* @param doorTime 上门时间(标准时间戳格式)
* @param doorComment 上门备注
*/
public void initNetWork(int orderId, String doorTime, String doorComment, String token) {
OkGo.post(Constants.ORDER_DOOR)
.tag(this)
.headers("token",token)
.headers("token", token)
.params("orderId", orderId)
//params("doorTime", calendar.getTime().toString())
.params("doorTime", doorTime)
......@@ -141,12 +154,13 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
System.out.println("预约时间的响 "+ s);
System.out.println("预约时间的响 " + s);
Gson gson = new Gson();
BaseBean baseBean = gson.fromJson(s, BaseBean.class);
if (baseBean.getCode() == 0) {
ToastUtils.showShortToast("预约时间成功,请移至待服务列表查看");
EventBus.getDefault().post(new RefreshTabNum(1));
EventBus.getDefault().post(new RefreshTabNum(1));
//EventBus.getDefault().post(new TabOneRefresh(0));
dialog.dismiss();
}
// refershAdapter.refershAdapter();
......@@ -155,7 +169,7 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
@Override
public void onError(Call call, Response response, Exception e) {
ToastUtils.showShortToast("网络异常");
ToastUtils.showShortToast("网络异常");
}
});
}
......@@ -180,15 +194,11 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
return;
} else {
/* dialog.show();
dialog.dismiss();*/
ToastUtils.showShortToast("正在提交数据......");
/* long time = TimeUtils.Date2ms(textDateValue.getText().toString()+textTimeValue.getText().toString());
System.out.println(time);*/
String time= dateUtils.stringTimeTo(textDateValue.getText().toString());
String timeValue = time+textTimeValue.getText().toString()+":00";
initNetWork(orderId, timeValue, edValue,token);
//将控件拿到的时间 通过DateUtils工具类转换为标准时间戳格式提交到服务器
time = dateUtils.stringTimeTo(textDateValue.getText().toString());
timeValue = time + textTimeValue.getText().toString() + ":00";
initNetWork(orderId, timeValue, edValue, token);
}
break;
......@@ -261,11 +271,13 @@ public class SubscribeTimeActivity extends BaseActivity<SubscribeTimeView, Subsc
}
}
public String getTime(Date date) {//可根据需要自行截取数据显示
//可根据需要自行截取数据显示
public String getTime(Date date) {
SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
return format.format(date);
}
public String getTimes(Date date) {//可根据需要自行截取数据显示
//可根据需要自行截取数据显示
public String getTimes(Date date) {
SimpleDateFormat format = new SimpleDateFormat("HH:mm");
return format.format(date);
}
......
app/src/main/java/com/dayu/bigfish/activity/UpdataSubscribeTimeActivity.java
......@@ -40,7 +40,7 @@ import butterknife.OnClick;
import static cn.finalteam.toolsfinal.DateUtils.getTime;
/**
* 修改预约时间
* 修改预约上门时间
* on 2017/9/12.
*/
......@@ -81,6 +81,8 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
private CustomProgressDialog dialog;
private DateUtils dateUtils = new DateUtils();
private String token;
private int finshPosition;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -110,7 +112,7 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
public void initData() {
Intent intent = getIntent();
String value = intent.getStringExtra("orderId");
System.out.println("ding订单id为------>" + value);
finshPosition = intent.getIntExtra("position",0);
orderId = Integer.parseInt(value);
}
......@@ -212,7 +214,7 @@ public class UpdataSubscribeTimeActivity extends BaseActivity<UpdataSubscribeTim
ToastUtils.showShortToast("提交数据成功");
dialog.dismiss();
finish();
EventBus.getDefault().post(new UpdataTime(1));
EventBus.getDefault().post(new UpdataTime(finshPosition));
}
@Override
......
app/src/main/java/com/dayu/bigfish/adapter/BigFishMessageAdapter.java 100644 → 100755
......@@ -6,6 +6,7 @@ import android.graphics.Typeface;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
......@@ -20,19 +21,21 @@ import butterknife.BindView;
import butterknife.ButterKnife;
/**
* Created by yu on 2017/10/14.
* 系统消息的适配器
* on 2017/10/14.
*/
public class BigFishMessageAdapter extends BaseAdapter {
private List<NewMessageBean.DataBeanX.DataBean> bigFishList;
private DateUtils dateUtils = new DateUtils();
private DateUtils myDateUtils;
private Context context;
private String dataMD;
private String dataTime;
public BigFishMessageAdapter(List<NewMessageBean.DataBeanX.DataBean> bigFishList, Context context) {
public BigFishMessageAdapter(List<NewMessageBean.DataBeanX.DataBean> bigFishList, Context context,DateUtils dateUtils) {
this.bigFishList = bigFishList;
this.context = context;
this.myDateUtils = dateUtils;
}
@Override
......@@ -67,10 +70,15 @@ public class BigFishMessageAdapter extends BaseAdapter {
}
private void initData(int position, ViewHolder viewHolder) {
if (bigFishList.get(position).getFlag() != null && bigFishList.get(position).getFlag().equals("1")) {
viewHolder.view.setVisibility(View.GONE);
} else {
viewHolder.view.setVisibility(View.VISIBLE);
}
try {
dataMD = dateUtils.stringDateToDate(bigFishList.get(position).getCreateTime());
dataMD = myDateUtils.stringDateToDate(bigFishList.get(position).getCreateTime());
viewHolder.bigMessageTime.setText(dataMD);
dataTime = dateUtils.stringTimeToDate(bigFishList.get(position).getCreateTime());
dataTime = myDateUtils.stringTimeToDate(bigFishList.get(position).getCreateTime());
viewHolder.bigMessageDate.setText(dataTime);
} catch (Exception e) {
e.printStackTrace();
......@@ -89,7 +97,8 @@ public class BigFishMessageAdapter extends BaseAdapter {
TextView bigMessageTextContent;
@BindView(R.id.big_item)
RelativeLayout bigItem;
@BindView(R.id.iv)
TextView view;
ViewHolder(View view, Context context) {
ButterKnife.bind(this, view);
AssetManager mgr = context.getAssets();//得到AssetManager
......
app/src/main/java/com/dayu/bigfish/adapter/FragmentHomeAdapter.java
......@@ -4,22 +4,25 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.view.View;
import android.view.ViewGroup;
import java.util.List;
/**
* Created by yu on 2017/8/25.
* 首页四个Fragment的适配器
*/
public class FragmentHomeAdapter extends FragmentPagerAdapter {
private List<Fragment> list_fragemnts;
public FragmentHomeAdapter(FragmentManager fm, List<Fragment> list_fragemnts) {
super(fm);
this.list_fragemnts = list_fragemnts;
}
@Override
public int getCount() {
return 4;
return list_fragemnts.size();
}
......@@ -27,4 +30,9 @@ public class FragmentHomeAdapter extends FragmentPagerAdapter {
public Fragment getItem(int position) {
return list_fragemnts.get(position);
}
//防止fragment自动销毁
@Override
public void destroyItem(ViewGroup container, int position, Object object) {
//super.destroyItem(container, position, object);
}
}
app/src/main/java/com/dayu/bigfish/adapter/FragmentOrderAdapter.java
......@@ -9,7 +9,8 @@ import java.util.List;
import static android.R.id.list;
/**
* Created by yu on 2017/9/13.
* 工单详情和服务记录两个Fragment的适配器
* on 2017/9/13.
*/
public class FragmentOrderAdapter extends FragmentPagerAdapter {
......
app/src/main/java/com/dayu/bigfish/adapter/HomeEndTabAdapter.java
......@@ -20,7 +20,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 首页Tab 已完成
* 已取消列表的适配器
* on 2017/9/12.
*/
......
app/src/main/java/com/dayu/bigfish/adapter/HomeOneTabAdapter.java
......@@ -26,7 +26,7 @@ import butterknife.ButterKnife;
import static android.media.CamcorderProfile.get;
/**
* 首页Tab 未预约
* 未预约列表的适配器
* 2017/9/9.
*/
......
app/src/main/java/com/dayu/bigfish/adapter/HomeThreeTabAdapter.java
......@@ -22,7 +22,7 @@ import butterknife.ButterKnife;
import static com.dayu.bigfish.R.id.error_state;
/**
* 首页Tab 异常单
* 异常单列表的适配器
* on 2017/9/12.
*/
......
app/src/main/java/com/dayu/bigfish/adapter/HomeTwoTabAdapter.java
......@@ -20,7 +20,6 @@ import com.dayu.bigfish.R;
import com.dayu.bigfish.activity.AgainUpDoorActivity;
import com.dayu.bigfish.activity.AgainVisitActivity;
import com.dayu.bigfish.activity.OrderFinishActivity;
import com.dayu.bigfish.activity.StartActivity;
import com.dayu.bigfish.activity.UpdataSubscribeTimeActivity;
import com.dayu.bigfish.application.MyApplication;
import com.dayu.bigfish.bean.BaseBean;
......@@ -50,10 +49,8 @@ import butterknife.ButterKnife;
import okhttp3.Call;
import okhttp3.Response;
import static android.R.attr.value;
/**
* 首页Tab 待服务
* 待服务列表的适配器
* on 2017/9/11.
*/
......@@ -64,11 +61,9 @@ public class HomeTwoTabAdapter extends BaseAdapter {
private String dateMD = null;
private String dateTime = null;
private CustomProgressDialog dialog;
private boolean isStartSuccess = false;//开始出发
private boolean isSuccessTwo = false;//开始服务
private List<MyGreenDao> list; //数据库的数据源
ViewHolder viewHolder;
int postion;
private String mToken;
// int state;//0:默认开始出发,1:开始服务，2:需要再次上门,3:处理工单
......@@ -97,7 +92,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
public View getView(final int position, View convertView, ViewGroup parent) {
View view;
ViewHolder viewHolder;
if (convertView == null) {
......@@ -110,7 +105,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
this.viewHolder = viewHolder;
}
//switchView(viewHolder);
this.postion = position;
try {
initData(position, viewHolder,mToken);
} catch (Exception e) {
......@@ -226,7 +221,6 @@ public class HomeTwoTabAdapter extends BaseAdapter {
viewHolder.itemRestrt.setVisibility(View.GONE);
viewHolder.itemUpdataTime.setVisibility(View.GONE);
viewHolder.rl.setVisibility(View.GONE);
//viewHolder.iv.setVisibility(View.GONE);
}
}
......@@ -274,6 +268,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
// context.startActivity(intent);
Intent intent = new Intent(context, UpdataSubscribeTimeActivity.class);
intent.putExtra("orderId", orderId + "");
intent.putExtra("position", position);
context.startActivity(intent);
});
//需要再次上门
......@@ -282,6 +277,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
public void onClick(View v) {
Intent intent = new Intent(context, AgainUpDoorActivity.class);
intent.putExtra("orderId", orderId + "");
intent.putExtra("position", position);
context.startActivity(intent);
}
});
......@@ -299,6 +295,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
public void onClick(View v) {
Intent intent = new Intent(context, OrderFinishActivity.class);
intent.putExtra("orderId", orderId + "");
intent.putExtra("position", position);
context.startActivity(intent);
}
});
......@@ -407,7 +404,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
myGreenDaoDao().update(types);
//设置按钮可见不可见
}
//将修改时间改为1---需要再次上门
//将修改时间改为b---需要再次上门
if (list.get(0).getFlag().equals("a")) {
MyGreenDao flag = list.get(0);
flag.setFlag("b");
......@@ -478,20 +475,10 @@ public class HomeTwoTabAdapter extends BaseAdapter {
return (MyApplication.context()).getDaoSession().getMyGreenDaoDao();
}
/**
* 通过 BaseApplication 类提供的 getDb() 获取具体 db
*
* @return
*/
private SQLiteDatabase getDb() {
return (MyApplication.context()).getDb();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdataTime(UpdataTime updataTime) {
if (updataTime.getCount() == 1) {
//查询数据
Query query3 = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(postion).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
Query query3 = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(updataTime.getCount() ).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
.build();
List<MyGreenDao> list1 = query3.list();
list = list1;
......@@ -503,7 +490,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
//设置按钮可见不可见
}
//查询数据库
Query query1 = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(postion).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
Query query1 = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(updataTime.getCount() ).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
.build();
List<MyGreenDao> list2 = query1.list();
list = list2;
......@@ -531,13 +518,11 @@ public class HomeTwoTabAdapter extends BaseAdapter {
}
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onAgainUpDoor(AgainUpDoorText againUpDoorText) {
if (againUpDoorText.getValue() == 2) {
//查询数据
Query query3 = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(postion).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
Query query3 = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(againUpDoorText.getValue() ).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
.build();
List<MyGreenDao> list1 = query3.list();
list = list1;
......@@ -550,7 +535,7 @@ public class HomeTwoTabAdapter extends BaseAdapter {
//设置按钮可见不可见
}
//查询数据库
Query query1 = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(postion).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
Query query1 = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(againUpDoorText.getValue() ).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
.build();
List<MyGreenDao> list2 = query1.list();
list = list2;
......@@ -568,18 +553,15 @@ public class HomeTwoTabAdapter extends BaseAdapter {
}
}
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onOrderFinish(OrderFinish orderFinish) {
if (orderFinish.getTemp() == 3) {
//查询数据
Query query2 = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(postion).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
Query query = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(orderFinish.getTemp()).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
.build();
List<MyGreenDao> list2 = query2.list();
list = list2;
List<MyGreenDao> list1 = query.list();
list = list1;
if (list.get(0).getType().equals("2")) {
MyGreenDao types = list.get(0);
types.setType("3");
......@@ -587,6 +569,24 @@ public class HomeTwoTabAdapter extends BaseAdapter {
myGreenDaoDao().update(types);
//设置按钮可见不可见
}
//查询数据库
Query query1 = myGreenDaoDao().queryBuilder().where(MyGreenDaoDao.Properties.Ids.eq(twoTablist.get(orderFinish.getTemp()).getId()), MyGreenDaoDao.Properties.Logid.eq(GetUserInfo.getACCOUNT_ID(context)))
.build();
List<MyGreenDao> list2 = query1.list();
list = list2;
//判断显示
if (list.size() != 0) {
if (list.get(0).getType().equals("3") && list.get(0).getFlag().equals("b")) {
//设置按钮可见不可见
viewHolder.itemStartDepart.setVisibility(View.GONE);
viewHolder.itemServe.setVisibility(View.GONE);
viewHolder.itemOrder.setVisibility(View.GONE);
viewHolder.itemRestrt.setVisibility(View.GONE);
viewHolder.itemUpdataTime.setVisibility(View.GONE);
viewHolder.itemWait.setVisibility(View.VISIBLE);
viewHolder.rl.setVisibility(View.GONE);
}
}
}
}
}
app/src/main/java/com/dayu/bigfish/adapter/ReceivingAdapter.java
......@@ -25,7 +25,8 @@ import butterknife.BindView;
import butterknife.ButterKnife;
/**
* Created by yu on 2017/8/30.
* 待接单列表的适配器
* on 2017/8/30.
*/
public class ReceivingAdapter extends BaseAdapter {
......@@ -76,8 +77,6 @@ public class ReceivingAdapter extends BaseAdapter {
} catch (Exception e) {
e.printStackTrace();
}
//回调刷新适配器
//test.notiyfl();
receivingOrder(viewHolder, position);
return view;
}
......
app/src/main/java/com/dayu/bigfish/adapter/ServeDatailsAdapter.java
......@@ -16,7 +16,8 @@ import butterknife.BindView;
import butterknife.ButterKnife;
/**
* Created by yu on 2017/9/30.
* 服务记录的适配器
* on 2017/9/30.
*/
public class ServeDatailsAdapter extends BaseAdapter {
......
app/src/main/java/com/dayu/bigfish/adapter/SystemMessageAdapter.java 100644 → 100755
......@@ -6,6 +6,7 @@ import android.graphics.Typeface;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
......@@ -14,13 +15,16 @@ import com.dayu.bigfish.bean.MessageBean;
import com.dayu.bigfish.bean.NewMessageBean;
import com.dayu.bigfish.utils.DateUtils;
import org.w3c.dom.Text;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* Created by yu on 2017/10/14.
* 系统消息的适配器
* 2017/10/14.
*/
public class SystemMessageAdapter extends BaseAdapter {
......@@ -66,6 +70,11 @@ public class SystemMessageAdapter extends BaseAdapter {
}
private void initData(int position, ViewHolder viewHolder) {
if (dataBeenList.get(position).getFlag() != null && dataBeenList.get(position).getFlag().equals("1")) {
viewHolder.view.setVisibility(View.GONE);
} else {
viewHolder.view.setVisibility(View.VISIBLE);
}
try {
dataMD = dateUtils.stringDateToDate(dataBeenList.get(position).getCreateTime());
viewHolder.messageTime.setText(dataMD);
......@@ -88,7 +97,8 @@ public class SystemMessageAdapter extends BaseAdapter {
TextView messageTextContent;
@BindView(R.id.item)
RelativeLayout item;
@BindView(R.id.iv)
TextView view;
ViewHolder(View view,Context context) {
ButterKnife.bind(this, view);
AssetManager mgr = context.getAssets();//得到AssetManager
......
app/src/main/java/com/dayu/bigfish/application/MyApplication.java
......@@ -22,6 +22,7 @@ import com.lzy.okgo.cookie.CookieJarImpl;
import com.lzy.okgo.https.HttpsUtils;
import com.lzy.okgo.interceptor.HttpLoggingInterceptor;
import com.lzy.okgo.model.HttpHeaders;
import com.umeng.analytics.MobclickAgent;
import java.util.Iterator;
import java.util.List;
......@@ -30,8 +31,10 @@ import java.util.logging.Level;
import okhttp3.OkHttpClient;
import static com.dayu.bigfish.R.mipmap.error;
/**
* 全局的单例
* 全局的相关配置
* MrWang
* on 2017/8/20.
*/
......@@ -56,8 +59,9 @@ public class MyApplication extends Application {
super.onCreate();
setupDatabase();
//捕获错误报告并上传到友盟服务器
// public static void reportError(Context context, String error)
// public static void reportError(Context context, Throwable e)
/* public static void reportError(Context context, String error)
public static void reportError(Context context, Throwable e)*/
//上下文
mContext = getApplicationContext();
// 主线程的Handler
......@@ -67,6 +71,7 @@ public class MyApplication extends Application {
initOkGo();
// 初始化环信SDK
EMOptions options = new EMOptions();
options.setAutoLogin(true);
//初始化
EMClient.getInstance().init(getContext(), options);
//在做打包混淆时，关闭debug模式，避免消耗不必要的资源
......@@ -190,21 +195,7 @@ public class MyApplication extends Application {
}
/**
* 得到主线程的Handler
*/
public static Handler getHandler() {
return mHandler;
}
/**
* 得到主线程id
*/
public static int getMainThreadId() {
return mMainThreadId;
}
/**
* 得到上下文
* 得到全局上下文，慎用
*/
public static Context getContext() {
return mContext;
......@@ -213,8 +204,6 @@ public class MyApplication extends Application {
public static synchronized MyApplication context() {
return (MyApplication) mContext;
}
private void setupDatabase() {
// 通过 DaoMaster 的内部类 DevOpenHelper，你可以得到一个便利的 SQLiteOpenHelper 对象。
// 可能你已经注意到了，你并不需要去编写「CREATE TABLE」这样的 SQL 语句，因为 greenDAO 已经帮你做了。
......
app/src/main/java/com/dayu/bigfish/base/BaseActivity.java
......@@ -35,12 +35,13 @@ import static com.dayu.bigfish.managers.AppManager.getAppManager;
*/
public abstract class BaseActivity<V, T extends BasePresenter<V>> extends AppCompatActivity {
//交由子类去调用的p层，我一般都是在活动使用成员变量自己记录
public T presenter;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//初始化p层
presenter = initPresenter();
//设置友盟数据统计到测试设备,避免数据污染
// MobclickAgent.setDebugMode( true );
......@@ -53,30 +54,37 @@ public abstract class BaseActivity<V, T extends BasePresenter<V>> extends AppCom
@Override
public void onResume() {
super.onResume();
// MobclickAgent.onResume(this);
// presenter.attachView((V) this);
//友盟的基础埋点
MobclickAgent.onResume(this);
presenter.attachView((V) this);
}
@Override
protected void onPause() {
super.onPause();
// MobclickAgent.onPause(this);
//友盟的基础埋点
MobclickAgent.onPause(this);
}
@Override
public void onDestroy() {
// presenter.detachView();
presenter.detachView();
super.onDestroy();
}
//强制子类初始化监听的方法
public abstract void initListener();
//强制子类初始化视图的方法
public abstract void initView();
//强制子类初始化数据的方法
public abstract void initData();
public abstract void initData();
// 强制子类初始化自己的presenter
public abstract T initPresenter();
private long mPressedTime = 0;
}
app/src/main/java/com/dayu/bigfish/base/BaseFragment.java
......@@ -10,8 +10,13 @@ import android.view.ViewGroup;
import com.dayu.bigfish.tip.DefaultTipsHelper;
import com.dayu.bigfish.tip.TipsHelper;
import com.lzy.okgo.OkGo;
import org.greenrobot.eventbus.EventBus;
/**
* Created by yu on 2017/9/11.
* Fragment的基类，如有具体需求可再添加
* Created by yu
* on 2017/9/11.
*/
public abstract class BaseFragment<V, T extends BasePresenter<V>> extends Fragment {
......@@ -22,8 +27,14 @@ public abstract class BaseFragment<V, T extends BasePresenter<V>> extends Fragme
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
presenter = initPresenter();
initEvent();
return super.onCreateView(inflater, container, savedInstanceState);
}
private void initEvent() {
if (!EventBus.getDefault().isRegistered(this)) {
EventBus.getDefault().register(this);
}
}
protected TipsHelper createTipsHelper(View view) {
return new DefaultTipsHelper(getContext(), view);
}
......@@ -51,22 +62,6 @@ public abstract class BaseFragment<V, T extends BasePresenter<V>> extends Fragme
//强制子类初始化视图的方法
public abstract void initView();
private long mPressedTime = 0;
/**
* 在这里实现Fragment数据的缓加载.
* @param isVisibleToUser
*/
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if(getUserVisibleHint()) {
isVisible = true;
onVisible();
} else {
isVisible = false;
onInvisible();
}
}
protected void onVisible(){
this.lazyLoad();
}
......
app/src/main/java/com/dayu/bigfish/base/BasePresenter.java
......@@ -5,7 +5,7 @@ import java.lang.ref.WeakReference;
/**
* presenter层基类构建,这里attachView和detachView主要是统一管理view周期
* 2017/8/20.
* 2017/9/20.
*/
public abstract class BasePresenter<T> {
......
app/src/main/java/com/dayu/bigfish/bean/BaseBean.java
package com.dayu.bigfish.bean;
/**
* Created by yu on 2017/9/16.
* 服务器常规返回的bean
* on 2017/9/16.
*/
public class BaseBean {
......
app/src/main/java/com/dayu/bigfish/bean/MessageBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/MessageJsonBean.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/bean/NewMessageBean.java 100644 → 100755
......@@ -154,7 +154,15 @@ public class NewMessageBean implements Serializable{
private Object startTime;
private Object endTime;
private String customJson;
private String flag;
public String getFlag() {
return flag;
}
public void setFlag(String flag) {
this.flag = flag;
}
public int getId() {
return id;
}
......
app/src/main/java/com/dayu/bigfish/bean/UserInfo.java
......@@ -24,18 +24,19 @@ public class UserInfo {
* 成功时返回的token
*/
private String accessToken;
/**
* 成功时返回的头像url
*/
// private String imageUrl;
/* public String getImageUrl() {
public String getImageUrl() {
return imageUrl;
}
public void setImageUrl(String imageUrl) {
this.imageUrl = imageUrl;
}*/
}
/**
* 成功时返回的头像url
*/
private String imageUrl;
private String hxUserId;
private String hxUserPwd;
......
app/src/main/java/com/dayu/bigfish/eventbus/RefreReceiveData.java 0 → 100644
package com.dayu.bigfish.eventbus;
/**
* 刷新待接单列表小圆点
* on 2017/10/19.
*/
public class RefreReceiveData {
public int getReceive() {
return receive;
}
public void setReceive(int receive) {
this.receive = receive;
}
private int receive;
public RefreReceiveData(int receive) {
this.receive = receive;
}
}
app/src/main/java/com/dayu/bigfish/eventbus/TabFourRefresh.java 0 → 100644
package com.dayu.bigfish.eventbus;
/**
* 已取消
* on 2017/10/20.
*/
public class TabFourRefresh {
public int getTabFour() {
return tabFour;
}
public void setTabFour(int tabFour) {
this.tabFour = tabFour;
}
private int tabFour;
public TabFourRefresh(int tabFour) {
this.tabFour = tabFour;
}
}
app/src/main/java/com/dayu/bigfish/eventbus/TabOneRefresh.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/eventbus/TabThreeRefresh.java 0 → 100644
package com.dayu.bigfish.eventbus;
/**
* 异常单
* on 2017/10/20.
*/
public class TabThreeRefresh {
public int getTabThree() {
return tabThree;
}
public void setTabThree(int tabThree) {
this.tabThree = tabThree;
}
private int tabThree;
public TabThreeRefresh(int tabThree) {
this.tabThree = tabThree;
}
}
app/src/main/java/com/dayu/bigfish/eventbus/TabTwoRefresh.java 0 → 100644
package com.dayu.bigfish.eventbus;
/**
* 待服务列表的消息体
* on 2017/10/20.
*/
public class TabTwoRefresh {
public int getTabTwo() {
return tabTwo;
}
public void setTabTwo(int tabTwo) {
this.tabTwo = tabTwo;
}
private int tabTwo;
public TabTwoRefresh(int tabTwo) {
this.tabTwo = tabTwo;
}
}
app/src/main/java/com/dayu/bigfish/fragment/HomeEndTabFragment.java
......@@ -20,6 +20,8 @@ import com.dayu.bigfish.adapter.HomeThreeTabAdapter;
import com.dayu.bigfish.application.MyApplication;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.OrderFinishBean;
import com.dayu.bigfish.eventbus.TabFourRefresh;
import com.dayu.bigfish.eventbus.TabThreeRefresh;
import com.dayu.bigfish.moudle.finish.HomeEndTabPresenter;
import com.dayu.bigfish.moudle.finish.HomeEndTabView;
import com.dayu.bigfish.tip.TipsHelper;
......@@ -27,6 +29,9 @@ import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
import butterknife.BindView;
......@@ -36,7 +41,7 @@ import butterknife.Unbinder;
import static android.R.attr.data;
/**
* 已完成
* 已取消的Fragment
* on 2017/8/31.
*/
......@@ -57,7 +62,6 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
private boolean isPrepared;
private int orderId;
private String token;
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
View rootView = inflater.inflate(R.layout.fragment_tab_end, container, false);
......@@ -65,24 +69,27 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
mTipsHelper = createTipsHelper(tabEndList);
token = GetUserInfo.getToken(getContext());
dialog.show();
initRefresh();
isPrepared = true;
initListener();
lazyLoad();
//initData();
return rootView;
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onRefreTabFour(TabFourRefresh tabFourRefresh) {
if (tabFourRefresh.getTabFour()==0) {
initData();
}
}
public void initView() {
//initData();
}
@Override
protected void initData() {
dialog.show();
homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
}
@Override
protected void lazyLoad() {
if (!isPrepared || !isVisible) {
......@@ -123,7 +130,7 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
// page = 1;
// initData(2, page, userId,10,siteId);
homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
initData();
refresh.finishRefresh();
}
......@@ -137,7 +144,6 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
@Override
public void finishSuccess(OrderFinishBean orderFinishBean) {
mTipsHelper.hideEmpty();
mTipsHelper.hideError();
finishList = orderFinishBean.getData().getData();
......@@ -163,16 +169,15 @@ public class HomeEndTabFragment extends BaseFragment<HomeEndTabView, HomeEndTabP
public void error(String msg) {
dialog.dismiss();
mTipsHelper.showError(true, msg, v -> {
homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
initData();
dialog.show();
});
ToastUtils.showShortToast(msg);
ToastUtils.showShortToast(msg);
}
@Override
public void onResume() {
super.onResume();
homeEndTabPresenter.getFinishOrder(6, 1, userId, 10, siteId,token);
// initData();
}
}
app/src/main/java/com/dayu/bigfish/fragment/HomeOneTabFragment.java
......@@ -48,7 +48,7 @@ import okhttp3.Call;
import okhttp3.Response;
/**
* Created by yu on 2017/8/31.
* 待预约的Fragment
*/
public class HomeOneTabFragment extends BaseFragment<ReservationView, ReservationPresenter> implements ReservationView, RefershAdapter {
......@@ -76,29 +76,29 @@ 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();
mTipsHelper = createTipsHelper(tabOneList);
initRefresh();
isPrepared = true;
lazyLoad();
initListener();
initData();
System.out.println("首页的工程师id为----->"+userId);
System.out.println("首页的工程师站点id为---->"+siteId);
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();
initData();
}
}
public void initListener() {
tabOneList.setOnItemClickListener((parent, view, position, id) -> {
orderId = oneTablist.get(position).getId();
......@@ -106,7 +106,6 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
intent.putExtra("orderId", orderId + "");
startActivity(intent);
});
}
@Override
......@@ -117,6 +116,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
@Override
public void initData() {
dialog.show();
presenter.getData(2, 1, userId, 10, siteId,token);
}
......@@ -153,7 +153,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
@Override
public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
page = 1;
presenter.getData(2, page, userId, 10, siteId,token);
initData();
refresh.finishRefresh();
}
......@@ -197,7 +197,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
public void getDataFail(String data) {
dialog.dismiss();
mTipsHelper.showError(true, data, v -> {
presenter.getData(2, page, userId, 10, siteId,token);
initData();
dialog.show();
});
ToastUtils.showShortToast(data);
......@@ -206,7 +206,7 @@ public class HomeOneTabFragment extends BaseFragment<ReservationView, Reservatio
@Override
public void onResume() {
super.onResume();
presenter.getData(2, page, userId, 10, siteId,token);
// initData();
}
}
app/src/main/java/com/dayu/bigfish/fragment/HomeThreeTabFragment.java
......@@ -23,6 +23,8 @@ import com.dayu.bigfish.application.MyApplication;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.ErrorOrderBean;
import com.dayu.bigfish.bean.HomeOneTabBean;
import com.dayu.bigfish.eventbus.TabThreeRefresh;
import com.dayu.bigfish.eventbus.TabTwoRefresh;
import com.dayu.bigfish.moudle.error.ErrorPresenter;
import com.dayu.bigfish.moudle.error.ErrorView;
import com.dayu.bigfish.moudle.reservation.ReservationPresenter;
......@@ -32,6 +34,9 @@ import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ToastUtils;
import com.dayu.bigfish.views.CustomProgressDialog;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
import butterknife.BindView;
......@@ -42,7 +47,8 @@ import static android.R.attr.data;
import static android.R.id.list;
/**
* Created by yu on 2017/8/31.
* 异常单的Fragment
* on 2017/8/31.
*/
public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter> implements ErrorView {
......@@ -71,17 +77,22 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
token = GetUserInfo.getToken(getContext());
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
mTipsHelper = createTipsHelper(tabThreeList);
dialog.show();
// dialog.dismiss();
//initView();
initListener();
isPrepared = true;
initRefresh();
lazyLoad();
// initData();
return rootView;
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onRefreTabThree(TabThreeRefresh tabThreeRefresh) {
if (tabThreeRefresh.getTabThree()==0) {
initData();
}
}
public void initListener() {
tabThreeList.setOnItemClickListener((parent, view, position, id) -> {
int orderId = errorlist.get(position).getId();
......@@ -100,6 +111,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
@Override
public void initData() {
dialog.show();
presenter.getErrorOrder(userId,siteId,token);
}
......@@ -133,7 +145,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
//下拉刷新
@Override
public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
presenter.getErrorOrder(userId,siteId,token);
initData();
refresh.finishRefresh();
}
......@@ -165,7 +177,8 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
@Override
public void onResume() {
super.onResume();
presenter.getErrorOrder(userId,siteId,token);
// initData();
//presenter.getErrorOrder(userId,siteId,token);
}
@Override
......@@ -195,7 +208,7 @@ public class HomeThreeTabFragment extends BaseFragment<ErrorView, ErrorPresenter
public void error(String msg) {
dialog.dismiss();
mTipsHelper.showError(true, msg, v -> {
presenter.getErrorOrder(userId,siteId,token);
initData();
dialog.show();
});
ToastUtils.showShortToast(msg);
......
app/src/main/java/com/dayu/bigfish/fragment/HomeTwoTabFragment.java
......@@ -25,6 +25,9 @@ import com.dayu.bigfish.application.MyApplication;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.HomeOneTabBean;
import com.dayu.bigfish.bean.HomeTwoTabBean;
import com.dayu.bigfish.eventbus.RefreshTabNum;
import com.dayu.bigfish.eventbus.TabOneRefresh;
import com.dayu.bigfish.eventbus.TabTwoRefresh;
import com.dayu.bigfish.greendao.MyGreenDaoDao;
import com.dayu.bigfish.moudle.beltservice.BeltServicePresenter;
import com.dayu.bigfish.moudle.beltservice.BeltServiceView;
......@@ -36,6 +39,9 @@ import com.google.gson.Gson;
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 org.greenrobot.greendao.query.Query;
import java.util.ArrayList;
......@@ -50,7 +56,8 @@ import okhttp3.Response;
import static android.R.attr.data;
/**
* Created by yu on 2017/8/31.
* 待服务的Fragment
* on 2017/8/31.
*/
public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServicePresenter> implements BeltServiceView {
......@@ -72,8 +79,6 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
private TipsHelper mTipsHelper;
private int orderId;
private String token;
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
View rootView = inflater.inflate(R.layout.fragment_tab_two, container, false);
......@@ -81,15 +86,21 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
token = GetUserInfo.getToken(getContext());
dialog = new CustomProgressDialog(getContext(), R.style.CustomDialog);
mTipsHelper = createTipsHelper(tabTwoList);
dialog.show();
initRefresh();
isPrepared = true;
initListener();
// initData();
lazyLoad();
// ToastUtils.showShortToast("预加载了");
return rootView;
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onRefreTabTwo(TabTwoRefresh tabTwoRefresh) {
if (tabTwoRefresh.getTabTwo()==0) {
initData();
}
}
public void initView() {
// initData();
// initListener();
......@@ -106,6 +117,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
@Override
protected void initData() {
dialog.show();
presenter.getData(110, page, userId, 10, siteId,token);
}
......@@ -133,8 +145,10 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
//下拉刷新
@Override
public void onRefresh(MaterialRefreshLayout materialRefreshLayout) {
//通知刷新Tab
EventBus.getDefault().post(new RefreshTabNum(1));
page = 1;
presenter.getData(110, page, userId, 10, siteId,token);
// initData();
refresh.finishRefresh();
}
......@@ -143,15 +157,15 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
/*if (hasNextPage == true) {
page++;
presenter.getData(3, page, userId, 10, siteId);
} else {
}
else
{
Toast.makeText(getActivity(), "已经到底了", Toast.LENGTH_SHORT).show();
}*/
refresh.finishRefreshLoadMore();
}
});
}
//获取数据成功
@Override
public void getDataSuc(HomeTwoTabBean data) {
......@@ -203,7 +217,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
public void getDataFail(String s) {
dialog.dismiss();
mTipsHelper.showError(true, s, v -> {
presenter.getData(110, page, userId, 10, siteId,token);
initData();
dialog.show();
});
ToastUtils.showShortToast(s);
......@@ -212,8 +226,7 @@ public class HomeTwoTabFragment extends BaseFragment<BeltServiceView, BeltServic
@Override
public void onResume() {
super.onResume();
presenter.getData(110, page, userId, 10, siteId,token);
initData();
}
/**
* 通过 BaseApplication 类提供的 getDaoSession() 获取具体 Dao
......
app/src/main/java/com/dayu/bigfish/fragment/order/OrderDatailsFragment.java
......@@ -32,7 +32,7 @@ import okhttp3.Response;
import static com.dayu.bigfish.R.id.four_text_nine_text;
/**
* Created by yu
* 工单记录的Fragment
* on 2017/9/13.
*/
......@@ -218,7 +218,7 @@ public class OrderDatailsFragment extends Fragment {
//customerMobile 客户联系方式
twoTextFourText.setText(dataBean.getCustomerMobile());
//provinceName+cityName+districtName+address 省市区地方
twoTextFiveText.setText(dataBean.getProviderName() + dataBean.getCityName() +
twoTextFiveText.setText(dataBean.getProvinceName() + dataBean.getCityName() +
dataBean.getDistrictName() + dataBean.getAddress());
//brandName 产品品牌名称
if (!TextUtils.isEmpty(dataBean.getBrandName())) {
......
app/src/main/java/com/dayu/bigfish/fragment/order/OrderDatailsServeFragment.java
......@@ -39,7 +39,7 @@ import okhttp3.Call;
import okhttp3.Response;
/**
* Created by yu
* 服务记录的Fragment
* on 2017/9/13.
*/
......
app/src/main/java/com/dayu/bigfish/greendao/DaoMaster.java
......@@ -21,11 +21,15 @@ public class DaoMaster extends AbstractDaoMaster {
/** Creates underlying database table using DAOs. */
public static void createAllTables(Database db, boolean ifNotExists) {
MessageBigFishDao.createTable(db, ifNotExists);
MessageSysDao.createTable(db, ifNotExists);
MyGreenDaoDao.createTable(db, ifNotExists);
}
/** Drops underlying database table using DAOs. */
public static void dropAllTables(Database db, boolean ifExists) {
MessageBigFishDao.dropTable(db, ifExists);
MessageSysDao.dropTable(db, ifExists);
MyGreenDaoDao.dropTable(db, ifExists);
}
......@@ -45,6 +49,8 @@ public class DaoMaster extends AbstractDaoMaster {
public DaoMaster(Database db) {
super(db, SCHEMA_VERSION);
registerDaoClass(MessageBigFishDao.class);
registerDaoClass(MessageSysDao.class);
registerDaoClass(MyGreenDaoDao.class);
}
......
app/src/main/java/com/dayu/bigfish/greendao/DaoSession.java
......@@ -8,8 +8,12 @@ import org.greenrobot.greendao.database.Database;
import org.greenrobot.greendao.identityscope.IdentityScopeType;
import org.greenrobot.greendao.internal.DaoConfig;
import com.dayu.bigfish.MessageBigFish;
import com.dayu.bigfish.MessageSys;
import com.dayu.bigfish.MyGreenDao;
import com.dayu.bigfish.greendao.MessageBigFishDao;
import com.dayu.bigfish.greendao.MessageSysDao;
import com.dayu.bigfish.greendao.MyGreenDaoDao;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
......@@ -21,26 +25,50 @@ import com.dayu.bigfish.greendao.MyGreenDaoDao;
*/
public class DaoSession extends AbstractDaoSession {
private final DaoConfig messageBigFishDaoConfig;
private final DaoConfig messageSysDaoConfig;
private final DaoConfig myGreenDaoDaoConfig;
private final MessageBigFishDao messageBigFishDao;
private final MessageSysDao messageSysDao;
private final MyGreenDaoDao myGreenDaoDao;
public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
daoConfigMap) {
super(db);
messageBigFishDaoConfig = daoConfigMap.get(MessageBigFishDao.class).clone();
messageBigFishDaoConfig.initIdentityScope(type);
messageSysDaoConfig = daoConfigMap.get(MessageSysDao.class).clone();
messageSysDaoConfig.initIdentityScope(type);
myGreenDaoDaoConfig = daoConfigMap.get(MyGreenDaoDao.class).clone();
myGreenDaoDaoConfig.initIdentityScope(type);
messageBigFishDao = new MessageBigFishDao(messageBigFishDaoConfig, this);
messageSysDao = new MessageSysDao(messageSysDaoConfig, this);
myGreenDaoDao = new MyGreenDaoDao(myGreenDaoDaoConfig, this);
registerDao(MessageBigFish.class, messageBigFishDao);
registerDao(MessageSys.class, messageSysDao);
registerDao(MyGreenDao.class, myGreenDaoDao);
}
public void clear() {
messageBigFishDaoConfig.clearIdentityScope();
messageSysDaoConfig.clearIdentityScope();
myGreenDaoDaoConfig.clearIdentityScope();
}
public MessageBigFishDao getMessageBigFishDao() {
return messageBigFishDao;
}
public MessageSysDao getMessageSysDao() {
return messageSysDao;
}
public MyGreenDaoDao getMyGreenDaoDao() {
return myGreenDaoDao;
}
......
app/src/main/java/com/dayu/bigfish/managers/UserManager.java
......@@ -8,6 +8,7 @@ import android.graphics.Outline;
import android.text.TextUtils;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.SPUtils;
import com.hyphenate.cloud.CloudOperationCallback;
......@@ -42,21 +43,24 @@ public class UserManager {
/**
* 使用sp保存用户信息
*
* 后续如有需要可再此添加，如有加密需要可另行解决
* @param context 上下文
* @param accountId 工程师账户id
* @param siteId 工程师所属服务商id
* @param accessToken token
* @param hxUserId 环信账号Id
* @param hxUserPwd 环信密码
* @param imageUrl 工程师头像Url
*/
public void saveUserInfo(Context context, String accountId, String siteId, String accessToken,
String hxUserId,String hxUserPwd
String hxUserId, String hxUserPwd, String imageUrl
) {
SPUtils.put(context, "ACCOUNT_ID", accountId);
SPUtils.put(context, "SITE_ID", siteId);
SPUtils.put(context, "ACCESS_TOKEN", accessToken);
SPUtils.put(context, "HXUSER_ID", hxUserId);
SPUtils.put(context, "HXUSER_PWD", hxUserPwd);
SPUtils.put(context, "IMAGE_URL", imageUrl);
}
/**
......@@ -75,14 +79,14 @@ public class UserManager {
if (userInfo != null) {
//有数据
if ((!TextUtils.isEmpty(userInfo.getAccountId())) && (!TextUtils.isEmpty(userInfo.getSiteId())) && (!TextUtils.isEmpty(userInfo.getAccessToken()))
&&(!TextUtils.isEmpty(userInfo.getHxUserId())&&(!TextUtils.isEmpty(userInfo.getHxUserPwd())))
&& (!TextUtils.isEmpty(userInfo.getHxUserId()) && (!TextUtils.isEmpty(userInfo.getHxUserPwd())))
) {
return true;
} else {
return false;
}
}
return false;
return false;
}
/**
......@@ -97,6 +101,7 @@ public class UserManager {
userInfo.setAccessToken((String) SPUtils.get(context, "big_fish", "ACCESS_TOKEN", ""));
userInfo.setHxUserId((String) SPUtils.get(context, "big_fish", "HXUSER_ID", ""));
userInfo.setHxUserPwd((String) SPUtils.get(context, "big_fish", "HXUSER_PWD", ""));
userInfo.setImageUrl((String) SPUtils.get(context, "big_fish", "IMAGE_URL", ""));
return userInfo;
}
}
app/src/main/java/com/dayu/bigfish/moudle/check/OrderFinishActivityPresenter.java
......@@ -126,7 +126,6 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
int isPay,
String doorPrice, String doorPriceComment,
String servicePrice, String materialCost, String otherPrice,String token) {
HashMap<String, Object> params = new HashMap<>();
//服务记录
params.put("customerCheckComment", editText);
......@@ -165,7 +164,7 @@ public class OrderFinishActivityPresenter extends BasePresenter<OrderFinishActiv
params.put("pics", str);
}
} else {
ToastUtils.showShortToast("没有图片");
ToastUtils.showShortToast("照片数量为空");
params.put("pics", "null");
}
......
app/src/main/java/com/dayu/bigfish/moudle/home/HomePresenter.java
......@@ -45,7 +45,6 @@ public class HomePresenter extends BasePresenter<HomeView> {
mHomeView.getDateSuccess(baseStringBean.getData());
} else {
// commitVersionInfo(userId, getIMEI(MainActivity.this), getPackageNum());
mHomeView.getDateFailed("当前是最新版本,无需更新");
}
......@@ -82,7 +81,6 @@ public class HomePresenter extends BasePresenter<HomeView> {
mHomeView.getNewVersionSuccess(versionBase.getData().getUpgradePrompt(), versionBase.getData().getDownloadUrl());
} else {
mHomeView.getNewVersionFailed("获取新版本信息失败");
//SPUtils.get(MainActivity.this,"big_fish")
}
......
app/src/main/java/com/dayu/bigfish/moudle/login/LoginPresenter.java
......@@ -30,6 +30,7 @@ import static android.R.attr.id;
public class LoginPresenter extends BasePresenter<LoginView> {
//表现层的view
private LoginView mloginView;
private String str;
public LoginPresenter(LoginView loginView) {
mloginView = loginView;
......@@ -88,15 +89,18 @@ public class LoginPresenter extends BasePresenter<LoginView> {
}else{
mloginView.loginFailed("验证码有误或您不是工程师");
}*/
String str = s.substring(8, 9);
str = s.substring(8, 9);
if (str.equals("1")) {
mloginView.loginFailed("验证码有误或您不是工程师");
//mloginView.loginFailed("验证码有误或您不是工程师");
mloginView.loginFailed("您还未通过审核");
return;
} else {
Gson gson = new Gson();
LoginBean loginBean = gson.fromJson(s, LoginBean.class);
if (loginBean.getCode() == 0) {
mloginView.loginSuccess(loginBean);
}else if (loginBean.getCode()== 4){
mloginView.loginFailed("您还未通过审核,暂不能登录");
}
}
......
app/src/main/java/com/dayu/bigfish/moudle/receiving/ReceivingPresenter.java
......@@ -33,14 +33,18 @@ public class ReceivingPresenter extends BasePresenter<ReceivingView> {
/**
* 发起get请求待接单列表
*
* @param state 要展示的状态信息
* @param
* @param state 想要拿到的订单状态
* @param userId 工程师id
* @param siteId 工程师所属服务站点Id
* @param pagerId 分页id
* @param pagerSize 分页数据大小
*/
public void get(int state, int pagerId, int pagerSize, int siteId,String token) {
public void get(int state, int pagerId, int pagerSize, int siteId, String token, int userId) {
System.out.println("站点---->" + siteId);
OkGo.get(Constants.ORDER_URL)
.headers("token",token)
.headers("token", token)
.params("state", state)
.params("engineerId", userId)
.params("page", pagerId)
.params("pageSize", pagerSize)
.params("siteId", siteId)
......@@ -75,10 +79,10 @@ public class ReceivingPresenter extends BasePresenter<ReceivingView> {
* @param orders 订单号
* @param engineer 工程师的账户id
*/
public void receivingOrder(int orders, int engineer,String token) {
public void receivingOrder(int orders, int engineer, String token) {
OkGo.get(Constants.ORDER_RECEIVING + orders + "/engineer/" + engineer)
.tag(this)
.headers("token",token)
.headers("token", token)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......
app/src/main/java/com/dayu/bigfish/moudle/reservation/ReservationPresenter.java
......@@ -50,7 +50,7 @@ public class ReservationPresenter extends BasePresenter<ReservationView> {
@Override
public void onError(Call call, Response response, Exception e) {
mReservationView.getDataFail("网络或服务器异场");
mReservationView.getDataFail("网络或服务器异常");
}
});
}
......
app/src/main/java/com/dayu/bigfish/moudle/set/SettingActivityPresenter.java
......@@ -13,7 +13,8 @@ import okhttp3.Call;
import okhttp3.Response;
/**
* Created by yu on 2017/9/2.
* 设置中心的P层
* on 2017/9/2.
*/
public class SettingActivityPresenter extends BasePresenter<SettingActivityView>
......@@ -22,6 +23,11 @@ public class SettingActivityPresenter extends BasePresenter<SettingActivityView>
public SettingActivityPresenter(SettingActivityView settingActivityView) {
this.settingActivityView = settingActivityView;
}
/**
* 获取新版本
* on 2017/9/2.
* dayushifua_dayu 字段参数为后台规范 写死就行，如需更改和后台协调
*/
public void updataVersion(String token){
OkGo.get(Constants.UPDATA_VERSION+"dayushifua_dayu")
.tag(this)
......
app/src/main/java/com/dayu/bigfish/moudle/worksheetRecord/WorksheetRecordPresenter.java
......@@ -22,15 +22,14 @@ public class WorksheetRecordPresenter extends BasePresenter<WorksheetRecordView>
public WorksheetRecordPresenter(WorksheetRecordView worksheetRecordView1) {
worksheetRecordView = worksheetRecordView1;
}
public void getDate(String state,int engineerId,String customerMobile,int siteId,String page,String token){
public void getDate(String state,int engineerId,int siteId,String page,String token){
OkGo.get(Constants.WORKSSHEET_RECORD )
.headers("token",token)
.params("state",state)
.params("engineerId",engineerId)
.params("customerMobile",customerMobile)
.params("siteId",siteId)
.params("page",page)
.params("pageSize",10)
.params("pageSize",20)
.execute(new StringCallback() {
@Override
public void onSuccess(String s, Call call, Response response) {
......
app/src/main/java/com/dayu/bigfish/tip/DefaultTipsHelper.java
......@@ -14,9 +14,9 @@ import com.dayu.bigfish.utils.DensityUtils;
/**
* Created by chilina
* on 2017/7/6.
* DefaultTipsHelper
*
* on 2017/10/6.
* 自定义View
*/
public class DefaultTipsHelper implements TipsHelper {
......
app/src/main/java/com/dayu/bigfish/utils/GetUserInfo.java
......@@ -49,4 +49,11 @@ public class GetUserInfo {
String hxuser = (String) SPUtils.get(context, "HXUSER_ID", "");
return hxuser;
}
/**
*获取工程师头像
* */
public static String getUserHead(Context context){
String headImage = (String) SPUtils.get(context, "IMAGE_URL", "");
return headImage;
}
}
app/src/main/java/com/dayu/bigfish/views/MyTextView.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/views/RefreListView.java 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/java/com/dayu/bigfish/views/SwitchImage.java
......@@ -13,7 +13,7 @@ import com.dayu.bigfish.R;
*/
public class SwitchImage extends ImageView {
public boolean switchButton = false;
public boolean switchButton = true;
public boolean getSwitchButton() {
return switchButton;
......@@ -27,11 +27,9 @@ public class SwitchImage extends ImageView {
setImageResource(R.mipmap.set_switch_off);
}
}
public void changeSwitchButton() {
setSwitchButton(!switchButton);
}
public SwitchImage(Context context) {
super(context);
}
......
app/src/main/res/drawable/btn_updata_selector.xml deleted 100755 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 定义按钮按下时的图片 -->
<item android:drawable="@mipmap/test_down_press"
android:state_pressed="true"/>
<!-- 定义按钮默认的图片 -->
<item android:drawable="@mipmap/test_down_normal"/>
</selector>
\ No newline at end of file
app/src/main/res/layout/activity_home.xml
......@@ -18,7 +18,7 @@
<com.dayu.bigfish.views.CircleImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/imageView_circle"
android:id="@+id/home_image"
android:layout_width="@dimen/size_home_circleimageview_width"
android:layout_height="@dimen/size_home_circleimageview_height"
android:layout_centerVertical="true"
......@@ -47,6 +47,7 @@
android:layout_alignBottom="@id/image_inform"
android:layout_alignEnd="@id/image_inform"
android:layout_alignRight="@id/image_inform"
android:visibility="gone"
android:src="@mipmap/renwu_numbg"/>
<ImageView
......@@ -54,7 +55,15 @@
style="@style/title_right_image"
android:src="@mipmap/rectangle_2"
/>
<ImageView
android:id="@+id/image_round_page2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/image_phone"
android:layout_alignEnd="@id/image_phone"
android:layout_alignRight="@id/image_phone"
android:visibility="gone"
android:src="@mipmap/renwu_numbg"/>
</RelativeLayout>
<RelativeLayout
......
app/src/main/res/layout/activity_message.xml 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_message_content.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_home_listview_bg"
>
<RelativeLayout
style="@style/title">
<TextView
style="@style/text_title"
android:text="大鱼系统通知详情"
/>
<ImageView
android:id="@+id/message_content_back_image"
style="@style/title_image_back"
/>
</RelativeLayout>
<TextView
style="@style/card_line"
/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_white"
android:layout_marginTop="@dimen/dp_10"
>
<TextView
android:id="@+id/message_text_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="大鱼的欢迎信"
android:layout_marginTop="@dimen/dp_30"
android:textSize="@dimen/sp_16"
android:textColor="@color/cl_home_title_text_color"
android:textStyle="bold"
/>
<TextView
android:id="@+id/message_time"
android:layout_marginTop="@dimen/dp_60"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_10"
android:textColor="@color/cl_tab_line"
android:layout_centerHorizontal="true"
/>
<TextView
android:id="@+id/message_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_13.3"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_111"
android:text="大鱼通知详情信息"
android:textColor="@color/cl_home_title_text_color"
/>
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/activity_personal_center.xml
......@@ -50,7 +50,7 @@
android:layout_height="@dimen/size_login_mlcircleimageview_height"
android:layout_centerHorizontal="true"
android:layout_marginTop="83.3dp"
android:src="@mipmap/mayun"
android:src="@mipmap/user"
app:border_color="@color/cl_home_circleimageview_bg"
app:border_width="@dimen/size_home_circleimageview_border"
/>
......@@ -117,7 +117,7 @@
android:layout_below="@id/persone_two"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text="3.5分"
android:text="0分"
android:textColor="@color/cl_home_title_text_color"
android:textSize="12sp"
/>
......@@ -156,21 +156,27 @@
android:layout_weight="1"
android:src="@mipmap/person_xingxing"
/>
<ImageView
android:id="@+id/persone_xingxing4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/person_banxing"
android:src="@mipmap/person_xingxing"
/>
<ImageView
android:id="@+id/persone_xingxing5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/person_xing"
android:src="@mipmap/person_xingxing"
/>
@mipmap/person_banxing
<ImageView
android:id="@+id/persone_xingxing_ban"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/person_banxing"
/>
</LinearLayout>
......
app/src/main/res/layout/activity_receiving.xml
......@@ -32,7 +32,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.dayu.bigfish.views.RefreListView
<ListView
android:id="@+id/receiving_listview"
android:layout_width="match_parent"
android:layout_height="match_parent"
......
app/src/main/res/layout/activity_setting.xml
......@@ -58,7 +58,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_16.7"
android:src="@mipmap/set_switch_off"
android:src="@mipmap/set_switch_start"
/>
</RelativeLayout>
......
app/src/main/res/layout/big_message_adapter.xml 100644 → 100755
......@@ -50,5 +50,16 @@
android:layout_marginLeft="@dimen/dp_16"
android:layout_centerVertical="true"
/>
<TextView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_10"
android:textColor="@color/cl_tab_read"
android:text="未读"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_21.3"
/>
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_message_bigfish.xml 100644 → 100755
......@@ -30,7 +30,7 @@
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂无数据"
android:text="暂无通知"
android:textSize="@dimen/sp_13.3"
android:textColor="@color/cl_login_clearedittext_hint"
/>
......
app/src/main/res/layout/fragment_message_system.xml 100644 → 100755
......@@ -32,7 +32,7 @@
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂无工单"
android:text="暂无通知"
android:textSize="@dimen/sp_13.3"
android:textColor="@color/cl_login_clearedittext_hint"
/>
......
app/src/main/res/layout/fragment_tabtwo_item.xml
......@@ -232,10 +232,10 @@
android:id="@+id/item_wait"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/cl_text"
android:background="@drawable/btn_right_selector"
android:gravity="center"
android:text="@string/wait"
android:textColor="@color/cl_text"
android:textColor="@color/cl_white"
android:textSize="@dimen/sp_15"
android:visibility="gone" />
</RelativeLayout>
......
app/src/main/res/layout/message_adapter.xml 100644 → 100755
......@@ -51,5 +51,16 @@
android:layout_marginLeft="@dimen/dp_16"
android:layout_centerVertical="true"
/>
<TextView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_10"
android:textColor="@color/cl_tab_read"
android:text="未读"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_21.3"
/>
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/mipmap-xxhdpi/wechatimg.jpeg 100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/values/dimens.xml
......@@ -114,6 +114,9 @@
<dimen name="dp_9">9dp</dimen>
<dimen name="dp_89">89dp</dimen>
<dimen name="dp_80">80dp</dimen>
<dimen name="dp_111">111dp</dimen>
<dimen name="dp_133">133dp</dimen>
<dimen name="dp_23">23dp</dimen>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
<resources>
<string name="tv_dayu">大鱼师傅</string>
<string name="tv_start_page_text">©&#160;2017&#160;大鱼创想&#160;版权所有</string>
<string name="tv_start_page_text">©&#160;2017&#160;大鱼智能&#160;版权所有</string>
<string name="tv_login_title">大鱼工程师</string>
<string name="tv_login_register_text">暂不接受个人用户注册</string>
<string name="tv_login_button_text">登&#160;录</string>
......@@ -21,11 +21,11 @@
<string name="tv_work_order_four">开始服务</string>
<string name="tv_work_order_five">服务记录</string>
<string name="tv_work_order_six">客户验收</string>
<string name="tv_person_center_name">马云</string>
<string name="tv_person_center_name">暂无姓名</string>
<string name="tv_person_center_sex">性别:</string>
<string name="tv_person_center_sex_value">男</string>
<string name="tv_person_center_age_value">24岁</string>
<string name="tv_person_center_phone">17318098934</string>
<string name="tv_person_center_sex_value">暂无</string>
<string name="tv_person_center_age_value">暂无</string>
<string name="tv_person_center_phone">暂无</string>
<string name="tv_person_center_fen">3.5分</string>
<string name="tv_person_center_jinriyeji">今日业绩(元)</string>
<string name="tv_person_center_jinrijiedan">今日接单(次)</string>
......
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