Skip to content

android / dayu

Go to a project
Commit 3d913069 by 罗翻
Options

增加PDF

parent 6d863aa3
Inline Side-by-side
Showing with 22 additions and 15 deletions
app/src/main/java/com/dayu/bigfish/presenter/feedBack/FeedBackPresenter.java
...@@ -5,10 +5,12 @@ import android.text.TextUtils; ...@@ -5,10 +5,12 @@ import android.text.TextUtils;
import com.dayu.bigfish.R; import com.dayu.bigfish.R;
import com.dayu.bigfish.api.ApiFactory; import com.dayu.bigfish.api.ApiFactory;
import com.dayu.common.BaseApplication;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils; import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
import com.dayu.utils.UtilsUserAccountMatcher; import com.dayu.utils.UtilsUserAccountMatcher;
import com.umeng.analytics.MobclickAgent;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -48,6 +50,7 @@ public class FeedBackPresenter extends FeedBackContract.Presenter { ...@@ -48,6 +50,7 @@ public class FeedBackPresenter extends FeedBackContract.Presenter {
return; return;
} }
comFirmSuggist(); comFirmSuggist();
MobclickAgent.onEvent(BaseApplication.getContext(),"sb_feedback");
} }
@Override @Override
......
app/src/main/java/com/dayu/bigfish/presenter/setting/SettingPresenter.java
...@@ -107,6 +107,7 @@ public class SettingPresenter extends SettingContract.Presenter { ...@@ -107,6 +107,7 @@ public class SettingPresenter extends SettingContract.Presenter {
mView.showToast(R.string.clear_success); mView.showToast(R.string.clear_success);
}); });
DataCleanManager.deleteFolderFile(Environment.getExternalStorageDirectory() + "/Android/data/com.dayu.bigfish/cache", false); DataCleanManager.deleteFolderFile(Environment.getExternalStorageDirectory() + "/Android/data/com.dayu.bigfish/cache", false);
MobclickAgent.onEvent(MyApplication.getContext(), "sure_clear_cach");
} }
}); });
MobclickAgent.onEvent(MyApplication.getContext(), "clear_cach"); MobclickAgent.onEvent(MyApplication.getContext(), "clear_cach");
......
baseSDK/src/main/java/com/dayu/utils/UserManager.java
...@@ -28,7 +28,6 @@ public class UserManager { ...@@ -28,7 +28,6 @@ public class UserManager {
public void saveUser(UserInfo info) { public void saveUser(UserInfo info) {
if (info != null) { if (info != null) {
SPUtils.put("USER_INFO", new Gson().toJson(info)); 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 { ...@@ -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 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 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 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}$"; 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 { ...@@ -5,13 +5,11 @@ buildscript {
ext.build_tools_version = "27.0.2" ext.build_tools_version = "27.0.2"
ext.min_sdk_version = 16 ext.min_sdk_version = 16
ext.target_sdk_version = 23 ext.target_sdk_version = 23
ext.version_code = 7 ext.version_code = 8
ext.verson_name = "1.3.0" ext.verson_name = "1.3.1"
ext.gradle_version = '3.0.1' ext.gradle_version = '3.0.1'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
ext.arouter_api_version = '1.3.1' ext.arouter_api_version = '1.3.1'
ext.arouter_compiler_version = '1.1.4' 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 { ...@@ -234,5 +234,6 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt(Constants.ID, mDetail.get().getSpuId()); bundle.putInt(Constants.ID, mDetail.get().getSpuId());
mView.startActivity(ServerInstructionActivity.class, bundle); 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 ...@@ -35,8 +35,6 @@ public class PdfWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
@Override @Override
public void initView() { public void initView() {
docPath = getIntent().getStringExtra(Constants.PICURL); docPath = getIntent().getStringExtra(Constants.PICURL);
int index = docPath.lastIndexOf(".");
docPath = docPath.substring(0, index) + ".pdf";
String title = getIntent().getStringExtra(OrderConstant.TITLE); String title = getIntent().getStringExtra(OrderConstant.TITLE);
mBind.tvTitle.setText(title); mBind.tvTitle.setText(title);
initWebView(); initWebView();
......
orderCenter/src/main/java/com/dayu/order/ui/activity/ServerInstructionActivity.java
...@@ -8,9 +8,11 @@ import com.dayu.order.databinding.ItemOrderInstructionBinding; ...@@ -8,9 +8,11 @@ import com.dayu.order.databinding.ItemOrderInstructionBinding;
import com.dayu.order.presenter.serverinstruction.ServerInstructionContract; import com.dayu.order.presenter.serverinstruction.ServerInstructionContract;
import com.dayu.order.presenter.serverinstruction.ServerInstructionPresenter; import com.dayu.order.presenter.serverinstruction.ServerInstructionPresenter;
import com.dayu.widgets.listener.OnItemClickListener; 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> public class ServerInstructionActivity extends BaseActivity<ServerInstructionPresenter, ActivityInstrcutionLayoutBinding>
...@@ -27,6 +29,7 @@ public class ServerInstructionActivity extends BaseActivity<ServerInstructionPre ...@@ -27,6 +29,7 @@ public class ServerInstructionActivity extends BaseActivity<ServerInstructionPre
@Override @Override
public void OnItemClick(ServerInstruction item, ItemOrderInstructionBinding bind) { public void OnItemClick(ServerInstruction item, ItemOrderInstructionBinding bind) {
mPresenter.dumpDetail(item.getId()); 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; ...@@ -23,6 +23,7 @@ import com.dayu.utils.UserManager;
import com.github.lzyzsd.jsbridge.BridgeHandler; import com.github.lzyzsd.jsbridge.BridgeHandler;
import com.github.lzyzsd.jsbridge.BridgeWebView; import com.github.lzyzsd.jsbridge.BridgeWebView;
import com.github.lzyzsd.jsbridge.CallBackFunction; import com.github.lzyzsd.jsbridge.CallBackFunction;
import com.umeng.analytics.MobclickAgent;
import java.io.File; import java.io.File;
...@@ -61,6 +62,7 @@ public class WebViewActivity extends DataBindingActivity<ActivityWebviewBinding> ...@@ -61,6 +62,7 @@ public class WebViewActivity extends DataBindingActivity<ActivityWebviewBinding>
Uri content_url = Uri.parse(mUrl); Uri content_url = Uri.parse(mUrl);
intent.setData(content_url); intent.setData(content_url);
startActivity(Intent.createChooser(intent, getResources().getString(R.string.select_webview))); startActivity(Intent.createChooser(intent, getResources().getString(R.string.select_webview)));
MobclickAgent.onEvent(mActivity,"open_web");
}); });
UserInfo userInfo = UserManager.getInstance().getUser(); UserInfo userInfo = UserManager.getInstance().getUser();
mToken = userInfo.getToken(); 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; ...@@ -18,7 +18,6 @@ import com.dayu.order.ui.activity.QrCodeActivity;
import com.dayu.order.ui.activity.ServerInstructionActivity; import com.dayu.order.ui.activity.ServerInstructionActivity;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils; import com.dayu.utils.UIUtils;
import com.dayu.utils.UtilsDate;
import com.dayu.widgets.listener.OnItemClickListener; import com.dayu.widgets.listener.OnItemClickListener;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
...@@ -96,13 +95,13 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData ...@@ -96,13 +95,13 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
Intent intent = new Intent(mActivity, PdfWebViewActivity.class); Intent intent = new Intent(mActivity, PdfWebViewActivity.class);
intent.putExtra(Constants.PICURL, item.getUrl()); intent.putExtra(Constants.PICURL, item.getUrl());
intent.putExtra(OrderConstant.TITLE, item.getName()); intent.putExtra(OrderConstant.TITLE, item.getName());
long daydif = UtilsDate.dayDiffCurr(mDetail.getCreateTime(),"2018-04-03"); if (!item.getUrl().contains(".pdf")){
if (!item.getUrl().contains("pdf") && daydif<=0){ ToastUtils.showShortToast(R.string.error_pdf);
ToastUtils.showLongToast(R.string.error_pdf); }else {
return;
}
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; ...@@ -3,11 +3,13 @@ package com.dayu.usercenter.presenter.accountbalance;
import android.databinding.ObservableField; import android.databinding.ObservableField;
import android.os.Bundle; import android.os.Bundle;
import com.dayu.common.BaseApplication;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
import com.dayu.usercenter.api.UserApiFactory; import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.ui.activity.WithdrawalsActivity; import com.dayu.usercenter.ui.activity.WithdrawalsActivity;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
import com.umeng.analytics.MobclickAgent;
/** /**
* Created by luofan * Created by luofan
...@@ -57,5 +59,6 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter { ...@@ -57,5 +59,6 @@ public class AccountBalancePresenter extends AccountBalanceContract.Presenter {
@Override @Override
public void dumpToWithdrawal() { public void dumpToWithdrawal() {
mView.startActivity(WithdrawalsActivity.class); mView.startActivity(WithdrawalsActivity.class);
MobclickAgent.onEvent(BaseApplication.getContext(),"alipay_account");
} }
} }
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