Skip to content

android / dayu

Go to a project
Commit 8bf2d153 by 罗翻
Options

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

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