打卡界面PopupWindow用小龚的

WeiChat/src/main/AndroidManifest.xml

@@ -814,6 +814,10 @@
             android:label="@string/activity_select_aims" />
         <activity
             android:name=".ui.erp.activity.oa.SelectRemarkActivity"
+            android:label="@string/activity_visit_aims" />
+        <activity
+            android:name=".ui.erp.activity.oa.FlightsActivity"
+            android:label="@string/activity_flights" />
             android:label="拜访目的" />
         <activity android:name=".ui.me.OfficeAddressSettingsActivity"
             android:label="办公地址设置"/>

WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -8,8 +8,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 
-import com.afollestad.materialdialogs.MaterialDialog;
-
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
 /**
@@ -35,8 +33,8 @@ public class CustomCrashActivity extends Activity {
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this,intent);
         if (stackTraceString != null){
             //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
-            new MaterialDialog.Builder(this).content(stackTraceString)
-                    .build().show();
+//            new MaterialDialog.Builder(this).content(stackTraceString)
+//                    .build().show();
         }
         final Class<? extends Activity> activityClassFromIntent = CustomActivityOnCrash.getRestartActivityClassFromIntent(intent);
         final CustomActivityOnCrash.EventListener listenerFromIntent = CustomActivityOnCrash.getEventListenerFromIntent(intent);

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/MissionDao.java

@@ -10,7 +10,7 @@ import com.baidu.mapapi.model.LatLng;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.ui.erp.db.DBOpenHelper;
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/WorkModelDao.java

@@ -7,7 +7,7 @@ import android.util.Log;
 
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.ui.erp.db.DBOpenHelper;
-import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -72,7 +72,6 @@ import java.util.HashMap;
 import java.util.List;
 
 
-
 /**
  * @项目名称: SkWeiChat-Baidu
  * @包名: com.xzjmyk.pm.activity.ui
@@ -417,13 +416,13 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         }
         // TODO 判断上一个状态UU运动是否预关闭
         int isUUStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
-        if (isUUStep == 1){
-            startService(new Intent(mContext,StepService.class));
+        if (isUUStep == 1) {
+            startService(new Intent(mContext, StepService.class));
             PreferenceUtils.putInt(MyPedometerActivity.UU_STEP_NOTICE, 1);
             PushManager.resumeWork(MyApplication.getInstance());
         }
         //TODO 发布版本关闭
-        if (AppConfig.COMPANY){
+        if (AppConfig.COMPANY) {
 //            startService(new Intent(this, AlarmService.class));
             startService(new Intent(this, AutoErpService.class));
 
@@ -505,8 +504,10 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
 //        openUUStepService();
 
     }
+
     private Messenger messenger;
     private Messenger mGetReplyMessenger = new Messenger(new Handler());
+
     private void openUUStepService() {
 
         ServiceConnection conn = new ServiceConnection() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/DestinationActivity.java

@@ -31,7 +31,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/FlightsActivity.java

@@ -0,0 +1,44 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+public class FlightsActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_flights);
+        initView();
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_add_icon, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (R.id.add_item == item.getItemId()) {
+            addMenuClicking();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    private void addMenuClicking() {
+
+    }
+
+    private void initView() {
+
+    }
+
+
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MissionActivity.java

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
+import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -33,8 +34,8 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.MissionAdapter;
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
-import com.xzjmyk.pm.activity.ui.erp.model.SelectAimModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.MissionPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMission;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMissionPresenter;
@@ -68,15 +69,15 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
         public void onReceive(Context context, Intent intent) {
             locationOk = MyApplication.getInstance().getBdLocationHelper().locationOk();
             //TODO 发布版本先关闭
-//            if (locationOk && adapter != null && !ListUtils.isEmpty(adapter.getModels())) {
-//                for (int i = 0; i < adapter.getModels().size(); i++) {
-//                    if (adapter.getModels().get(i).getStatus() != 1) {
-//                        adapter.getModels().get(i).setRecorddate(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-//                        adapter.getModels().get(i).setLocation(MyApplication.getInstance().getBdLocationHelper().getName());
-//                        adapter.notifyItemChanged(i);
-//                    }
-//                }
-//            }
+            if (locationOk && adapter != null && !ListUtils.isEmpty(adapter.getModels())) {
+                for (int i = 0; i < adapter.getModels().size(); i++) {
+                    if (adapter.getModels().get(i).getStatus() != 1) {
+                        adapter.getModels().get(i).setRecorddate(TimeUtils.f_long_2_str(System.currentTimeMillis()));
+                        adapter.getModels().get(i).setLocation(MyApplication.getInstance().getBdLocationHelper().getName());
+                        adapter.notifyItemChanged(i);
+                    }
+                }
+            }
         }
     };
 
@@ -424,20 +425,33 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
     }
 
     private void setbg(float alpha) {
-        WindowManager.LayoutParams lp = getWindow().getAttributes();
-        lp.alpha = alpha;
-        getWindow().setAttributes(lp);
+        setBackgroundAlpha(this, alpha);
         if (popupWindow == null) return;
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
             @Override
             public void onDismiss() {
-                WindowManager.LayoutParams lp = getWindow().getAttributes();
-                lp.alpha = 1f;
-                getWindow().setAttributes(lp);
+                setBackgroundAlpha(MissionActivity.this, 1f);
             }
         });
     }
 
+    /**
+     * 设置页面的透明度
+     * 兼容华为手机（在个别华为手机上 设置透明度会不成功）
+     *
+     * @param bgAlpha 透明度   1表示不透明
+     */
+    public void setBackgroundAlpha(Activity activity, float bgAlpha) {
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.alpha = bgAlpha;
+        if (bgAlpha == 1) {
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//不移除该Flag的话,在有视频的页面上的视频会出现黑屏的bug
+        } else {
+            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//此行代码主要是解决在华为手机上半透明效果无效的bug
+        }
+        activity.getWindow().setAttributes(lp);
+    }
+
     private void sureSelectAim(SelectAimModel entity) {
         if (entity == null) return;
         if (ListUtils.isEmpty(adapter.getModels()) || adapter.getModels().size() <= position)

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectAimActivity.java

@@ -17,7 +17,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.SelectAimAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.xzjmyk.pm.activity.ui.erp.model.SelectAimModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.SelectAimPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectRemarkActivity.java

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
@@ -92,7 +93,7 @@ public class SelectRemarkActivity extends BaseActivity implements HttpHandler.On
 
     private PopupWindow popupWindow = null;
 
-    private void showSaveCompany( ) {
+    private void showSaveCompany() {
         // 一个自定义的布局，作为显示的内容
         View contentView = LayoutInflater.from(ct).inflate(
                 R.layout.item_select_remark_pop, null);
@@ -135,21 +136,34 @@ public class SelectRemarkActivity extends BaseActivity implements HttpHandler.On
         setbg(0.4f);
     }
 
+
     private void setbg(float alpha) {
-        WindowManager.LayoutParams lp = getWindow().getAttributes();
-        lp.alpha = alpha;
-        getWindow().setAttributes(lp);
+        setBackgroundAlpha(this, alpha);
         if (popupWindow == null) return;
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
             @Override
             public void onDismiss() {
-                WindowManager.LayoutParams lp = getWindow().getAttributes();
-                lp.alpha = 1f;
-                getWindow().setAttributes(lp);
+                setBackgroundAlpha(SelectRemarkActivity.this, 1f);
             }
         });
     }
 
