集成友盟事件统计和页面停留时间

app/src/main/java/com/dayu/bigfish/InitializeActivity.java

@@ -65,7 +65,7 @@ public class InitializeActivity extends AppCompatActivity {
         } else {
             intent = new Intent(InitializeActivity.this, LoginActivity.class);
         }
-        mDisposable = Observable.timer(2000, TimeUnit.MICROSECONDS).subscribe(
+        mDisposable = Observable.timer(1000, TimeUnit.MICROSECONDS).subscribe(
                 aLong -> {
                     startActivity(intent);
                     finish();

app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomePersonPresenter.java

@@ -4,6 +4,7 @@ import android.databinding.ObservableField;
 
 import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
+import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.bean.AlipayInfo;
 import com.dayu.bigfish.bean.EngineerInfo;
 import com.dayu.bigfish.bean.OrderRecord;
@@ -74,7 +75,7 @@ public class HomePersonPresenter extends HomeFourContract.Presenter {
     @Override
     public void dumpToPersonalInfo() {
         mView.startActivity(PersonInfoActivity.class);
-        MobclickAgent.onEvent(mActivity, "check_personInfo");
+        MobclickAgent.onEvent(MyApplication.getContext(), "check_personInfo");
     }
 
 }

app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderPresenter.java

@@ -2,6 +2,7 @@ package com.dayu.bigfish.presenter.homeorder;
 
 import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
+import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.bean.Tab;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.OrderRecordActivity;
@@ -54,7 +55,7 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
     @Override
     public void dumpToOrderRecordActivity() {
         mView.startActivity(OrderRecordActivity.class);
-        MobclickAgent.onEvent(mActivity, "order_history");
+        MobclickAgent.onEvent(MyApplication.getContext(), "order_history");
     }
 
 

app/src/main/java/com/dayu/bigfish/presenter/login/LoginContract.java

@@ -13,8 +13,14 @@ import com.dayu.bigfish.ui.views.CustomDialog;
 public interface LoginContract {
 
     interface View extends BaseView {
+        /**
+         * 验证码倒计时.
+         */
         void changeCodeBtn();
 
+        /**
+         * 语音验证码变灰.
+         */
         void changeVoiceCodeBtn();
 
         void showLoginDialog(CustomDialog.OnCloseListener listener);

app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java

@@ -5,6 +5,7 @@ import android.text.TextUtils;
 
 import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
+import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.AgreementActivity;
@@ -15,6 +16,7 @@ import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
 import com.dayu.bigfish.utils.managers.UserManager;
 import com.hyphenate.EMCallBack;
 import com.hyphenate.chat.EMClient;
+import com.umeng.analytics.MobclickAgent;
 
 import io.reactivex.functions.Consumer;
 
@@ -123,5 +125,6 @@ public class LoginPresenter extends LoginContract.Presenter {
     @Override
     public void dumpAgreement() {
         mView.startActivity(AgreementActivity.class);
+        MobclickAgent.onEvent(MyApplication.getContext(), "customer_agreement");
     }
 }

app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java

@@ -11,6 +11,7 @@ import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
 import com.dayu.bigfish.BuildConfig;
 import com.dayu.bigfish.Constants;
+import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.api.DownloadService;
 import com.dayu.bigfish.base.BasePageBean;
@@ -160,12 +161,12 @@ public class MainPresenter extends MainContract.Presenter {
                         }
                     });
                 }
-                MobclickAgent.onEvent(mActivity, "sure_update_app");
+                MobclickAgent.onEvent(MyApplication.getContext(), "sure_update_app");
             } else {
                 if (info.getType() == 2) {
                     mActivity.finish();
                 }
-                MobclickAgent.onEvent(mActivity, "cancle_update_app");
+                MobclickAgent.onEvent(MyApplication.getContext(), "cancle_update_app");
             }
             dialog.dismiss();
         });

app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonPresenter.java

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 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.bean.EngineerInfo;
 import com.umeng.analytics.MobclickAgent;
