增加PDF

app/src/main/java/com/dayu/bigfish/presenter/feedBack/FeedBackPresenter.java

@@ -5,10 +5,12 @@ import android.text.TextUtils;
 
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.api.ApiFactory;
+import com.dayu.common.BaseApplication;
 import com.dayu.utils.ToastUtils;
 import com.dayu.utils.UIUtils;
 import com.dayu.utils.UserManager;
 import com.dayu.utils.UtilsUserAccountMatcher;
+import com.umeng.analytics.MobclickAgent;
 
 import org.json.JSONObject;
 
@@ -48,6 +50,7 @@ public class FeedBackPresenter extends FeedBackContract.Presenter {
             return;
         }
         comFirmSuggist();
+        MobclickAgent.onEvent(BaseApplication.getContext(),"sb_feedback");
     }
 
     @Override

app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java

@@ -107,6 +107,7 @@ public class SettingPresenter extends SettingContract.Presenter {
                             mView.showToast(R.string.clear_success);
                         });
                 DataCleanManager.deleteFolderFile(Environment.getExternalStorageDirectory() + "/Android/data/com.dayu.bigfish/cache", false);
+                MobclickAgent.onEvent(MyApplication.getContext(), "sure_clear_cach");
             }
         });
         MobclickAgent.onEvent(MyApplication.getContext(), "clear_cach");

baseSDK/src/main/java/com/dayu/utils/UserManager.java

@@ -28,7 +28,6 @@ public class UserManager {
     public void saveUser(UserInfo info) {
         if (info != null) {
             SPUtils.put("USER_INFO", new Gson().toJson(info));
-            SPUtils.put("token", info.getToken());
         }
     }
 

baseSDK/src/main/java/com/dayu/utils/UtilsUserAccountMatcher.java

@@ -12,7 +12,7 @@ public class UtilsUserAccountMatcher {
     static String szEmailPattern = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$";
     static Pattern emailPattern = Pattern.compile(szEmailPattern);
 
-    static String szPhonePattern = "((^(13|14|15|18|17)[0-9]{9}$)|(^0[1,2]{1}\\d{1}-?\\d{8}$)|(^0[3-9] {1}\\d{2}-?\\d{7,8}$)|(^0[1,2]{1}\\d{1}-?\\d{8}-(\\d{1,4})$)|(^0[3-9]{1}\\d{2}-? \\d{7,8}-(\\d{1,4})$))";
+    static String szPhonePattern = "((^(13|14|15|18|17|16|19)[0-9]{9}$)|(^0[1,2]{1}\\d{1}-?\\d{8}$)|(^0[3-9] {1}\\d{2}-?\\d{7,8}$)|(^0[1,2]{1}\\d{1}-?\\d{8}-(\\d{1,4})$)|(^0[3-9]{1}\\d{2}-? \\d{7,8}-(\\d{1,4})$))";
     static Pattern phonePattern = Pattern.compile(szPhonePattern);
 
     static String szMobilePattern = "^((13[0-9])|(15[0-9])|(18[0-9])|(14[0-9])|(17[0-9]))\\d{8}$";

build.gradle

@@ -5,13 +5,11 @@ buildscript {
     ext.build_tools_version = "27.0.2"
     ext.min_sdk_version = 16
     ext.target_sdk_version = 23
-    ext.version_code = 7
-    ext.verson_name = "1.3.0"
+    ext.version_code = 8
+    ext.verson_name = "1.3.1"
     ext.gradle_version = '3.0.1'
     ext.isReleaseMinify = false
     ext.isDebugMinify = false
-
-
     ext.arouter_api_version = '1.3.1'
     ext.arouter_compiler_version = '1.1.4'
 

orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java

@@ -234,5 +234,6 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
         Bundle bundle = new Bundle();
         bundle.putInt(Constants.ID, mDetail.get().getSpuId());
         mView.startActivity(ServerInstructionActivity.class, bundle);
+        MobclickAgent.onEvent(BaseApplication.getContext(), "check_serverInstruction");
     }
 }

orderCenter/src/main/java/com/dayu/order/ui/activity/PdfWebViewActivity.java

@@ -35,8 +35,6 @@ public class PdfWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
     @Override
     public void initView() {
         docPath = getIntent().getStringExtra(Constants.PICURL);
-        int index = docPath.lastIndexOf(".");
-        docPath = docPath.substring(0, index) + ".pdf";
         String title = getIntent().getStringExtra(OrderConstant.TITLE);
         mBind.tvTitle.setText(title);
         initWebView();

orderCenter/src/main/java/com/dayu/order/ui/activity/ServerInstructionActivity.java

@@ -8,9 +8,11 @@ import com.dayu.order.databinding.ItemOrderInstructionBinding;
 import com.dayu.order.presenter.serverinstruction.ServerInstructionContract;
 import com.dayu.order.presenter.serverinstruction.ServerInstructionPresenter;
 import com.dayu.widgets.listener.OnItemClickListener;
+import com.umeng.analytics.MobclickAgent;
 
 /**
- * Created by luofan on 2018/1/19.
+ * Created by luofan
+ * on 2018/1/19.
  */
 
 public class ServerInstructionActivity extends BaseActivity<ServerInstructionPresenter, ActivityInstrcutionLayoutBinding>
@@ -27,6 +29,7 @@ public class ServerInstructionActivity extends BaseActivity<ServerInstructionPre
             @Override
             public void OnItemClick(ServerInstruction item, ItemOrderInstructionBinding bind) {
                 mPresenter.dumpDetail(item.getId());
+                MobclickAgent.onEvent(mActivity,"instruction_detail");
             }
         });
     }