+    /**
+     * 设置页面的透明度
+     * 兼容华为手机（在个别华为手机上 设置透明度会不成功）
+     *
+     * @param bgAlpha 透明度   1表示不透明
+     */
+    public void setBackgroundAlpha(Activity activity, float bgAlpha) {
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.alpha = bgAlpha;
+        if (bgAlpha == 1) {
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//不移除该Flag的话,在有视频的页面上的视频会出现黑屏的bug
+        } else {
+            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//此行代码主要是解决在华为手机上半透明效果无效的bug
+        }
+        activity.getWindow().setAttributes(lp);
+    }
 
     private void initView() {
         recyclerview.setLayoutManager(new LinearLayoutManager(this));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkActivity.java

@@ -4,17 +4,15 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -26,15 +24,13 @@ import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.WorkAdapter;
-import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.WorkPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkView;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.WifiReceiverUtil;
-import com.xzjmyk.pm.activity.ui.me.OfficeAddressSettingsActivity;
-import com.xzjmyk.pm.activity.ui.me.SignSeniorSettingActivity;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.MacAndIDUtil;
@@ -63,15 +59,16 @@ public class WorkActivity extends BaseActivity implements View.OnClickListener,
     private TextView unoffice_mm;//距离
     @ViewInject(R.id.date_tv)
     private TextView date_tv;//当前日期
-    private WorkAdapter adapter;
+    private PopupWindow setWindow = null;//
+
 
+    private WorkAdapter adapter;
     private boolean isToday = true;
     private WorkPresenter presenter;
     private String macAddress;
     private String macError;//变更mac地址
     private long selectTime;
-    private PopupWindow mMoreWindow;  //更多弹出对话框
-    private View mMoreMenuView;
+
     private BroadcastReceiver receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -79,11 +76,6 @@ public class WorkActivity extends BaseActivity implements View.OnClickListener,
             if (presenter != null) presenter.upDateLocation();
         }
     };