@@ -73,9 +74,9 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
                 } else {
                     modifyUserInfo(mRealName.get(), mIdentity.get(), mIdentityUrl.get());
                 }
-                MobclickAgent.onEvent(mActivity, "sure_commit_info");
+                MobclickAgent.onEvent(MyApplication.getContext(), "sure_commit_info");
             } else {
-                MobclickAgent.onEvent(mActivity, "cancle_commit_info");
+                MobclickAgent.onEvent(MyApplication.getContext(), "cancle_commit_info");
             }
         });
     }

app/src/main/java/com/dayu/bigfish/presenter/orderdoing/OrderDoingPresenter.java

@@ -6,6 +6,7 @@ import android.databinding.ObservableField;
 import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
+import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.base.BasePageBean;
 import com.dayu.bigfish.bean.ErrorOrder;
 import com.dayu.bigfish.bean.Order;
@@ -117,6 +118,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");
+        MobclickAgent.onEvent(MyApplication.getContext(), "check_order_detail");
     }
 }

app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoPresenter.java

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
+import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.bean.EngineerInfo;
 import com.dayu.bigfish.bean.UserInfo;
 import com.dayu.bigfish.ui.ModifyPersonInfoActivity;
@@ -34,7 +35,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
     @Override
     public void dumpToHeader() {
         mView.startActivityForReult(MyHeaderIvActivity.class, 1);
-        MobclickAgent.onEvent(mActivity, "check_header_pic");
+        MobclickAgent.onEvent(MyApplication.getContext(), "check_header_pic");
     }
 
     @Override
@@ -43,7 +44,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");
+            MobclickAgent.onEvent(MyApplication.getContext(), "modify_person_info");
         }
     }
 

app/src/main/java/com/dayu/bigfish/presenter/worksRecord/OrderRecordPresenter.java

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
+import com.dayu.bigfish.MyApplication;
 import com.dayu.bigfish.base.BasePageBean;
 import com.dayu.bigfish.bean.Order;
 import com.dayu.bigfish.bean.UserInfo;
