Skip to content

android / dayu

Go to a project
Commit 797cac9d by 罗翻
Options

部分功能优化，增加条形码扫描，处理工单提示，获取地址时间间隔改为5分钟

parent 7d0c42c6
Inline Side-by-side
Showing with 21 additions and 10 deletions
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
...@@ -28,6 +28,7 @@ import com.dayu.bigfish.presenter.main.MainContract; ...@@ -28,6 +28,7 @@ import com.dayu.bigfish.presenter.main.MainContract;
import com.dayu.bigfish.presenter.main.MainPresenter; import com.dayu.bigfish.presenter.main.MainPresenter;
import com.dayu.bigfish.ui.fragment.HomeFirstTabFragment; import com.dayu.bigfish.ui.fragment.HomeFirstTabFragment;
import com.dayu.bigfish.ui.service.LocationService; import com.dayu.bigfish.ui.service.LocationService;
import com.dayu.bigfish.utils.HxManager;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.event.DownloadBean; import com.dayu.event.DownloadBean;
import com.dayu.event.UserInfo; import com.dayu.event.UserInfo;
...@@ -40,7 +41,6 @@ import com.dayu.provider.event.SwtichFragment; ...@@ -40,7 +41,6 @@ import com.dayu.provider.event.SwtichFragment;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.ui.fragment.HomePersonFragment; import com.dayu.usercenter.ui.fragment.HomePersonFragment;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
import com.dayu.utils.badgeNumberManger.BadgeNumberManager;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.onDownloadListener; import com.dayu.widgets.listener.onDownloadListener;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
...@@ -295,6 +295,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -295,6 +295,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
// BadgeNumberManager.from(mActivity).setBadgeNumber(0);
MobclickAgent.onResume(this); MobclickAgent.onResume(this);
} }
...@@ -302,7 +303,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -302,7 +303,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
MobclickAgent.onPause(this); MobclickAgent.onPause(this);
BadgeNumberManager.from(mActivity).setBadgeNumber(0); HxManager.getInstance().onDestory();
} }
@Override @Override
......
app/src/main/java/com/dayu/bigfish/utils/HxManager.java
package com.dayu.bigfish.utils; package com.dayu.bigfish.utils;
import android.annotation.SuppressLint;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationManager; import android.app.NotificationManager;
...@@ -45,10 +46,12 @@ import static com.dayu.common.Constants.IS_DEBUG; ...@@ -45,10 +46,12 @@ import static com.dayu.common.Constants.IS_DEBUG;
*/ */
public class HxManager { public class HxManager {
@SuppressLint("StaticFieldLeak")
private static HxManager instance; private static HxManager instance;
private boolean sdkInited = false; private boolean sdkInited = false;
private Context mContext; private Context mContext;
private LicenceDialog mDialog; private LicenceDialog mDialog;
private int mCount = 0;
private HxManager() { private HxManager() {
} }
...@@ -146,9 +149,10 @@ public class HxManager { ...@@ -146,9 +149,10 @@ public class HxManager {
if (notificationManager != null) { if (notificationManager != null) {
notificationManager.notify(0, builder.build()); notificationManager.notify(0, builder.build());
} }
mCount++;
// BadgeNumberManager.from(mContext).setBadgeNumber(mCount);
// BadgeNumberUtils.setBadgeNumberXiaoMi(notification, messages.size());
} }
// BadgeNumberManager.from(mContext).setBadgeNumber(messages.size());
// BadgeNumberUtils.setBadgeNumberXiaoMi(notification,messages.size());
} }
} }
...@@ -255,4 +259,8 @@ public class HxManager { ...@@ -255,4 +259,8 @@ public class HxManager {
// 没有匹配的项，返回为null // 没有匹配的项，返回为null
return null; return null;
} }
public void onDestory() {
mCount = 0;
}
} }
locationComponent/src/main/java/com/dayu/location/base/LocationUtils.java
...@@ -88,9 +88,11 @@ public class LocationUtils { ...@@ -88,9 +88,11 @@ public class LocationUtils {
@Override @Override
public void run() { public void run() {
if (flag) { if (flag) {
mListener.result(sLocation); if (mListener != null) {
flag = false; mListener.result(sLocation);
mlocationClient.stopLocation(); flag = false;
mlocationClient.stopLocation();
}
} }
} }
}, 8000); }, 8000);
...@@ -99,7 +101,7 @@ public class LocationUtils { ...@@ -99,7 +101,7 @@ public class LocationUtils {
@Override @Override
public void onLocationChanged(AMapLocation location) { public void onLocationChanged(AMapLocation location) {
if (location != null && location.getErrorCode() == 0 && flag) { if (mListener != null && location != null && location.getErrorCode() == 0 && flag) {
flag = false; flag = false;
mlocationClient.stopLocation(); mlocationClient.stopLocation();
sLocation = location; sLocation = location;
......
messageCenter/src/main/java/com/dayu/message/presenter/message/messagePresenter.java
...@@ -25,7 +25,7 @@ import okhttp3.RequestBody; ...@@ -25,7 +25,7 @@ import okhttp3.RequestBody;
* on 2017/11/8. * on 2017/11/8.
*/ */
public class messagePresenter extends messageContract.Presenter { public class messagePresenter extends messageContract.Presenter {
public ObservableField data = new ObservableField<>(); public ObservableField<Object> data = new ObservableField<>();
private String mHxId; private String mHxId;
private int mPage; private int mPage;
private int mCategory; private int mCategory;
......
orderCenter/src/main/res/layout/fragment_multi_detail.xml
...@@ -411,7 +411,7 @@ ...@@ -411,7 +411,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15"
android:text="@{item.repairType == 1?@string/honai:@string/warranty}" android:text="@{item.repairType == 1?@string/payer_baonei:@string/payer_baowai}"
android:textColor="@color/cl_home_title_text_color" android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
......
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