-    private TextView senior_setting;
-    private TextView scheduling_setting;
-    private TextView address_setting;
-    private TextView sign_rules;
-    private TextView pw_cancel;
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -98,9 +90,7 @@ public class WorkActivity extends BaseActivity implements View.OnClickListener,
 //                Intent intent = new Intent(ct, AlarmaActivity.class);
 //                intent.putExtra("macAddress", macAddress);
 //                startActivity(intent);
-
-                mMoreWindow.showAtLocation(getWindow().getDecorView(), Gravity.BOTTOM, 0, 0);
-                DisplayUtil.backgroundAlpha(ct, 0.5f);
+                showPopupWindow();
                 break;
         }
         return super.onOptionsItemSelected(item);
@@ -122,58 +112,8 @@ public class WorkActivity extends BaseActivity implements View.OnClickListener,
         ViewUtils.inject(this);
         initView();
         initLcation();
-        initPopupWindow();
     }
 
-    private void initPopupWindow() {
-        mMoreMenuView = View.inflate(getApplicationContext(), R.layout.sign_ui_more, null);
-        senior_setting = (TextView) mMoreMenuView.findViewById(R.id.sign_ui_more_senior_setting);  //高级设置
-        scheduling_setting = (TextView) mMoreMenuView.findViewById(R.id.sign_ui_more_scheduling_setting); //排班设置
-        address_setting = (TextView) mMoreMenuView.findViewById(R.id.sign_ui_more_address_setting); //办公地址设置
-        sign_rules = (TextView) mMoreMenuView.findViewById(R.id.sign_ui_more_sign_rules); // 我的考勤规则
-        pw_cancel = (TextView) mMoreMenuView.findViewById(R.id.sign_ui_more_pw_cancel);  //取消
-        mMoreWindow = new PopupWindow(mMoreMenuView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
-        mMoreWindow.setAnimationStyle(R.style.MenuAnimationFade);
-        mMoreWindow.setBackgroundDrawable(new BitmapDrawable());
-        mMoreWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                closeMorePopupWindow();
-            }
-        });
-
-        senior_setting.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(ct, SignSeniorSettingActivity.class));
-                closeMorePopupWindow();
-            }
-        });
-        address_setting.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(ct, OfficeAddressSettingsActivity.class));
-                closeMorePopupWindow();
-            }
-        });
-        pw_cancel.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                closeMorePopupWindow();
-            }
-        });
-
-
-    }
-    private void closeMorePopupWindow() {
-        if (mMoreWindow != null) {
-            mMoreWindow.dismiss();
-//            mMoreWindow = null;
-            DisplayUtil.backgroundAlpha(mContext, 1f);
-
-        }
-
-    }
     boolean isRuning = false;
 
     private void initLcation() {
@@ -318,6 +258,7 @@ public class WorkActivity extends BaseActivity implements View.OnClickListener,
 
     @Override
     public void onClick(View view) {
+        Intent intent=null;
         switch (view.getId()) {
             case R.id.signin_btn:
                 if (isSubmitAble())
@@ -343,10 +284,63 @@ public class WorkActivity extends BaseActivity implements View.OnClickListener,
 //                startActivityForResult(intent, ADDRESS_CHANGE);
 //                }
                 break;
+            case R.id.super_setting_tv:
+                //TODO 高级设置
+                closePopupWindow();
+                break;
+            case R.id.work_setting_tv:
+                //TODO 班次设置
+                intent=new Intent(ct,FlightsActivity.class);
+                startActivity(intent);
+                closePopupWindow();
+                break;
+            case R.id.office_addr_setting_tv:
+                //TODO 考勤地址
+                closePopupWindow();
+                break;
+            case R.id.my_rule_setting_tv:
+                //TODO 我的考勤规则
+                closePopupWindow();
+                break;
+            case R.id.cancel_tv:
+                closePopupWindow();
+                break;
         }
     }
 
 
+    private void initPopupWindow() {
+        View viewContext = LayoutInflater.from(ct).inflate(R.layout.pop_work_activity, null);
+        viewContext.findViewById(R.id.super_setting_tv).setOnClickListener(this);
+        viewContext.findViewById(R.id.work_setting_tv).setOnClickListener(this);
+        viewContext.findViewById(R.id.office_addr_setting_tv).setOnClickListener(this);
+        viewContext.findViewById(R.id.my_rule_setting_tv).setOnClickListener(this);
+        viewContext.findViewById(R.id.cancel_tv).setOnClickListener(this);
+        setWindow = new PopupWindow(viewContext,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        setWindow.setAnimationStyle(R.style.MenuAnimationFade);
+        setWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closePopupWindow();
+            }
+        });
+    }
+
+    private void showPopupWindow() {
+        if (setWindow == null) initPopupWindow();
+        setWindow.showAtLocation(getWindow().getDecorView().
+                findViewById(android.R.id.content), Gravity.BOTTOM, 0, 0);
+        DisplayUtil.backgroundAlpha(this, 0.4f);
+    }
+
+    private void closePopupWindow() {
+        if (setWindow != null)
+            setWindow.dismiss();
+        DisplayUtil.backgroundAlpha(this, 1f);
+    }
+
     //显示时间选择器
     private void showDateDialog() {
         OASigninPicker picker = new OASigninPicker(this);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/MissionAdapter.java

@@ -11,7 +11,7 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/SelectAimAdapter.java

@@ -9,7 +9,7 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.SelectAimModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkAdapter.java

@@ -13,7 +13,7 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ChangeMobileActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/oa/FlightsModel.java

@@ -0,0 +1,8 @@
+package com.xzjmyk.pm.activity.ui.erp.model.oa;
+
+/**
+ * Created by Bitliker on 2017/1/17.
+ */
+
+public class FlightsModel {
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/MissionModel.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/oa/MissionModel.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.model;
+package com.xzjmyk.pm.activity.ui.erp.model.oa;
 
 import android.os.Parcel;
 import android.os.Parcelable;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/SelectAimModel.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/oa/SelectAimModel.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.model;
+package com.xzjmyk.pm.activity.ui.erp.model.oa;
 
 import android.os.Parcel;
 import android.os.Parcelable;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/WorkModel.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/oa/WorkModel.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.model;
+package com.xzjmyk.pm.activity.ui.erp.model.oa;
 
 import android.os.Parcel;
 import android.os.Parcelable;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/FlightsPresernter.java

@@ -0,0 +1,19 @@
+package com.xzjmyk.pm.activity.ui.erp.presenter;
+
+import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IFlightsView;
+
+/**
+ * Created by Bitliker on 2017/1/16.
+ */
+
+public class FlightsPresernter {
+    private IFlightsView iFlightsView;
+
+    public FlightsPresernter(IFlightsView iFlightsView) {
+        this.iFlightsView = iFlightsView;
+    }
+
+    public void start() {
+
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MissionPresenter.java

@@ -12,7 +12,7 @@ import com.baidu.mapapi.model.LatLng;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.db.dao.MissionDao;
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMission;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMissionPresenter;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectAimPresenter.java

@@ -14,7 +14,7 @@ import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.SelectAimModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -17,7 +17,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationSearchActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkView;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/IFlightsView.java

@@ -0,0 +1,8 @@
+package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
+
+/**
+ * Created by Bitliker on 2017/1/16.
+ */
+
+public interface IFlightsView extends HttpImp  {
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/IMission.java

@@ -1,6 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
 
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/IMissionPresenter.java

@@ -1,6 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
 
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/IMissionViewPresenter.java

@@ -1,6 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
 
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/ISelectAim.java

@@ -1,6 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
 
-import com.xzjmyk.pm.activity.ui.erp.model.SelectAimModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/IWorkPresenter.java

@@ -1,6 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
 
-import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 
 import java.util.ArrayList;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/IWorkView.java

@@ -2,7 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
 
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
-import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpService.java

@@ -20,8 +20,8 @@ import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.ErrorEntity;
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
-import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpSigninUitl.java

@@ -21,8 +21,8 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.MissionActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutSigninOKActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
-import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/ReckonAutoUtil.java

@@ -5,8 +5,8 @@ import android.util.Log;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
-import com.xzjmyk.pm.activity.ui.erp.model.MissionModel;
-import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
+import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/DisplayUtil.java

@@ -6,72 +6,88 @@ import android.view.WindowManager;
 
 public class DisplayUtil {
 
-	public static final int voice_view_max_width = 165;// dp
-	public static final int voice_view_min_width = 30;// dp
-	public static final float voice_max_length = 30 ;// 声音最长可以表现为多少毫秒（实际本程序是60s,但是如果这里是60s的话，当时间很短，就没啥差别
+    public static final int voice_view_max_width = 165;// dp
+    public static final int voice_view_min_width = 30;// dp
+    public static final float voice_max_length = 30;// 声音最长可以表现为多少毫秒（实际本程序是60s,但是如果这里是60s的话，当时间很短，就没啥差别
 
-	public static int dip2px(Context context, float dpValue) {
-		final float scale = context.getResources().getDisplayMetrics().density;
-		return (int) (dpValue * scale + 0.5f);
-	}
+    public static int dip2px(Context context, float dpValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
 
-	public static int px2dip(Context context, float pxValue) {
-		final float scale = context.getResources().getDisplayMetrics().density;
-		return (int) (pxValue / scale + 0.5f);
-	}
+    public static int px2dip(Context context, float pxValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (pxValue / scale + 0.5f);
+    }
 
-	public static int getVoiceViewWidth(Context context, int seconds) {
-		if (seconds >= voice_max_length) {
-			return dip2px(context, voice_view_max_width);
-		}
-		final int dpLen = (int) ((seconds / voice_max_length) * (voice_view_max_width - voice_view_min_width)) + voice_view_min_width;
-		return dip2px(context, dpLen);
-	}
+    public static int getVoiceViewWidth(Context context, int seconds) {
+        if (seconds >= voice_max_length) {
+            return dip2px(context, voice_view_max_width);
+        }
+        final int dpLen = (int) ((seconds / voice_max_length) * (voice_view_max_width - voice_view_min_width)) + voice_view_min_width;
+        return dip2px(context, dpLen);
+    }
 
-	/**
-	 * 将px值转换为sp值，保证文字大小不变
-	 *
-	 * @param pxValue
-	 * @param （DisplayMetrics类中属性scaledDensity）
-	 * @return
-	 */
-	public static int px2sp(Context context, float pxValue) {
-		final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
-		return (int) (pxValue / fontScale + 0.5f);
-	}
+    /**
+     * 将px值转换为sp值，保证文字大小不变
+     *
+     * @param pxValue
+     * @param （DisplayMetrics类中属性scaledDensity）
+     * @return
+     */
+    public static int px2sp(Context context, float pxValue) {
+        final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
+        return (int) (pxValue / fontScale + 0.5f);
+    }
 
-	/**
-	 * 将sp值转换为px值，保证文字大小不变
-	 *
-	 * @param spValue
-	 * @param fontScale
-	 *            （DisplayMetrics类中属性scaledDensity）
-	 * @return
-	 */
-	public static int sp2px(Context context, float spValue) {
-		final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
-		return (int) (spValue * fontScale + 0.5f);
-	}
+    /**
+     * 将sp值转换为px值，保证文字大小不变
+     *
+     * @param spValue
+     * @param   （DisplayMetrics类中属性scaledDensity）
+     * @return
+     */
+    public static int sp2px(Context context, float spValue) {
+        final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
+        return (int) (spValue * fontScale + 0.5f);
+    }
 
-	/**
-	 * 设置添加屏幕的背景透明度
-	 *
-	 * @param bgAlpha
-	 */
-	public static void backgroundAlpha(Activity activity, float bgAlpha) {
-		WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
-		lp.alpha = bgAlpha; //0.0-1.0
-		activity.getWindow().setAttributes(lp);
-	}
-	/**
-	 * 设置添加屏幕的背景透明度
-	 *
-	 * @param bgAlpha
-	 */
-	public static void backgroundAlpha(Context context, float bgAlpha) {
-		Activity activity = (Activity) context;
-		WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
-		lp.alpha = bgAlpha; //0.0-1.0
-		activity.getWindow().setAttributes(lp);
-	}
+    /**
+     * 设置添加屏幕的背景透明度
+     *
+     * @param bgAlpha
+     */
+    public static void backgroundAlpha(Activity activity, float bgAlpha) {
+        setBackgroundAlpha(activity, bgAlpha);
+    }
+
+    /**
+     * 设置添加屏幕的背景透明度
+     *
+     * @param bgAlpha
+     */
+    @Deprecated
+    public static void backgroundAlpha(Context context, float bgAlpha) {
+        Activity activity = (Activity) context;
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.alpha = bgAlpha; //0.0-1.0
+        activity.getWindow().setAttributes(lp);
+    }
+
+    /**
+     * 设置页面的透明度
+     * 兼容华为手机（在个别华为手机上 设置透明度会不成功）
+     *
+     * @param bgAlpha 透明度   1表示不透明
+     */
+    public static void setBackgroundAlpha(Activity activity, float bgAlpha) {
+        WindowManager.LayoutParams lp = activity.getWindow().getAttributes();
+        lp.alpha = bgAlpha;
+        if (bgAlpha == 1) {
+            activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//不移除该Flag的话,在有视频的页面上的视频会出现黑屏的bug
+        } else {
+            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);//此行代码主要是解决在华为手机上半透明效果无效的bug
+        }
+        activity.getWindow().setAttributes(lp);
+    }
 }

WeiChat/src/main/res/layout/activity_flights.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_flights"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.FlightsActivity">
+
+    <android.support.v7.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:id="@+id/listView"
+        android:layout_height="match_parent" />
+</RelativeLayout>

WeiChat/src/main/res/layout/pop_work_activity.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/super_setting_tv"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/text_click_bg"
+        android:gravity="center"
+        android:text="@string/super_setting"
+        android:textColor="@color/text_main"
+        android:textSize="15sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid" />
+
+    <TextView
+        android:id="@+id/work_setting_tv"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/text_click_bg"
+        android:gravity="center"
+        android:text="@string/work_setting"
+        android:textColor="@color/text_main"
+        android:textSize="15sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid" />
+
+    <TextView
+        android:id="@+id/office_addr_setting_tv"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/text_click_bg"
+        android:gravity="center"
+        android:text="@string/office_addr_setting"
+        android:textColor="@color/text_main"
+        android:textSize="15sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid" />
+
+    <TextView
+        android:id="@+id/my_rule_setting_tv"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/text_click_bg"
+        android:gravity="center"
+        android:text="@string/my_rule_setting"
+        android:textColor="@color/text_main"
+        android:textSize="15sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="@color/button_invalid" />
+
+    <TextView
+        android:id="@+id/cancel_tv"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/text_click_bg"
+        android:gravity="center"
+        android:text="@string/cancel"
+        android:textColor="@color/red"
+        android:textSize="15sp" />
+
+</LinearLayout>

WeiChat/src/main/res/values/strings.xml

@@ -16,6 +16,11 @@
         <item>20分钟</item>
         <item>30分钟</item>
     </string-array>
+    <string name="super_setting">高级设置</string>
+    <string name="work_setting">排班设置</string>
+    <string name="office_addr_setting">办公室地址设置</string>
+    <string name="my_rule_setting">我的考勤规则</string>
+
     <string name="open_location">定位失败，请确认允许程序使用定位权限</string>
     <string name="end_less_start">结束时间不能小于或等于开始时间</string>
     <string name="delete_item">确定要删除吗</string>
@@ -28,6 +33,8 @@
     <string name="updata">更新</string>
     <string name="select_location">选择地址</string>
     <string name="activity_select_aims">选择目的地</string>
+    <string name="activity_flights">排版设置</string>
+    <string name="activity_visit_aims">拜访目的</string>
     <string name="activity_signing">打卡签到</string>
     <string name="activity_mission_set">外勤设置</string>
     <string name="activity_mission_plan">外勤计划</string>