@@ -91,7 +92,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");
+        MobclickAgent.onEvent(MyApplication.getContext(), "check_order_detail");
     }
 
     public void doSearch(String str) {

app/src/main/java/com/dayu/bigfish/ui/LoginActivity.java

@@ -7,6 +7,7 @@ import com.dayu.bigfish.presenter.login.LoginContract;
 import com.dayu.bigfish.presenter.login.LoginPresenter;
 import com.dayu.bigfish.ui.views.CustomDialog;
 import com.dayu.bigfish.utils.TimeCountUtil;
+import com.umeng.analytics.MobclickAgent;
 
 
 /**
@@ -29,12 +30,14 @@ public class LoginActivity extends BaseActivity<LoginPresenter, LoginBinding> im
     public void changeCodeBtn() {
         TimeCountUtil timeCountUtil = new TimeCountUtil(mActivity, 60000, 1000, mBind.btnSendCode);
         timeCountUtil.start();
+        MobclickAgent.onEvent(mActivity,"sms_code");
     }
 
     @Override
     public void changeVoiceCodeBtn() {
         mBind.tvVoiceCode.setTextColor(getResources().getColor(R.color.cl_text));
         mBind.tvVoiceCode.setClickable(false);
+        MobclickAgent.onEvent(mActivity,"sms_voice");
     }
 
     @Override

app/src/main/java/com/dayu/bigfish/ui/MainActivity.java

@@ -27,6 +27,7 @@ import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
 import com.dayu.bigfish.ui.fragment.HomePersonFragment;
 import com.dayu.bigfish.ui.views.CustomDialog;
 import com.dayu.bigfish.utils.LocationUtils;
+import com.umeng.analytics.MobclickAgent;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -137,7 +138,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
         } else {
             mBind.ivMessage.setVisibility(View.GONE);
         }
-
     }
 
     /**
@@ -207,6 +207,18 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+        MobclickAgent.onResume(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        MobclickAgent.onPause(this);
+    }
+
+    @Override
     protected void onDestroy() {
         super.onDestroy();
         LocationUtils.destroy();

app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java

@@ -13,6 +13,7 @@ import com.dayu.bigfish.ui.adapter.FragmentBaseAdapter;
 import com.dayu.bigfish.ui.fragment.OrderDetaillsFragment;
 import com.dayu.bigfish.ui.fragment.OrderDetailsServeFragment;
 import com.dayu.bigfish.utils.TabLayoutUtils;
+import com.umeng.analytics.MobclickAgent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,4 +56,16 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
         mBind.tablayout.setTabMode(TabLayout.MODE_FIXED);
         TabLayoutUtils.setIndicator(mBind.tablayout, 60, 60, R.color.cl_receiving_order_item_data, this);
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        MobclickAgent.onResume(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        MobclickAgent.onPause(this);
+    }
 }
\ No newline at end of file

app/src/main/java/com/dayu/bigfish/ui/SopWebViewActivity.java

@@ -63,6 +63,7 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
         mWebView.setLayoutParams(new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
         mBind.llWeb.addView(mWebView);
+        mBind.tvTitle.setText("SOP");
         initWebView();
     }
 
@@ -302,5 +303,4 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
         } else {
         }
     }
-
 }

app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetaillsFragment.java

@@ -50,11 +50,13 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
     public void initDataView(OrderDetail dataBean) {
         mBind.tvOrderState.setText(getStaus(dataBean.getStatus()));
         mBind.tvLookMore.setOnClickListener(o -> lookMore());
-        if (UIUtils.isOverFlowed(mBind.tvOrderRmark)) {
-            mBind.tvLookMore.setVisibility(View.VISIBLE);
-        } else {
-            mBind.tvLookMore.setVisibility(View.GONE);
-        }
+        mBind.tvOrderRmark.post(() -> {
+            if (UIUtils.isOverFlowed(mBind.tvOrderRmark)) {
+                mBind.tvLookMore.setVisibility(View.VISIBLE);
+            } else {
+                mBind.tvLookMore.setVisibility(View.GONE);
+            }
+        });
         if (dataBean.getIsPay() == null || dataBean.getIsPay() == 1) {
             mBind.rlNoCharge.setVisibility(View.VISIBLE);
             mBind.rlHaveCharge.setVisibility(View.GONE);

app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFirstTabFragment.java

@@ -21,7 +21,6 @@ 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/res/layout/activity_webview.xml

@@ -7,14 +7,11 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <RelativeLayout
-            style="@style/title"
-            >
+        <RelativeLayout style="@style/title">
 
             <TextView
-                style="@style/text_title"
-                android:text="@string/webview_title"
-                />
+                android:id="@+id/tv_title"
+                style="@style/text_title" />
 
             <ImageView
                 android:id="@+id/title_back"
@@ -23,9 +20,7 @@
                 />
         </RelativeLayout>
 
-        <ImageView
-            style="@style/card_line"
-            />
+        <ImageView style="@style/card_line" />
 
     </LinearLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/fragment_order_datails.xml

@@ -201,7 +201,7 @@
                         android:gravity="center_vertical"
                         android:maxEms="500"
                         android:maxLines="2"
-                        android:text='@{!TextUtils.isEmpty(item.comment)?item.comment:@string/no_data}'
+                        android:text='@{TextUtils.isEmpty(item.comment)?@string/no_data:item.comment}'
                         android:textColor="@color/cl_home_title_text_color"
                         android:textSize="13sp" />
 

apt/src/main/java/com/app/apt/processor/ApiFactoryProcessor.java

@@ -44,7 +44,6 @@ public class ApiFactoryProcessor implements IProcessor {
                             MethodSpec.methodBuilder(e.getSimpleName().toString())
                                     .addJavadoc("@此方法由apt自动生成")
                                     .addModifiers(PUBLIC, STATIC);
-
 //                    methodBuilder.returns(TypeName.get(executableElement.getReturnType()));
                     methodBuilder.returns(ClassName.get("io.reactivex", "Observable"));
                     String paramsString = "";