Skip to content

android / dayu

Go to a project
Commit 1ec1a669 by mReturn
Options

修复bug

parent cacddc8c
Inline Side-by-side
Showing with 45 additions and 36 deletions
.idea/misc.xml
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
app/src/main/java/com/dayu/bigfish/MyApplication.java
...@@ -64,6 +64,7 @@ public class MyApplication extends BaseApplication { ...@@ -64,6 +64,7 @@ public class MyApplication extends BaseApplication {
//初始化环信 //初始化环信
HxManager.getInstance().init(mContext); HxManager.getInstance().init(mContext);
initTextSize(); initTextSize();
} }
/** /**
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
...@@ -205,18 +205,23 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -205,18 +205,23 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
if (event.num<=0) if (event.num<=0)
return; return;
if (mOrderBadgeView == null) { if (mOrderBadgeView == null) {
// mOrderBadgeView = new BadgeView(this);
// mOrderBadgeView.setTargetView(mBind.tabSecond);
// mOrderBadgeView.setBadgeGravity(Gravity.CENTER);
// mOrderBadgeView.setBadgeMargin(30, -8, 0, 0);
// mOrderBadgeView.setBackground(0,Color.TRANSPARENT);
// mOrderBadgeView.setTextColor(Color.parseColor("#FF5A4B"));
// mOrderBadgeView.setTextSize(18);
mOrderBadgeView = new BadgeView(this); mOrderBadgeView = new BadgeView(this);
mOrderBadgeView.setTargetView(mBind.tabSecond); mOrderBadgeView.setTargetView(mBind.tabSecond);
mOrderBadgeView.setBadgeGravity(Gravity.CENTER); mOrderBadgeView.setBadgeGravity(Gravity.CENTER|Gravity.TOP);
mOrderBadgeView.setBadgeMargin(30, -8, 0, 0); mOrderBadgeView.setBadgeMargin(20, 0, 0, 0);
mOrderBadgeView.setBackground(0,Color.TRANSPARENT);
mOrderBadgeView.setTextColor(Color.parseColor("#FF5A4B"));
mOrderBadgeView.setTextSize(18);
} }
if (event.num < 100) { if (event.num < 100) {
mOrderBadgeView.setText("("+event.num + ")"); mOrderBadgeView.setText(event.num + "", TextView.BufferType.NORMAL);
} else { } else {
mOrderBadgeView.setText("(99+)"); mOrderBadgeView.setText("99+");
} }
// if (event.num < 100) { // if (event.num < 100) {
......
baseSDK/build.gradle
...@@ -74,5 +74,7 @@ dependencies { ...@@ -74,5 +74,7 @@ dependencies {
api 'cn.jzvd:jiaozivideoplayer:7.1.0' api 'cn.jzvd:jiaozivideoplayer:7.1.0'
api 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.35' api 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.35'
api 'com.badoo.mobile:android-weak-handler:1.1' api 'com.badoo.mobile:android-weak-handler:1.1'
// api 'com.google.android.exoplayer:exoplayer:2.7.1' // api 'tv.danmaku.ijk.media:ijkplayer-java:0.8.4'
// api 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.4'
// api 'tv.danmaku.ijk.media:ijkplayer-x86:0.8.4'
} }
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -12,30 +12,30 @@ public class Constants { ...@@ -12,30 +12,30 @@ public class Constants {
/** /**
* 测试环境配置. * 测试环境配置.
*/ */
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String ENVIROMENT = "debug"; // public static final String ENVIROMENT = "debug";
public static final String BASE_URL = "http://47.94.101.239:3112"; // public static final String BASE_URL = "http://47.94.101.239:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; // public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; // public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult"; // public final static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop"; // public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; // public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; // public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean IS_DEBUG = true; // public static final boolean IS_DEBUG = true;
/** /**
* uat环境配置. * uat环境配置.
*/ */
// public static final String ENVIROMENT = "uat"; public static final String ENVIROMENT = "uat";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static final String BASE_URL = "http://47.95.223.6:3112"; public static final String BASE_URL = "http://47.95.223.6:3112";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop"; public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
// public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail"; public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail"; public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
// public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult"; public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop"; public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
// public static final boolean IS_DEBUG = true; public static final boolean IS_DEBUG = true;
/** /**
* 正式环境. * 正式环境.
......
baseSDK/src/main/res/values/strings.xml
...@@ -413,7 +413,7 @@ ...@@ -413,7 +413,7 @@
<string name="pay_fail">支付失败</string> <string name="pay_fail">支付失败</string>
<string name="click_and_signature">点击此处让客户去签名</string> <string name="click_and_signature">点击此处让客户去签名</string>
<string name="download_gaode_notice">您还未安装高德地图~</string> <string name="download_gaode_notice">您还未安装高德地图~</string>
<string name="sop_title">标准操作规范SOP~</string> <string name="sop_title">标准操作规范SOP</string>
<string name="process_notice">温馨提示：点击屏幕底部“提交验收”按钮，申请费用。</string> <string name="process_notice">温馨提示：点击屏幕底部“提交验收”按钮，申请费用。</string>
<string name="next_step_process_order">您的工单已全部完成，点击下一步去提交验收</string> <string name="next_step_process_order">您的工单已全部完成，点击下一步去提交验收</string>
<string name="create_time">下单时间</string> <string name="create_time">下单时间</string>
......
build.gradle
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3" ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 16 ext.min_sdk_version = 16
ext.target_sdk_version = 26 ext.target_sdk_version = 26
ext.version_code = 231 ext.version_code = 232
ext.verson_name = "2.3.1" ext.verson_name = "2.3.2"
ext.gradle_version = '3.1.4' ext.gradle_version = '3.1.4'
ext.isReleaseMinify = true ext.isReleaseMinify = true
ext.isDebugMinify = false ext.isDebugMinify = false
......
orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java
...@@ -74,11 +74,11 @@ public class ReceivingPresenter extends ReceivingContract.Presenter { ...@@ -74,11 +74,11 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
private void receiveOrderSuccess() { private void receiveOrderSuccess() {
int num = mTotalRows - 1; int num = mTotalRows - 1;
mView.showToast(R.string.receive_order_success); mView.showToast(R.string.receive_order_success);
mView.dumpBack(); // mView.dumpBack();
mDisPosable = Observable.timer(300, TimeUnit.MILLISECONDS).subscribe(aLong -> { mDisPosable = Observable.timer(300, TimeUnit.MILLISECONDS).subscribe(aLong -> {
EventBus.getDefault().post(new SwtichFragment(1)); // EventBus.getDefault().post(new SwtichFragment(1));
EventBus.getDefault().post(new RefreshTab(0)); EventBus.getDefault().post(new RefreshTab(0));
EventBus.getDefault().post(new RefreshReceivingNum(num < 0 ? 0 : num)); // EventBus.getDefault().post(new RefreshReceivingNum(num < 0 ? 0 : num));
EventBus.getDefault().post(new RefreshApoiment(-1)); EventBus.getDefault().post(new RefreshApoiment(-1));
mDisPosable.dispose(); mDisPosable.dispose();
}); });
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
...@@ -191,7 +191,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment ...@@ -191,7 +191,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
// tab.getError() + "", tab.getCanceled() + ""}; // tab.getError() + "", tab.getCanceled() + ""};
String[] tabNum = new String[]{tab.getWaits() + "",tab.getReservation() + "", tab.getPendingservice() + "", String[] tabNum = new String[]{tab.getWaits() + "",tab.getReservation() + "", tab.getPendingservice() + "",
tab.getError() + ""}; tab.getError() + ""};
EventBus.getDefault().post(new TabNumEvent(tab.getPendingservice()+tab.getError())); EventBus.getDefault().post(new TabNumEvent(tab.getPendingservice()+tab.getWaits()+tab.getReservation()));
if (isFirstAddTab) { if (isFirstAddTab) {
mBind.tbHome.removeAllTabs(); mBind.tbHome.removeAllTabs();
mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab(tabNum[0], tabDesc[0]))); mBind.tbHome.addTab(mBind.tbHome.newTab().setCustomView(CreatTab(tabNum[0], tabDesc[0])));
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
...@@ -81,6 +81,7 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen ...@@ -81,6 +81,7 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
mBind.llVideo.setVisibility(TextUtils.isEmpty(operateInfo.getVideoUrl()) ? View.GONE : View.VISIBLE); mBind.llVideo.setVisibility(TextUtils.isEmpty(operateInfo.getVideoUrl()) ? View.GONE : View.VISIBLE);
// http://dl.kf.ai/online/ka/spu/serviceDetailVideo/09ee6818825f705cf106b3c497d40af9.mp4
// String url = "http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4"; // String url = "http://jzvd.nathen.cn/c6e3dc12a1154626b3476d9bf3bd7266/6b56c5f0dc31428083757a45764763b0-5287d2089db37e62345123a1be272f8b.mp4";
String url = operateInfo.getVideoUrl(); String url = operateInfo.getVideoUrl();
mBind.jzVideo.setUp(url, ""); mBind.jzVideo.setUp(url, "");
......
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