Commit 8bf2d153 by 罗翻

增加友盟页面统计和事件统计

parent 451be768
Showing with 272 additions and 44 deletions
...@@ -125,9 +125,11 @@ ...@@ -125,9 +125,11 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.ReceivingActivity" android:name=".ui.ReceivingActivity"
android:screenOrientation="portrait"
android:theme="@style/Transparent" /> android:theme="@style/Transparent" />
<activity <activity
android:name=".ui.OrderRecordActivity" android:name=".ui.OrderRecordActivity"
android:screenOrientation="portrait"
android:theme="@style/Transparent" /> android:theme="@style/Transparent" />
<activity <activity
android:name=".ui.SettingActivity" android:name=".ui.SettingActivity"
......
...@@ -18,6 +18,7 @@ import com.dayu.bigfish.ui.MainActivity; ...@@ -18,6 +18,7 @@ import com.dayu.bigfish.ui.MainActivity;
import com.dayu.bigfish.ui.views.CustomDialog; import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.MPermissionUtils; import com.dayu.bigfish.utils.MPermissionUtils;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -25,6 +26,7 @@ import io.reactivex.Observable; ...@@ -25,6 +26,7 @@ import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
public class InitializeActivity extends AppCompatActivity { public class InitializeActivity extends AppCompatActivity {
private static final String TAG = "InitializeActivity";
public static final int SDK_PERMISSION_REQUEST = 1; public static final int SDK_PERMISSION_REQUEST = 1;
private Activity mActivity; private Activity mActivity;
private Disposable mDisposable; private Disposable mDisposable;
...@@ -37,6 +39,7 @@ public class InitializeActivity extends AppCompatActivity { ...@@ -37,6 +39,7 @@ public class InitializeActivity extends AppCompatActivity {
WindowManager.LayoutParams.FLAG_FULLSCREEN); WindowManager.LayoutParams.FLAG_FULLSCREEN);
supportRequestWindowFeature(Window.FEATURE_NO_TITLE); supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.activity_initialize_main); setContentView(R.layout.activity_initialize_main);
MobclickAgent.openActivityDurationTrack(false);
mActivity = this; mActivity = this;
mPerArr = new String[]{Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.WRITE_EXTERNAL_STORAGE}; mPerArr = new String[]{Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.WRITE_EXTERNAL_STORAGE};
...@@ -98,6 +101,20 @@ public class InitializeActivity extends AppCompatActivity { ...@@ -98,6 +101,20 @@ public class InitializeActivity extends AppCompatActivity {
} }
@Override @Override
public void onResume() {
super.onResume();
MobclickAgent.onPageStart(TAG);
MobclickAgent.onResume(mActivity);
}
@Override
public void onPause() {
super.onPause();
MobclickAgent.onPageEnd(TAG);
MobclickAgent.onPause(mActivity);
}
@Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
if (mDisposable != null) { if (mDisposable != null) {
......
...@@ -12,14 +12,11 @@ import com.dayu.bigfish.utils.ToastUtils; ...@@ -12,14 +12,11 @@ import com.dayu.bigfish.utils.ToastUtils;
import java.lang.reflect.ParameterizedType; import java.lang.reflect.ParameterizedType;
import io.reactivex.disposables.CompositeDisposable;
/** /**
* Created by luofan on 17/11/02. * Created by luofan on 17/11/02.
*/ */
public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBinding> extends DataBindingActivity<B> { public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBinding> extends DataBindingActivity<B> {
public P mPresenter; public P mPresenter;
protected CompositeDisposable mDisposable = new CompositeDisposable();
@Override @Override
protected void initPresenter() { protected void initPresenter() {
...@@ -44,7 +41,6 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi ...@@ -44,7 +41,6 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
if (mPresenter != null) { if (mPresenter != null) {
mPresenter.onDetached(); mPresenter.onDetached();
} }
mDisposable.dispose();
} }
public void showToast(String msg) { public void showToast(String msg) {
......
...@@ -28,7 +28,7 @@ public abstract class BasePresenter<V> { ...@@ -28,7 +28,7 @@ public abstract class BasePresenter<V> {
protected Activity mActivity; protected Activity mActivity;
protected V mView; protected V mView;
protected CompositeDisposable mComDisposable = new CompositeDisposable(); protected CompositeDisposable mComDisposable = new CompositeDisposable();
private CustomDialog mDialog; private boolean isDialogShow = false;
public void setView(V v, Activity activity) { public void setView(V v, Activity activity) {
mActivity = activity; mActivity = activity;
...@@ -127,7 +127,7 @@ public abstract class BasePresenter<V> { ...@@ -127,7 +127,7 @@ public abstract class BasePresenter<V> {
int code = exception.code; int code = exception.code;
String message = exception.message; String message = exception.message;
if (code == APIException.FORBIDDEN) { if (code == APIException.FORBIDDEN) {
if (mDialog == null || (mDialog != null && !mDialog.isShowing())) { if (!isDialogShow) {
showLoginDialog(); showLoginDialog();
} }
return exception; return exception;
...@@ -142,7 +142,7 @@ public abstract class BasePresenter<V> { ...@@ -142,7 +142,7 @@ public abstract class BasePresenter<V> {
* 重新登录的提示框. * 重新登录的提示框.
*/ */
private void showLoginDialog() { private void showLoginDialog() {
mDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.login_state_no) CustomDialog mDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.login_state_no)
, (dialog, confirm) -> { , (dialog, confirm) -> {
if (confirm) { if (confirm) {
UserManager.getInstance().clearUserInfo(); UserManager.getInstance().clearUserInfo();
...@@ -152,11 +152,13 @@ public abstract class BasePresenter<V> { ...@@ -152,11 +152,13 @@ public abstract class BasePresenter<V> {
mActivity.startActivity(Intents); mActivity.startActivity(Intents);
} }
dialog.dismiss(); dialog.dismiss();
isDialogShow = false;
}); });
mDialog.setTitle(getString(R.string.notice)) mDialog.setTitle(getString(R.string.notice))
.setPositiveButton(getString(R.string.login_again)) .setPositiveButton(getString(R.string.login_again))
.setOneButton(true); .setOneButton(true);
mDialog.show(); mDialog.show();
isDialogShow = true;
} }
public void dumpBack() { public void dumpBack() {
......
...@@ -7,9 +7,12 @@ import android.os.Bundle; ...@@ -7,9 +7,12 @@ import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.view.View; import android.view.View;
import com.umeng.analytics.MobclickAgent;
public abstract class DataBindingActivity<B extends ViewDataBinding> extends AppCompatActivity { public abstract class DataBindingActivity<B extends ViewDataBinding> extends AppCompatActivity {
public Activity mActivity; public Activity mActivity;
public B mBind; public B mBind;
private String mClassName;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
...@@ -18,10 +21,32 @@ public abstract class DataBindingActivity<B extends ViewDataBinding> extends App ...@@ -18,10 +21,32 @@ public abstract class DataBindingActivity<B extends ViewDataBinding> extends App
mBind = DataBindingUtil.bind(rootView); mBind = DataBindingUtil.bind(rootView);
this.setContentView(rootView); this.setContentView(rootView);
mActivity = this; mActivity = this;
mClassName = mActivity.getClass().getSimpleName();
initPresenter(); initPresenter();
initView(); initView();
} }
@Override
public void onResume() {
super.onResume();
if (!"MainActivity".equals(mActivity.getClass().getSimpleName())
&& !"OrderDetailsActivity".equals(mActivity.getClass().getSimpleName())) {
MobclickAgent.onPageStart(mClassName);
}
MobclickAgent.onResume(mActivity);
}
@Override
public void onPause() {
super.onPause();
if (!"MainActivity".equals(mActivity.getClass().getSimpleName())
&& !"OrderDetailsActivity".equals(mActivity.getClass().getSimpleName())) {
MobclickAgent.onPageEnd(mClassName);
}
MobclickAgent.onPause(mActivity);
}
protected void initPresenter() { protected void initPresenter() {
} }
......
...@@ -10,6 +10,7 @@ import com.dayu.bigfish.bean.OrderRecord; ...@@ -10,6 +10,7 @@ import com.dayu.bigfish.bean.OrderRecord;
import com.dayu.bigfish.bean.TodayAchievement; import com.dayu.bigfish.bean.TodayAchievement;
import com.dayu.bigfish.bean.TodayBalance; import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.ui.PersonInfoActivity; import com.dayu.bigfish.ui.PersonInfoActivity;
import com.umeng.analytics.MobclickAgent;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.functions.Consumer; import io.reactivex.functions.Consumer;
...@@ -73,6 +74,7 @@ public class HomePersonPresenter extends HomeFourContract.Presenter { ...@@ -73,6 +74,7 @@ public class HomePersonPresenter extends HomeFourContract.Presenter {
@Override @Override
public void dumpToPersonalInfo() { public void dumpToPersonalInfo() {
mView.startActivity(PersonInfoActivity.class); mView.startActivity(PersonInfoActivity.class);
MobclickAgent.onEvent(mActivity, "check_personInfo");
} }
} }
...@@ -7,6 +7,7 @@ import com.dayu.bigfish.bean.UserInfo; ...@@ -7,6 +7,7 @@ import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.OrderRecordActivity; import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.ui.fragment.HomeOrderFragment; import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
import io.reactivex.functions.Consumer; import io.reactivex.functions.Consumer;
...@@ -53,6 +54,7 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter { ...@@ -53,6 +54,7 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
@Override @Override
public void dumpToOrderRecordActivity() { public void dumpToOrderRecordActivity() {
mView.startActivity(OrderRecordActivity.class); mView.startActivity(OrderRecordActivity.class);
MobclickAgent.onEvent(mActivity, "order_history");
} }
......
...@@ -48,15 +48,12 @@ public class LoginPresenter extends LoginContract.Presenter { ...@@ -48,15 +48,12 @@ public class LoginPresenter extends LoginContract.Presenter {
} else { } else {
mView.changeVoiceCodeBtn(); mView.changeVoiceCodeBtn();
} }
ApiFactory.sendCode(userName.get(), type).subscribe(baseObserver(new Consumer<Boolean>() { ApiFactory.sendCode(userName.get(), type).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> {
@Override
public void accept(Boolean aBoolean) throws Exception {
if (type == 1) { if (type == 1) {
mView.showToast(R.string.login_sms_success); mView.showToast(R.string.login_sms_success);
} else if (type == 2) { } else if (type == 2) {
mView.showToast(R.string.login_voice_sms_success); mView.showToast(R.string.login_voice_sms_success);
} }
}
}, throwable -> mView.showToast(R.string.send_code_faile))); }, throwable -> mView.showToast(R.string.send_code_faile)));
} }
......
...@@ -21,6 +21,7 @@ import com.dayu.bigfish.ui.listener.onDownloadListener; ...@@ -21,6 +21,7 @@ import com.dayu.bigfish.ui.listener.onDownloadListener;
import com.dayu.bigfish.utils.AppUtils; import com.dayu.bigfish.utils.AppUtils;
import com.dayu.bigfish.utils.SPUtils; import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -159,10 +160,12 @@ public class MainPresenter extends MainContract.Presenter { ...@@ -159,10 +160,12 @@ public class MainPresenter extends MainContract.Presenter {
} }
}); });
} }
MobclickAgent.onEvent(mActivity, "sure_update_app");
} else { } else {
if (info.getType() == 2) { if (info.getType() == 2) {
mActivity.finish(); mActivity.finish();
} }
MobclickAgent.onEvent(mActivity, "cancle_update_app");
} }
dialog.dismiss(); dialog.dismiss();
}); });
......
...@@ -7,6 +7,7 @@ import android.view.View; ...@@ -7,6 +7,7 @@ import android.view.View;
import com.app.annotation.apt.InstanceFactory; import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory; import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BasePageBean; import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.NewMessage; import com.dayu.bigfish.bean.NewMessage;
...@@ -15,6 +16,7 @@ import com.dayu.bigfish.ui.MessageDetailActivity; ...@@ -15,6 +16,7 @@ import com.dayu.bigfish.ui.MessageDetailActivity;
import com.dayu.bigfish.ui.fragment.MessageFragment; import com.dayu.bigfish.ui.fragment.MessageFragment;
import com.dayu.bigfish.utils.UtilsDate; import com.dayu.bigfish.utils.UtilsDate;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -115,5 +117,10 @@ public class messagePresenter extends messageContract.Presenter { ...@@ -115,5 +117,10 @@ public class messagePresenter extends messageContract.Presenter {
intent.putExtra(Constants.HX_MESSAGE, message); intent.putExtra(Constants.HX_MESSAGE, message);
intent.putExtra("category", message.getCategory()); intent.putExtra("category", message.getCategory());
mActivity.startActivity(intent); mActivity.startActivity(intent);
MobclickAgent.onEvent(MyApplication.getContext(), "read_message");
}
public int getmCategory() {
return mCategory;
} }
} }
...@@ -10,6 +10,7 @@ import com.apt.ApiFactory; ...@@ -10,6 +10,7 @@ import com.apt.ApiFactory;
import com.dayu.bigfish.Constants; import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.bean.EngineerInfo; import com.dayu.bigfish.bean.EngineerInfo;
import com.umeng.analytics.MobclickAgent;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -72,6 +73,9 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter { ...@@ -72,6 +73,9 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
} else { } else {
modifyUserInfo(mRealName.get(), mIdentity.get(), mIdentityUrl.get()); modifyUserInfo(mRealName.get(), mIdentity.get(), mIdentityUrl.get());
} }
MobclickAgent.onEvent(mActivity, "sure_commit_info");
} else {
MobclickAgent.onEvent(mActivity, "cancle_commit_info");
} }
}); });
} }
......
...@@ -14,6 +14,7 @@ import com.dayu.bigfish.bean.event.RefreshTab; ...@@ -14,6 +14,7 @@ import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.ui.OrderDetailsActivity; import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.ui.fragment.OrderThreeTabFragment; import com.dayu.bigfish.ui.fragment.OrderThreeTabFragment;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -116,5 +117,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter { ...@@ -116,5 +117,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
Intent intent = new Intent(mActivity, OrderDetailsActivity.class); Intent intent = new Intent(mActivity, OrderDetailsActivity.class);
intent.putExtra("orderId", orderId); intent.putExtra("orderId", orderId);
mActivity.startActivity(intent); mActivity.startActivity(intent);
MobclickAgent.onEvent(mActivity, "check_order_detail");
} }
} }
...@@ -11,6 +11,7 @@ import com.dayu.bigfish.bean.UserInfo; ...@@ -11,6 +11,7 @@ import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.ModifyPersonInfoActivity; import com.dayu.bigfish.ui.ModifyPersonInfoActivity;
import com.dayu.bigfish.ui.MyHeaderIvActivity; import com.dayu.bigfish.ui.MyHeaderIvActivity;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
import io.reactivex.functions.Consumer; import io.reactivex.functions.Consumer;
...@@ -33,6 +34,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter { ...@@ -33,6 +34,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
@Override @Override
public void dumpToHeader() { public void dumpToHeader() {
mView.startActivityForReult(MyHeaderIvActivity.class, 1); mView.startActivityForReult(MyHeaderIvActivity.class, 1);
MobclickAgent.onEvent(mActivity, "check_header_pic");
} }
@Override @Override
...@@ -41,6 +43,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter { ...@@ -41,6 +43,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putSerializable(Constants.ENGINEERINFO, info.get()); bundle.putSerializable(Constants.ENGINEERINFO, info.get());
mView.startActivity(ModifyPersonInfoActivity.class, bundle); mView.startActivity(ModifyPersonInfoActivity.class, bundle);
MobclickAgent.onEvent(mActivity, "modify_person_info");
} }
} }
......
...@@ -20,6 +20,7 @@ import com.dayu.bigfish.greendao.OrderInfoDao; ...@@ -20,6 +20,7 @@ import com.dayu.bigfish.greendao.OrderInfoDao;
import com.dayu.bigfish.ui.SopWebViewActivity; import com.dayu.bigfish.ui.SopWebViewActivity;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.luck.picture.lib.tools.PictureFileUtils; import com.luck.picture.lib.tools.PictureFileUtils;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.greendao.query.Query; import org.greenrobot.greendao.query.Query;
...@@ -99,6 +100,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -99,6 +100,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mOrderField.get().setOtherPrice(""); mOrderField.get().setOtherPrice("");
mOrderField.get().setOtherInfo(""); mOrderField.get().setOtherInfo("");
} }
MobclickAgent.onEvent(mActivity, "get_customer_money");
} }
@Override @Override
...@@ -200,6 +202,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -200,6 +202,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mOrderInfoDao.insertOrReplace(mOrderField.get()); mOrderInfoDao.insertOrReplace(mOrderField.get());
mView.showToast(R.string.order_save_success); mView.showToast(R.string.order_save_success);
mActivity.finish(); mActivity.finish();
MobclickAgent.onEvent(mActivity, "save_order");
} }
@Override @Override
...@@ -219,6 +222,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -219,6 +222,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(), mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice()); info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice());
} }
MobclickAgent.onEvent(mActivity, "commite_order");
} }
@Override @Override
...@@ -227,6 +231,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter { ...@@ -227,6 +231,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
intent.putExtra(Constants.ORDER_ID, mOrderId); intent.putExtra(Constants.ORDER_ID, mOrderId);
intent.putExtra(Constants.ORDER_POSTION, mPosition); intent.putExtra(Constants.ORDER_POSTION, mPosition);
mActivity.startActivity(intent); mActivity.startActivity(intent);
MobclickAgent.onEvent(mActivity, "modify_sop");
} }
} }
...@@ -16,6 +16,7 @@ import com.dayu.bigfish.bean.event.RefreshTab; ...@@ -16,6 +16,7 @@ import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.bean.event.SwtichFragment; import com.dayu.bigfish.bean.event.SwtichFragment;
import com.dayu.bigfish.ui.OrderDetailsActivity; import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -111,6 +112,7 @@ public class ReceivingPresenter extends ReceivingContract.Presenter { ...@@ -111,6 +112,7 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
Intent intent = new Intent(mActivity, OrderDetailsActivity.class); Intent intent = new Intent(mActivity, OrderDetailsActivity.class);
intent.putExtra("orderId", orderId); intent.putExtra("orderId", orderId);
mActivity.startActivity(intent); mActivity.startActivity(intent);
MobclickAgent.onEvent(mActivity, "check_order_detail");
} }
public int getmUserId() { public int getmUserId() {
......
...@@ -22,6 +22,7 @@ import com.dayu.bigfish.utils.SPUtils; ...@@ -22,6 +22,7 @@ import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.hyphenate.EMCallBack; import com.hyphenate.EMCallBack;
import com.hyphenate.chat.EMClient; import com.hyphenate.chat.EMClient;
import com.umeng.analytics.MobclickAgent;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -71,6 +72,7 @@ public class SettingPresenter extends SettingContract.Presenter { ...@@ -71,6 +72,7 @@ public class SettingPresenter extends SettingContract.Presenter {
} else { } else {
EMClient.getInstance().logout(true); EMClient.getInstance().logout(true);
} }
MobclickAgent.onEvent(mActivity, "swtich_message_button");
} }
...@@ -95,6 +97,7 @@ public class SettingPresenter extends SettingContract.Presenter { ...@@ -95,6 +97,7 @@ public class SettingPresenter extends SettingContract.Presenter {
Intent Intents = new Intent(mActivity, LoginActivity.class); Intent Intents = new Intent(mActivity, LoginActivity.class);
Intents.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); Intents.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
mActivity.startActivity(Intents); mActivity.startActivity(Intents);
MobclickAgent.onEvent(mActivity, "login_out");
} }
@Override @Override
...@@ -113,12 +116,14 @@ public class SettingPresenter extends SettingContract.Presenter { ...@@ -113,12 +116,14 @@ public class SettingPresenter extends SettingContract.Presenter {
} }
} }
}); });
MobclickAgent.onEvent(mActivity, "clear_cach");
} }
@Override @Override
public void checkVersion() { public void checkVersion() {
mView.showDialog(); mView.showDialog();
updataVersion(); updataVersion();
MobclickAgent.onEvent(mActivity, "check_version");
} }
@Override @Override
...@@ -126,16 +131,19 @@ public class SettingPresenter extends SettingContract.Presenter { ...@@ -126,16 +131,19 @@ public class SettingPresenter extends SettingContract.Presenter {
Intent intent = new Intent(Intent.ACTION_DIAL); Intent intent = new Intent(Intent.ACTION_DIAL);
intent.setData(Uri.parse("tel:400-0086-898")); intent.setData(Uri.parse("tel:400-0086-898"));
mActivity.startActivity(intent); mActivity.startActivity(intent);
MobclickAgent.onEvent(mActivity, "customer_service_phone");
} }
@Override @Override
public void dumpToAboutus() { public void dumpToAboutus() {
mView.startActivity(AboutUsActivity.class); mView.startActivity(AboutUsActivity.class);
MobclickAgent.onEvent(mActivity, "about_us");
} }
@Override @Override
public void dumpToFeed() { public void dumpToFeed() {
mView.startActivity(FeedBackActivity.class); mView.startActivity(FeedBackActivity.class);
MobclickAgent.onEvent(mActivity, "feed_back");
} }
} }
...@@ -14,6 +14,7 @@ import com.dayu.bigfish.bean.UserInfo; ...@@ -14,6 +14,7 @@ import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.ui.OrderDetailsActivity; import com.dayu.bigfish.ui.OrderDetailsActivity;
import com.dayu.bigfish.ui.OrderRecordActivity; import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -90,6 +91,7 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter { ...@@ -90,6 +91,7 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
Intent intent = new Intent(mActivity, OrderDetailsActivity.class); Intent intent = new Intent(mActivity, OrderDetailsActivity.class);
intent.putExtra("orderId", orderId); intent.putExtra("orderId", orderId);
mActivity.startActivity(intent); mActivity.startActivity(intent);
MobclickAgent.onEvent(mActivity, "check_order_detail");
} }
public void doSearch(String str) { public void doSearch(String str) {
......
...@@ -21,5 +21,4 @@ public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter ...@@ -21,5 +21,4 @@ public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter
@Override @Override
public void initView() { public void initView() {
} }
} }
...@@ -9,7 +9,6 @@ import com.dayu.bigfish.databinding.ActivityAgreementBinding; ...@@ -9,7 +9,6 @@ import com.dayu.bigfish.databinding.ActivityAgreementBinding;
*/ */
public class AgreementActivity extends DataBindingActivity<ActivityAgreementBinding> { public class AgreementActivity extends DataBindingActivity<ActivityAgreementBinding> {
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_agreement; return R.layout.activity_agreement;
......
...@@ -22,7 +22,7 @@ import com.dayu.bigfish.databinding.ActivityMainBinding; ...@@ -22,7 +22,7 @@ import com.dayu.bigfish.databinding.ActivityMainBinding;
import com.dayu.bigfish.presenter.main.MainContract; import com.dayu.bigfish.presenter.main.MainContract;
import com.dayu.bigfish.presenter.main.MainPresenter; import com.dayu.bigfish.presenter.main.MainPresenter;
import com.dayu.bigfish.ui.fragment.HomeFirstTabFragment; import com.dayu.bigfish.ui.fragment.HomeFirstTabFragment;
import com.dayu.bigfish.ui.fragment.HomeMessageTabFragment; import com.dayu.bigfish.ui.fragment.HomeMessageFragment;
import com.dayu.bigfish.ui.fragment.HomeOrderFragment; import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
import com.dayu.bigfish.ui.fragment.HomePersonFragment; import com.dayu.bigfish.ui.fragment.HomePersonFragment;
import com.dayu.bigfish.ui.views.CustomDialog; import com.dayu.bigfish.ui.views.CustomDialog;
...@@ -45,7 +45,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -45,7 +45,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
private NotificationCompat.Builder builder; private NotificationCompat.Builder builder;
private HomeFirstTabFragment firstFragment; private HomeFirstTabFragment firstFragment;
private HomeOrderFragment secondFragment; private HomeOrderFragment secondFragment;
private HomeMessageTabFragment thirdFragment; private HomeMessageFragment thirdFragment;
private HomePersonFragment fourFragment; private HomePersonFragment fourFragment;
private int mFirstPositon = 1; private int mFirstPositon = 1;
...@@ -58,7 +58,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -58,7 +58,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
public void initView() { public void initView() {
firstFragment = HomeFirstTabFragment.newInstance(); firstFragment = HomeFirstTabFragment.newInstance();
secondFragment = HomeOrderFragment.newInstance(); secondFragment = HomeOrderFragment.newInstance();
thirdFragment = HomeMessageTabFragment.newInstance(); thirdFragment = HomeMessageFragment.newInstance();
fourFragment = HomePersonFragment.newInstance(); fourFragment = HomePersonFragment.newInstance();
mFragments = new Fragment[]{firstFragment, secondFragment, thirdFragment, fourFragment}; mFragments = new Fragment[]{firstFragment, secondFragment, thirdFragment, fourFragment};
mTabs = new TextView[]{mBind.tabFirst, mBind.tabSecond, mBind.tabThird, mBind.tabFour}; mTabs = new TextView[]{mBind.tabFirst, mBind.tabSecond, mBind.tabThird, mBind.tabFour};
......
...@@ -13,6 +13,7 @@ import com.dayu.bigfish.utils.UtilsDate; ...@@ -13,6 +13,7 @@ import com.dayu.bigfish.utils.UtilsDate;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.umeng.analytics.MobclickAgent;
import java.text.ParseException; import java.text.ParseException;
import java.util.Map; import java.util.Map;
...@@ -76,6 +77,7 @@ public class MessageDetailActivity extends DataBindingActivity<ActivityMessageDe ...@@ -76,6 +77,7 @@ public class MessageDetailActivity extends DataBindingActivity<ActivityMessageDe
} }
intent.putExtra("orderId", id); intent.putExtra("orderId", id);
startActivity(intent); startActivity(intent);
MobclickAgent.onEvent(mActivity, "message_check_order");
} }
private static Map<String, String> parseData(String data) { private static Map<String, String> parseData(String data) {
...@@ -85,6 +87,4 @@ public class MessageDetailActivity extends DataBindingActivity<ActivityMessageDe ...@@ -85,6 +87,4 @@ public class MessageDetailActivity extends DataBindingActivity<ActivityMessageDe
}.getType()); }.getType());
return map; return map;
} }
} }
...@@ -16,6 +16,7 @@ import com.luck.picture.lib.PictureSelector; ...@@ -16,6 +16,7 @@ import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.entity.LocalMedia;
import com.umeng.analytics.MobclickAgent;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
...@@ -89,6 +90,7 @@ public class ModifyPersonInfoActivity extends BaseActivity<ModifyPersonPresenter ...@@ -89,6 +90,7 @@ public class ModifyPersonInfoActivity extends BaseActivity<ModifyPersonPresenter
.setNegativeButton(getString(R.string.think_again)) .setNegativeButton(getString(R.string.think_again))
.setPositiveButton(getString(R.string.comfirm)); .setPositiveButton(getString(R.string.comfirm));
customDialog.show(); customDialog.show();
MobclickAgent.onEvent(mActivity, "commit_person_info");
} }
private String getPath() { private String getPath() {
......
...@@ -15,6 +15,7 @@ import com.luck.picture.lib.config.PictureConfig; ...@@ -15,6 +15,7 @@ import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.entity.LocalMedia;
import com.luck.picture.lib.tools.PictureFileUtils; import com.luck.picture.lib.tools.PictureFileUtils;
import com.umeng.analytics.MobclickAgent;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
...@@ -59,6 +60,7 @@ public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderAc ...@@ -59,6 +60,7 @@ public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderAc
.withAspectRatio(1, 1) .withAspectRatio(1, 1)
.freeStyleCropEnabled(false); .freeStyleCropEnabled(false);
selector.forResult(PictureConfig.CHOOSE_REQUEST); selector.forResult(PictureConfig.CHOOSE_REQUEST);
MobclickAgent.onEvent(mActivity, "modify_header_pic");
} }
@Override @Override
......
...@@ -10,6 +10,7 @@ import com.dayu.bigfish.databinding.ActivityOrderRecordBinding; ...@@ -10,6 +10,7 @@ import com.dayu.bigfish.databinding.ActivityOrderRecordBinding;
import com.dayu.bigfish.presenter.worksRecord.OrderRecordContract; import com.dayu.bigfish.presenter.worksRecord.OrderRecordContract;
import com.dayu.bigfish.presenter.worksRecord.OrderRecordPresenter; import com.dayu.bigfish.presenter.worksRecord.OrderRecordPresenter;
import com.dayu.bigfish.ui.adapter.OrderAdapter; import com.dayu.bigfish.ui.adapter.OrderAdapter;
import com.umeng.analytics.MobclickAgent;
/** /**
* 工单记录,展示已完成的订单 * 工单记录,展示已完成的订单
...@@ -51,6 +52,7 @@ public class OrderRecordActivity extends BaseActivity<OrderRecordPresenter, Acti ...@@ -51,6 +52,7 @@ public class OrderRecordActivity extends BaseActivity<OrderRecordPresenter, Acti
public void showSearch() { public void showSearch() {
mBind.rlTitle.setVisibility(View.GONE); mBind.rlTitle.setVisibility(View.GONE);
mBind.rlSeacher.setVisibility(View.VISIBLE); mBind.rlSeacher.setVisibility(View.VISIBLE);
MobclickAgent.onEvent(mActivity, "search_order");
} }
public OrderAdapter getmAdapter() { public OrderAdapter getmAdapter() {
......
...@@ -10,7 +10,6 @@ import com.dayu.bigfish.presenter.personinfo.PersonInfoContract; ...@@ -10,7 +10,6 @@ import com.dayu.bigfish.presenter.personinfo.PersonInfoContract;
import com.dayu.bigfish.presenter.personinfo.PersonInfoPresenter; import com.dayu.bigfish.presenter.personinfo.PersonInfoPresenter;
public class PersonInfoActivity extends BaseActivity<PersonInfoPresenter, ActivityPersonInfoBinding> implements PersonInfoContract.View { public class PersonInfoActivity extends BaseActivity<PersonInfoPresenter, ActivityPersonInfoBinding> implements PersonInfoContract.View {
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_person_info; return R.layout.activity_person_info;
......
...@@ -21,6 +21,7 @@ import com.luck.picture.lib.PictureSelector; ...@@ -21,6 +21,7 @@ import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType; import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.entity.LocalMedia;
import com.umeng.analytics.MobclickAgent;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -33,7 +34,6 @@ import java.util.List; ...@@ -33,7 +34,6 @@ import java.util.List;
*/ */
public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, ActivityProcessOrderBinding> public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, ActivityProcessOrderBinding>
implements ProcessOrderContract.View { implements ProcessOrderContract.View {
private int mIvWeight; private int mIvWeight;
private ImageView mAddIV; private ImageView mAddIV;
private static final int DELETECODE = 100; private static final int DELETECODE = 100;
...@@ -81,6 +81,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac ...@@ -81,6 +81,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
// .enableCrop(true)//是否裁剪 // .enableCrop(true)//是否裁剪
// .freeStyleCropEnabled(true) // .freeStyleCropEnabled(true)
selector.forResult(PictureConfig.CHOOSE_REQUEST); selector.forResult(PictureConfig.CHOOSE_REQUEST);
MobclickAgent.onEvent(mActivity, "add_server_pic");
} }
...@@ -131,7 +132,6 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac ...@@ -131,7 +132,6 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
} }
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
......
...@@ -7,6 +7,7 @@ import com.dayu.bigfish.databinding.ActivityCommomRecycleBinding; ...@@ -7,6 +7,7 @@ import com.dayu.bigfish.databinding.ActivityCommomRecycleBinding;
import com.dayu.bigfish.presenter.receivingorder.ReceivingContract; import com.dayu.bigfish.presenter.receivingorder.ReceivingContract;
import com.dayu.bigfish.presenter.receivingorder.ReceivingPresenter; import com.dayu.bigfish.presenter.receivingorder.ReceivingPresenter;
import com.dayu.bigfish.ui.adapter.OrderAdapter; import com.dayu.bigfish.ui.adapter.OrderAdapter;
import com.umeng.analytics.MobclickAgent;
/** /**
...@@ -38,6 +39,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter, Activity ...@@ -38,6 +39,7 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter, Activity
if (view.getId() == R.id.item_text_phone) { if (view.getId() == R.id.item_text_phone) {
Order order = (Order) adapter.getItem(position); Order order = (Order) adapter.getItem(position);
mPresenter.receiveOrder(order.getId(), mPresenter.getmUserId()); mPresenter.receiveOrder(order.getId(), mPresenter.getmUserId());
MobclickAgent.onEvent(mActivity, "recevie_order");
} }
}); });
} }
......
...@@ -33,5 +33,4 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett ...@@ -33,5 +33,4 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett
.setPositiveButton(getString(R.string.comfirm)); .setPositiveButton(getString(R.string.comfirm));
dialog.show(); dialog.show();
} }
} }
...@@ -48,5 +48,4 @@ public class SubcribeTimeActivity extends BaseActivity<SubcribeTimePresenter, Ac ...@@ -48,5 +48,4 @@ public class SubcribeTimeActivity extends BaseActivity<SubcribeTimePresenter, Ac
pvTime.setDate(Calendar.getInstance()); pvTime.setDate(Calendar.getInstance());
pvTime.show(); pvTime.show();
} }
} }
...@@ -20,9 +20,13 @@ import com.dayu.bigfish.ui.SubcribeTimeActivity; ...@@ -20,9 +20,13 @@ import com.dayu.bigfish.ui.SubcribeTimeActivity;
import com.dayu.bigfish.utils.LocationUtils; import com.dayu.bigfish.utils.LocationUtils;
import com.dayu.bigfish.utils.ProgressUtil; import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.UtilsDate; import com.dayu.bigfish.utils.UtilsDate;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.util.HashMap;
import java.util.Map;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer; import io.reactivex.functions.Consumer;
...@@ -207,13 +211,32 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -207,13 +211,32 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.tvItemProcess.setOnClickListener( holder.tvItemProcess.setOnClickListener(
v -> processClick(item, holder, position)); v -> processClick(item, holder, position));
holder.itemUpdataTime.setOnClickListener(v -> holder.itemUpdataTime.setOnClickListener(v -> {
dumpSubcribeTimeActivity(id, position, item.getStatus())); dumpSubcribeTimeActivity(id, position, item.getStatus());
//工单状态:1未接单2未预约3已预约4进行中5已完成6已取消7订单关闭
//工单子状态:3已预约1未出发|3已预约2已出发|4进行中3无SOP处理|4进行中4SOP未完成|4进行中5SOP已完成
if (item.getStatus() == 2) {
MobclickAgent.onEvent(mContext, "subcribe_time");
} else if (item.getStatus() == 3) {
MobclickAgent.onEvent(mContext, "modify_time");
} else if (item.getStatus() == 4) {
MobclickAgent.onEvent(mContext, "modify_time_again");
}
});
if (item.getStatus() != 1) { if (item.getStatus() != 1) {
holder.itemTextPhone.setOnClickListener(v -> { holder.itemTextPhone.setOnClickListener(v -> {
Intent intent = new Intent(Intent.ACTION_DIAL); Intent intent = new Intent(Intent.ACTION_DIAL);
intent.setData(Uri.parse("tel:" + item.getCustomerMobile())); intent.setData(Uri.parse("tel:" + item.getCustomerMobile()));
mContext.startActivity(intent); mContext.startActivity(intent);
Map<String, String> map_ekv = new HashMap<>();
if (item.getStatus() == 2) {
map_ekv.put("type", mContext.getString(R.string.receive_list));
} else if (item.getStatus() == 3 || item.getStatus() == 4) {
map_ekv.put("type", mContext.getString(R.string.waite_server));
} else if (item.getStatus() == 5) {
map_ekv.put("type", mContext.getString(R.string.finish_order));
}
MobclickAgent.onEvent(mContext, "take_phone", map_ekv);
}); });
} }
} }
...@@ -264,6 +287,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -264,6 +287,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
EventBus.getDefault().post(new RefreshServe(1)); EventBus.getDefault().post(new RefreshServe(1));
} }
})); }));
MobclickAgent.onEvent(mContext, "start_off");
} else if (mItem.getSubStatus() == 2) { } else if (mItem.getSubStatus() == 2) {
mPresenter.startServer(mItem.getId(), latitude, longitude) mPresenter.startServer(mItem.getId(), latitude, longitude)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
...@@ -283,6 +307,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -283,6 +307,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
EventBus.getDefault().post(new RefreshServe(1)); EventBus.getDefault().post(new RefreshServe(1));
} }
})); }));
MobclickAgent.onEvent(mContext, "start_server");
} }
} }
}); });
...@@ -302,6 +327,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -302,6 +327,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
intent.putExtra(Constants.ORDER_ID, id); intent.putExtra(Constants.ORDER_ID, id);
intent.putExtra(Constants.ORDER_POSTION, adapterPosition); intent.putExtra(Constants.ORDER_POSTION, adapterPosition);
mContext.startActivity(intent); mContext.startActivity(intent);
MobclickAgent.onEvent(mContext, "process_order");
} }
private void dumpSOPActivity(int id, int adapterPosition) { private void dumpSOPActivity(int id, int adapterPosition) {
...@@ -309,6 +335,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -309,6 +335,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
intent.putExtra(Constants.ORDER_ID, id); intent.putExtra(Constants.ORDER_ID, id);
intent.putExtra(Constants.ORDER_POSTION, adapterPosition); intent.putExtra(Constants.ORDER_POSTION, adapterPosition);
mContext.startActivity(intent); mContext.startActivity(intent);
MobclickAgent.onEvent(mContext, "process_sop");
} }
......
...@@ -7,6 +7,7 @@ import com.dayu.bigfish.base.BaseFragment; ...@@ -7,6 +7,7 @@ import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.databinding.FragmentFirstBinding; import com.dayu.bigfish.databinding.FragmentFirstBinding;
import com.dayu.bigfish.presenter.homefirsttab.HomeFirstContract; import com.dayu.bigfish.presenter.homefirsttab.HomeFirstContract;
import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter; import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter;
import com.umeng.analytics.MobclickAgent;
/** /**
* Created by luofan on 2017/11/20. * Created by luofan on 2017/11/20.
...@@ -14,6 +15,8 @@ import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter; ...@@ -14,6 +15,8 @@ import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter;
public class HomeFirstTabFragment extends BaseFragment<HomeFirstPresenter, FragmentFirstBinding> implements HomeFirstContract.View { public class HomeFirstTabFragment extends BaseFragment<HomeFirstPresenter, FragmentFirstBinding> implements HomeFirstContract.View {
private static final String TAG = "HomeFirstTabFragment";
public static HomeFirstTabFragment newInstance() { public static HomeFirstTabFragment newInstance() {
Bundle args = new Bundle(); Bundle args = new Bundle();
HomeFirstTabFragment fragment = new HomeFirstTabFragment(); HomeFirstTabFragment fragment = new HomeFirstTabFragment();
...@@ -31,7 +34,12 @@ public class HomeFirstTabFragment extends BaseFragment<HomeFirstPresenter, Fragm ...@@ -31,7 +34,12 @@ public class HomeFirstTabFragment extends BaseFragment<HomeFirstPresenter, Fragm
} }
@Override @Override
protected void lazyLoad() { public void onHiddenChanged(boolean hidden) {
super.lazyLoad(); super.onHiddenChanged(hidden);
if (hidden) {
MobclickAgent.onPageEnd(TAG);
} else {
MobclickAgent.onPageStart(TAG);
}
} }
} }
package com.dayu.bigfish.ui.fragment; package com.dayu.bigfish.ui.fragment;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
...@@ -8,6 +9,7 @@ import com.dayu.bigfish.base.DataBindingFragment; ...@@ -8,6 +9,7 @@ import com.dayu.bigfish.base.DataBindingFragment;
import com.dayu.bigfish.databinding.FragmentMessageBinding; import com.dayu.bigfish.databinding.FragmentMessageBinding;
import com.dayu.bigfish.ui.adapter.FragmentBaseAdapter; import com.dayu.bigfish.ui.adapter.FragmentBaseAdapter;
import com.dayu.bigfish.utils.TabLayoutUtils; import com.dayu.bigfish.utils.TabLayoutUtils;
import com.umeng.analytics.MobclickAgent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -19,12 +21,13 @@ import io.reactivex.functions.Function; ...@@ -19,12 +21,13 @@ import io.reactivex.functions.Function;
* Created by luofan on 2017/11/20. * Created by luofan on 2017/11/20.
*/ */
public class HomeMessageTabFragment extends DataBindingFragment<FragmentMessageBinding> { public class HomeMessageFragment extends DataBindingFragment<FragmentMessageBinding> {
private int mIndex = -1; private int mIndex = 0;
private String mUmTag = "serverMessage";
public static HomeMessageTabFragment newInstance() { public static HomeMessageFragment newInstance() {
Bundle args = new Bundle(); Bundle args = new Bundle();
HomeMessageTabFragment fragment = new HomeMessageTabFragment(); HomeMessageFragment fragment = new HomeMessageFragment();
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
} }
...@@ -55,6 +58,7 @@ public class HomeMessageTabFragment extends DataBindingFragment<FragmentMessageB ...@@ -55,6 +58,7 @@ public class HomeMessageTabFragment extends DataBindingFragment<FragmentMessageB
mBind.vpMessage.setCurrentItem(mIndex); mBind.vpMessage.setCurrentItem(mIndex);
mBind.tbMessage.getTabAt(mIndex).select(); mBind.tbMessage.getTabAt(mIndex).select();
} }
initUM();
} }
public void swtichFragment(int position) { public void swtichFragment(int position) {
...@@ -69,4 +73,44 @@ public class HomeMessageTabFragment extends DataBindingFragment<FragmentMessageB ...@@ -69,4 +73,44 @@ public class HomeMessageTabFragment extends DataBindingFragment<FragmentMessageB
mIndex = index; mIndex = index;
} }
private void initUM() {
mBind.tbMessage.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
int temp = tab.getPosition();
if (temp == 0) {
mUmTag = "serverMessage";
MobclickAgent.onPageStart("serverMessage");
} else {
mUmTag = "dayuMessage";
MobclickAgent.onPageStart("dayuMessage");
}
}
@Override
public void onTabUnselected(TabLayout.Tab tab) {
int temp = tab.getPosition();
if (temp == 0) {
MobclickAgent.onPageEnd("serverMessage");
} else {
MobclickAgent.onPageEnd("dayuMessage");
}
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
}
});
}
@Override
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (hidden) {
MobclickAgent.onPageEnd(mUmTag);
} else {
MobclickAgent.onPageStart(mUmTag);
}
}
} }
...@@ -18,6 +18,7 @@ import com.dayu.bigfish.presenter.homeorder.HomeOrderContract; ...@@ -18,6 +18,7 @@ import com.dayu.bigfish.presenter.homeorder.HomeOrderContract;
import com.dayu.bigfish.presenter.homeorder.HomeOrderPresenter; import com.dayu.bigfish.presenter.homeorder.HomeOrderPresenter;
import com.dayu.bigfish.ui.adapter.FragmentAdapter; import com.dayu.bigfish.ui.adapter.FragmentAdapter;
import com.dayu.bigfish.utils.TabLayoutUtils; import com.dayu.bigfish.utils.TabLayoutUtils;
import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
...@@ -46,6 +47,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment ...@@ -46,6 +47,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
public final static int ORDER_FINISH = 6;//已完成 public final static int ORDER_FINISH = 6;//已完成
public final static int ORDER_NOCONTACT_FINISH = 7;//无联系人已完成 public final static int ORDER_NOCONTACT_FINISH = 7;//无联系人已完成
private String[] tabDesc; private String[] tabDesc;
private String mUmTag = "OrderFirstTabFragment";
public static HomeOrderFragment newInstance() { public static HomeOrderFragment newInstance() {
Bundle args = new Bundle(); Bundle args = new Bundle();
...@@ -99,19 +101,27 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment ...@@ -99,19 +101,27 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_order_item_date)); mTabNumTv.setTextColor(getResources().getColor(R.color.cl_order_item_date));
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_order_item_date)); mTabTextTv.setTextColor(getResources().getColor(R.color.cl_order_item_date));
mBind.vpHome.setCurrentItem(0); mBind.vpHome.setCurrentItem(0);
MobclickAgent.onPageStart("OrderFirstTabFragment");
mUmTag = "OrderFirstTabFragment";
break; break;
case 1: case 1:
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_yellow)); mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_yellow));
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_yellow)); mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_yellow));
mBind.vpHome.setCurrentItem(1); mBind.vpHome.setCurrentItem(1);
mUmTag = "OrderSecondTabFragment";
MobclickAgent.onPageStart("OrderSecondTabFragment");
break; break;
case 2: case 2:
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_read)); mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_read));
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_read)); mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_read));
mBind.vpHome.setCurrentItem(2); mBind.vpHome.setCurrentItem(2);
mUmTag = "OrderThreeTabFragment";
MobclickAgent.onPageStart("OrderThreeTabFragment");
break; break;
case 3: case 3:
mBind.vpHome.setCurrentItem(3); mBind.vpHome.setCurrentItem(3);
mUmTag = "OrderFourTabFragment";
MobclickAgent.onPageStart("OrderFourTabFragment");
break; break;
} }
} }
...@@ -125,16 +135,20 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment ...@@ -125,16 +135,20 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
case 0: case 0:
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_init)); mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_init)); mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
MobclickAgent.onPageEnd("OrderFirstTabFragment");
break; break;
case 1: case 1:
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_init)); mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_init)); mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
MobclickAgent.onPageEnd("OrderSecondTabFragment");
break; break;
case 2: case 2:
mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_init)); mTabNumTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_init)); mTabTextTv.setTextColor(getResources().getColor(R.color.cl_tab_init));
MobclickAgent.onPageEnd("OrderThreeTabFragment");
break; break;
case 3: case 3:
MobclickAgent.onPageEnd("OrderFourTabFragment");
break; break;
} }
} }
...@@ -181,7 +195,6 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment ...@@ -181,7 +195,6 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
* @param iconID tab标签数字下的状态说明(1.0版本默认4种状态) * @param iconID tab标签数字下的状态说明(1.0版本默认4种状态)
*/ */
private View CreatTab(String number, String iconID) { private View CreatTab(String number, String iconID) {
View newtab = LayoutInflater.from(mActivity).inflate(R.layout.activity_home_tab, null); View newtab = LayoutInflater.from(mActivity).inflate(R.layout.activity_home_tab, null);
TextView textView_number = (TextView) newtab.findViewById(R.id.tabtext); TextView textView_number = (TextView) newtab.findViewById(R.id.tabtext);
AssetManager mgr = mActivity.getAssets(); AssetManager mgr = mActivity.getAssets();
...@@ -190,11 +203,20 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment ...@@ -190,11 +203,20 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
textView_number.setText(number); textView_number.setText(number);
TextView textView = (TextView) newtab.findViewById(tabicon); TextView textView = (TextView) newtab.findViewById(tabicon);
textView.setText(iconID); textView.setText(iconID);
return newtab; return newtab;
} }
@Override @Override
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (hidden) {
MobclickAgent.onPageEnd(mUmTag);
} else {
MobclickAgent.onPageStart(mUmTag);
}
}
@Override
public void onDetach() { public void onDetach() {
super.onDetach(); super.onDetach();
EventBus.getDefault().unregister(this); EventBus.getDefault().unregister(this);
...@@ -204,4 +226,5 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment ...@@ -204,4 +226,5 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
public void onRefreshTab(RefreshTab event) { public void onRefreshTab(RefreshTab event) {
mPresenter.getTabNum(event.getTabNum()); mPresenter.getTabNum(event.getTabNum());
} }
} }
...@@ -29,6 +29,7 @@ import com.dayu.bigfish.ui.views.CustomDialog; ...@@ -29,6 +29,7 @@ import com.dayu.bigfish.ui.views.CustomDialog;
import com.dayu.bigfish.utils.ProgressUtil; import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.SPUtils; import com.dayu.bigfish.utils.SPUtils;
import com.dayu.bigfish.utils.managers.UserManager; import com.dayu.bigfish.utils.managers.UserManager;
import com.umeng.analytics.MobclickAgent;
/** /**
* Created by luofan on 2017/11/20. * Created by luofan on 2017/11/20.
...@@ -36,6 +37,7 @@ import com.dayu.bigfish.utils.managers.UserManager; ...@@ -36,6 +37,7 @@ import com.dayu.bigfish.utils.managers.UserManager;
public class HomePersonFragment extends BaseFragment<HomePersonPresenter, FragmentPersonalCenterBinding> public class HomePersonFragment extends BaseFragment<HomePersonPresenter, FragmentPersonalCenterBinding>
implements HomeFourContract.View { implements HomeFourContract.View {
private static final String TAG = "HomePersonFragment";
private int userId; private int userId;
private int siteId; private int siteId;
private String mUserName; private String mUserName;
...@@ -58,13 +60,6 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme ...@@ -58,13 +60,6 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
} }
@Override @Override
public void onResume() {
super.onResume();
UserInfo userInfo = UserManager.getInstance().getUser();
mPresenter.mUrl.set(userInfo.getHeaderImg());
}
@Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.fragment_personal_center; return R.layout.fragment_personal_center;
} }
...@@ -145,18 +140,21 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme ...@@ -145,18 +140,21 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
Intent intent = new Intent(mActivity, AccountBalanceActivity.class); Intent intent = new Intent(mActivity, AccountBalanceActivity.class);
intent.putExtra(Constants.ACCOUNT_BALANCE, mAccountBalance); intent.putExtra(Constants.ACCOUNT_BALANCE, mAccountBalance);
startActivity(intent); startActivity(intent);
MobclickAgent.onEvent(mActivity, "check_account");
} }
@Override @Override
public void dumpToSetting() { public void dumpToSetting() {
Intent intentSetting = new Intent(mActivity, SettingActivity.class); Intent intentSetting = new Intent(mActivity, SettingActivity.class);
startActivity(intentSetting); startActivity(intentSetting);
MobclickAgent.onEvent(mActivity, "setting");
} }
@Override @Override
public void dumpToOrderRecord() { public void dumpToOrderRecord() {
Intent intent = new Intent(mActivity, OrderRecordActivity.class); Intent intent = new Intent(mActivity, OrderRecordActivity.class);
startActivity(intent); startActivity(intent);
MobclickAgent.onEvent(mActivity, "order_record");
} }
private void showAlertDialog() { private void showAlertDialog() {
...@@ -166,7 +164,9 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme ...@@ -166,7 +164,9 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
Intent intent = new Intent(mActivity, WithdrawalsActivity.class); Intent intent = new Intent(mActivity, WithdrawalsActivity.class);
startActivity(intent); startActivity(intent);
dialog1.dismiss(); dialog1.dismiss();
MobclickAgent.onEvent(mActivity, "sure_set_account");
} else { } else {
MobclickAgent.onEvent(mActivity, "cancle_set_account");
} }
dialog1.dismiss(); dialog1.dismiss();
}); });
...@@ -241,4 +241,22 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme ...@@ -241,4 +241,22 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
} }
} }
@Override
public void onResume() {
super.onResume();
UserInfo userInfo = UserManager.getInstance().getUser();
mPresenter.mUrl.set(userInfo.getHeaderImg());
}
@Override
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (hidden) {
MobclickAgent.onPageEnd(TAG);
} else {
MobclickAgent.onPageStart(TAG);
}
}
} }
...@@ -34,5 +34,4 @@ public class MessageFragment extends BaseFragment<messagePresenter, LrecyclerVie ...@@ -34,5 +34,4 @@ public class MessageFragment extends BaseFragment<messagePresenter, LrecyclerVie
@Override @Override
public void initView() { public void initView() {
} }
} }
...@@ -11,6 +11,7 @@ import com.dayu.bigfish.base.DataBindingFragment; ...@@ -11,6 +11,7 @@ import com.dayu.bigfish.base.DataBindingFragment;
import com.dayu.bigfish.bean.OrderDetail; import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.FragmentOrderDatailsBinding; import com.dayu.bigfish.databinding.FragmentOrderDatailsBinding;
import com.dayu.bigfish.utils.UIUtils; import com.dayu.bigfish.utils.UIUtils;
import com.umeng.analytics.MobclickAgent;
/** /**
...@@ -19,14 +20,14 @@ import com.dayu.bigfish.utils.UIUtils; ...@@ -19,14 +20,14 @@ import com.dayu.bigfish.utils.UIUtils;
*/ */
public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderDatailsBinding> { public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderDatailsBinding> {
private static final String TAG = "OrderDetaillsFragment";
private boolean mFlag = true; private boolean mFlag = true;
private CoreAdapter mAdapter; private CoreAdapter mAdapter;
private OrderDetail mDetail; private OrderDetail mDetail;
public static OrderDetaillsFragment newInstance(OrderDetail detail) { public static OrderDetaillsFragment newInstance(OrderDetail detail) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putSerializable(Constants.ORDER_DETAIL,detail); args.putSerializable(Constants.ORDER_DETAIL, detail);
OrderDetaillsFragment fragment = new OrderDetaillsFragment(); OrderDetaillsFragment fragment = new OrderDetaillsFragment();
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
...@@ -101,4 +102,14 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData ...@@ -101,4 +102,14 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
return mActivity.getString(R.string.no_data); return mActivity.getString(R.string.no_data);
} }
} }
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (getUserVisibleHint()) {
MobclickAgent.onPageEnd(TAG);
} else {
MobclickAgent.onPageStart(TAG);
}
}
} }
...@@ -8,6 +8,7 @@ import com.dayu.bigfish.base.DataBindingFragment; ...@@ -8,6 +8,7 @@ import com.dayu.bigfish.base.DataBindingFragment;
import com.dayu.bigfish.bean.OrderDetail; import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.FragmentOrderServeBinding; import com.dayu.bigfish.databinding.FragmentOrderServeBinding;
import com.dayu.bigfish.utils.UtilsDate; import com.dayu.bigfish.utils.UtilsDate;
import com.umeng.analytics.MobclickAgent;
import java.text.ParseException; import java.text.ParseException;
...@@ -17,6 +18,7 @@ import java.text.ParseException; ...@@ -17,6 +18,7 @@ import java.text.ParseException;
*/ */
public class OrderDetailsServeFragment extends DataBindingFragment<FragmentOrderServeBinding> { public class OrderDetailsServeFragment extends DataBindingFragment<FragmentOrderServeBinding> {
private static final String TAG = "OrderDetailsServeFragme";
public static OrderDetailsServeFragment newInstance(OrderDetail detail) { public static OrderDetailsServeFragment newInstance(OrderDetail detail) {
Bundle args = new Bundle(); Bundle args = new Bundle();
...@@ -46,4 +48,14 @@ public class OrderDetailsServeFragment extends DataBindingFragment<FragmentOrder ...@@ -46,4 +48,14 @@ public class OrderDetailsServeFragment extends DataBindingFragment<FragmentOrder
} }
mBind.recyclerView.setData(details.getRecord()); mBind.recyclerView.setData(details.getRecord());
} }
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (getUserVisibleHint()) {
MobclickAgent.onPageEnd(TAG);
} else {
MobclickAgent.onPageStart(TAG);
}
}
} }
...@@ -21,6 +21,7 @@ import org.greenrobot.eventbus.ThreadMode; ...@@ -21,6 +21,7 @@ import org.greenrobot.eventbus.ThreadMode;
public class OrderFirstTabFragment extends BaseFragment<OrderDoingPresenter, FragmentCommomRecycleBinding> public class OrderFirstTabFragment extends BaseFragment<OrderDoingPresenter, FragmentCommomRecycleBinding>
implements orderDoingContract.View { implements orderDoingContract.View {
private static final String TAG = "OrderFirstTabFragment";
private OrderAdapter mAdapter; private OrderAdapter mAdapter;
@Override @Override
......
...@@ -16,6 +16,7 @@ import com.dayu.bigfish.ui.adapter.OrderFourTabAdapter; ...@@ -16,6 +16,7 @@ import com.dayu.bigfish.ui.adapter.OrderFourTabAdapter;
public class OrderFourTabFragment extends BaseFragment<OrderDoingPresenter, FragmentCommomRecycleBinding> public class OrderFourTabFragment extends BaseFragment<OrderDoingPresenter, FragmentCommomRecycleBinding>
implements orderDoingContract.View { implements orderDoingContract.View {
private static final String TAG = "OrderFourTabFragment";
private OrderFourTabAdapter mAdapter; private OrderFourTabAdapter mAdapter;
@Override @Override
......
...@@ -31,6 +31,7 @@ import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE; ...@@ -31,6 +31,7 @@ import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE;
public class OrderSecondTabFragment extends BaseFragment<OrderDoingPresenter, FragmentCommomRecycleBinding> public class OrderSecondTabFragment extends BaseFragment<OrderDoingPresenter, FragmentCommomRecycleBinding>
implements orderDoingContract.View { implements orderDoingContract.View {
private static final String TAG = "OrderSecondTabFragment";
private OrderAdapter mAdapter; private OrderAdapter mAdapter;
private List<Order> mDatas; private List<Order> mDatas;
......
...@@ -15,6 +15,7 @@ import com.dayu.bigfish.ui.adapter.OrderThreeTabAdapter; ...@@ -15,6 +15,7 @@ import com.dayu.bigfish.ui.adapter.OrderThreeTabAdapter;
public class OrderThreeTabFragment extends BaseFragment<OrderDoingPresenter, FragmentCommomRecycleBinding> public class OrderThreeTabFragment extends BaseFragment<OrderDoingPresenter, FragmentCommomRecycleBinding>
implements orderDoingContract.View { implements orderDoingContract.View {
private static final String TAG = "OrderThreeTabFragment";
@Override @Override
protected void lazyLoad() { protected void lazyLoad() {
......
...@@ -110,7 +110,7 @@ public class LRecyclerView<M, B> extends FrameLayout { ...@@ -110,7 +110,7 @@ public class LRecyclerView<M, B> extends FrameLayout {
swipeRefresh.setEnabled(isRefreshable); swipeRefresh.setEnabled(isRefreshable);
if (needCoreAdapter) { if (needCoreAdapter) {
if (itemType != 0) { if (itemType != 0) {
mCoreAdapter = new CoreAdapter<>(isNeedFoot); mCoreAdapter = new CoreAdapter(isNeedFoot);
setViewType(itemType); setViewType(itemType);
recyclerview.setAdapter(mCoreAdapter); recyclerview.setAdapter(mCoreAdapter);
} else { } else {
......
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