push HIU

WeiChat/build.gradle

@@ -63,7 +63,7 @@ android {
  
     productFlavors {   // 友盟多渠道打包
         wandoujia {}
-        _360 {}
+//        _360 {}
         baidu {}
         xiaomi {}
         tencent {}

WeiChat/src/main/AndroidManifest.xml

@@ -901,7 +901,7 @@
             android:exported="true" />
 
         <activity
-            android:name=".ui.erp.activity.oa.MissionActivity"
+            android:name="com.uas.appworks.OA.erp.activity.MissionActivity"
             android:label="@string/activity_mission_plan" />
         <activity android:name=".ui.me.SpeechrecognitionActivity" />
         <activity android:name=".ui.erp.activity.oa.ErpActivity" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -53,7 +53,6 @@ import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.uas.appme.other.activity.BasicInfoActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.PauseOnScrollListener;
-import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PublicMessageAdapter;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/find/FindFragment.java

@@ -10,7 +10,6 @@ import android.view.MenuItem;
 import android.widget.RadioGroup;
 
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
-import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 
 public class FindFragment extends EasyFragment {

app_core/common/src/main/java/com/core/utils/timeutils/wheel/BottomPopup.java

@@ -11,7 +11,6 @@ import android.view.ViewGroup;
 import android.view.Window;
 
 import com.common.LogUtil;
-import com.core.utils.ScreenUtils;
 
 
 /**

app_core/common/src/main/java/com/core/utils/timeutils/wheel/DateTimePicker.java

@@ -9,7 +9,6 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.core.widget.view.WheelView;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/WheelPicker.java

@@ -5,7 +5,6 @@ import android.support.annotation.ColorInt;
 import android.support.annotation.IntRange;
 import android.view.View;
 
-import com.core.widget.view.WheelView;
 
 
 /**

app_core/imageload/src/main/java/com/me/imageloader/transformation/GlideCircleTransform.java

@@ -13,7 +13,7 @@ import android.graphics.RectF;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
-import com.me.imageloader.utils.ScreenUtils;
+import com.me.imageloader.utils.ScreenUtil;
 
 /**
  * @desc:自定义BitmapTransformation来实现圆形图片加载
@@ -35,7 +35,7 @@ public class GlideCircleTransform extends BitmapTransformation {
     public GlideCircleTransform(Context context, float borderWidth, int borderColor) {
         super(context);
         mBorderWidth = Resources.getSystem().getDisplayMetrics().density * borderWidth;
-        mBorderWidth = ScreenUtils.dip2px( borderWidth);
+        mBorderWidth = ScreenUtil.dip2px( borderWidth);
         mBorderPaint = new Paint();
         mBorderPaint.setDither(true);
         mBorderPaint.setAntiAlias(true);
@@ -47,7 +47,7 @@ public class GlideCircleTransform extends BitmapTransformation {
     public GlideCircleTransform(Context context, float borderWidth, int borderColor, int heightPX, int widthPx) {
         super(context);
         mBorderWidth = Resources.getSystem().getDisplayMetrics().density * borderWidth;
-        mBorderWidth = ScreenUtils.dip2px(borderWidth);
+        mBorderWidth = ScreenUtil.dip2px(borderWidth);
         mBorderPaint = new Paint();
         mBorderPaint.setDither(true);
         mBorderPaint.setAntiAlias(true);

app_core/imageload/src/main/java/com/me/imageloader/utils/ScreenUtil.java

@@ -1,9 +1,96 @@
 package com.me.imageloader.utils;
 
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.DisplayMetrics;
+
+import java.lang.reflect.Field;
+
 /**
- * Created by FANGlh on 2017/9/6.
- * function:
+ * 屏幕相关工具类
+ *
+ * Created by Arison on 2017/5/23.
  */
-
 public class ScreenUtil {
+
+    public static int dip2px( float dpValue) {
+        final float scale = Utils.getContext().getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+
+    public static int px2dip( float pxValue) {
+        final float scale = Utils.getContext().getResources().getDisplayMetrics().density;
+        return (int) (pxValue / scale + 0.5f);
+    }
+
+    public static int px2sp( float pxValue) {
+        final float scale = Utils.getContext().getResources().getDisplayMetrics().density;
+        return (int) (pxValue / scale + 0.5f);
+    }
+
+    public static int sp2px(float spValue) {
+        final float scale = Utils.getContext().getResources().getDisplayMetrics().density;
+        return (int) (spValue * scale + 0.5f);
+    }
+
+    public static int getScreenWidth(Context context) {
+        DisplayMetrics localDisplayMetrics = new DisplayMetrics();
+        ((Activity) context).getWindowManager().getDefaultDisplay().getMetrics(localDisplayMetrics);
+        return localDisplayMetrics.widthPixels;
+    }
+
+    public static int getScreenHeight(Context context) {
+        DisplayMetrics localDisplayMetrics = new DisplayMetrics();
+        ((Activity) context).getWindowManager().getDefaultDisplay().getMetrics(localDisplayMetrics);
+        return localDisplayMetrics.heightPixels - getStatusBarHeight(context);
+    }
+
+
+    /**
+     * @deprecated  use {@link #getScreenHeight(Context)} instead
+     * get screen size height in pixels
+     *
+     * @param context
+     * @return the pixels of the screen height
+     */
+    public static int getHeight(Activity context) {
+        DisplayMetrics dm = new DisplayMetrics();
+        context.getWindowManager().getDefaultDisplay().getMetrics(dm);
+        return dm.heightPixels;
+    }
+
+    public static int getStatusBarHeight(Context context){
+        Class<?> c = null;
+        Object obj = null;
+        Field field = null;
+        int x = 0, statusBarHeight = 0;
+        try {
+            c = Class.forName("com.android.internal.R$dimen");
+            obj = c.newInstance();
+            field = c.getField("status_bar_height");
+            x = Integer.parseInt(field.get(obj).toString());
+            statusBarHeight = context.getResources().getDimensionPixelSize(x);
+        } catch (Exception e1) {
+            e1.printStackTrace();
+        }
+        return statusBarHeight;
+    }
+
+
+    /**
+     * get toolbar height
+     *
+     * @param context
+     * @return
+     */
+    public static int getToolbarHeight(Context context) {
+        final TypedArray styledAttributes = context.getTheme().obtainStyledAttributes(
+                new int[]{android.R.attr.actionBarSize});
+        int toolbarHeight = (int) styledAttributes.getDimension(0, 0);
+        styledAttributes.recycle();
+
+        return toolbarHeight;
+    }
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BookingSetActivity.java

@@ -18,7 +18,7 @@ import com.core.base.OABaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.selectcalendar.SelectCalendarActivity;
 import com.core.utils.CommonUtil;
-import com.core.utils.timeutils.TimePicker;
+import com.core.utils.timeutils.wheel.TimePicker;
 import com.core.widget.view.imp.HttpImp;
 import com.lidroid.xutils.ViewUtils;
 import com.me.appme.R;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/WorkActivity.java

@@ -38,7 +38,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.me.appworks.R;
 import com.uas.appworks.OA.erp.adapter.WorkAdapter;
 import com.uas.appworks.OA.erp.presenter.WorkPresenter;
-import com.uas.appworks.OA.erp.utils.OASigninPicker;
+import com.core.utils.timeutils.wheel.OASigninPicker;
 import com.uas.appworks.OA.erp.utils.WifiReceiverUtil;
 import com.uas.appworks.OA.erp.view.IWorkView;
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/utils/AutoErpSigninUitl.java

@@ -89,12 +89,12 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
     public void signinWork(WorkModel model) {
         //1.判读mac地址是否符合     3.签到
         if (!MyApplication.getInstance().isNetworkActive()) {
-           CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), getString(R.string.common_notlinknet));
+            CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), getString(R.string.common_notlinknet));
             return;
         }
         String macAddress = SystemUtil.getMac(MyApplication.getInstance());
         if (StringUtil.isEmpty(macAddress)) {
-           CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), "未获取到mac地址");
+            CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), "未获取到mac地址");
             return;
         }
         if (isB2b) {
@@ -524,12 +524,12 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                     intent.setAction(AppConstant.CHANGE_MISSION_TASK);
                     MsgBroadcast.sendLocalBroadcast(intent);
                     if (!StringUtil.isEmpty(message))
-                     CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), message);
+                        CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), message);
                 } catch (Exception e) {
                 }
             }
             if (!StringUtil.isEmpty(msg))
-                 CommonUtil.saveAutoLogtoLocal(getString(R.string.app_monitor_log), msg);
+                CommonUtil.saveAutoLogtoLocal(getString(R.string.app_monitor_log), msg);
             if (!isErrorMac && !StringUtil.isEmpty(msg)) {
                 isErrorMac = true;
                 notificationManage.sendNotification(MyApplication.getInstance(), msg, WorkActivity.class);
@@ -834,8 +834,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                                 @Override
                                 public void run() {
                                     Intent intent = new Intent();
-                                    intent.putExtra(AutoErpService.CHANGE_MISSION_TASK, true);
-                                    intent.setAction(AutoErpService.CHANGE_MISSION_TASK);
+                                    intent.putExtra(AppConstant.CHANGE_MISSION_TASK, true);
+                                    intent.setAction(AppConstant.CHANGE_MISSION_TASK);
                                     MsgBroadcast.sendLocalBroadcast(intent);
                                     LogUtil.i("发送广播成功");
                                 }