orderCenter/src/main/java/com/dayu/order/ui/activity/WebViewActivity.java

@@ -23,6 +23,7 @@ import com.dayu.utils.UserManager;
 import com.github.lzyzsd.jsbridge.BridgeHandler;
 import com.github.lzyzsd.jsbridge.BridgeWebView;
 import com.github.lzyzsd.jsbridge.CallBackFunction;
+import com.umeng.analytics.MobclickAgent;
 
 import java.io.File;
 
@@ -61,6 +62,7 @@ public class WebViewActivity extends DataBindingActivity<ActivityWebviewBinding>
             Uri content_url = Uri.parse(mUrl);
             intent.setData(content_url);
             startActivity(Intent.createChooser(intent, getResources().getString(R.string.select_webview)));
+            MobclickAgent.onEvent(mActivity,"open_web");
         });
         UserInfo userInfo = UserManager.getInstance().getUser();
         mToken = userInfo.getToken();

orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java

@@ -18,7 +18,6 @@ import com.dayu.order.ui.activity.QrCodeActivity;
 import com.dayu.order.ui.activity.ServerInstructionActivity;
 import com.dayu.utils.ToastUtils;
 import com.dayu.utils.UIUtils;
-import com.dayu.utils.UtilsDate;
 import com.dayu.widgets.listener.OnItemClickListener;
 import com.umeng.analytics.MobclickAgent;
 
@@ -96,12 +95,12 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
                     Intent intent = new Intent(mActivity, PdfWebViewActivity.class);
                     intent.putExtra(Constants.PICURL, item.getUrl());
                     intent.putExtra(OrderConstant.TITLE, item.getName());
-                    long daydif = UtilsDate.dayDiffCurr(mDetail.getCreateTime(),"2018-04-03");
-                    if (!item.getUrl().contains("pdf") && daydif<=0){
-                        ToastUtils.showLongToast(R.string.error_pdf);
-                        return;
+                    if (!item.getUrl().contains(".pdf")){
+                        ToastUtils.showShortToast(R.string.error_pdf);
+                    }else {
+                        startActivity(intent);
                     }
-                    startActivity(intent);
+
                 }
             });
         }

userCenter/src/main/java/com/dayu/usercenter/presenter/accountbalance/AccountBalancePresenter.java

@@ -3,11 +3,13 @@ package com.dayu.usercenter.presenter.accountbalance;
 import android.databinding.ObservableField;
 import android.os.Bundle;
 
+import com.dayu.common.BaseApplication;
 import com.dayu.common.Constants;
 import com.dayu.event.UserInfo;
 import com.dayu.usercenter.api.UserApiFactory;
 import com.dayu.usercenter.ui.activity.WithdrawalsActivity;
 import com.dayu.utils.UserManager;
+import com.umeng.analytics.MobclickAgent;
 
 /**
  * Created by luofan
@@ -57,5 +59,6 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter {
     @Override
     public void dumpToWithdrawal() {
         mView.startActivity(WithdrawalsActivity.class);
+        MobclickAgent.onEvent(BaseApplication.getContext(),"alipay_account");
     }
 }