合并代码

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

@@ -52,7 +52,7 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
     private MissionAdapter adapter;
     private int flag;
     private boolean adminStatus;
-    private boolean locationOk = false;
+    private boolean locationOk = true;
     private BroadcastReceiver receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -102,6 +102,7 @@ public class MissionActivity extends BaseActivity implements View.OnClickListene
     }
 
     private void initView() {
+        locationOk = MyApplication.getInstance().getBdLocationHelper().locationOk();
         if (getIntent() != null)
             flag = getIntent().getIntExtra("flag", 0);
         String addrName = MyApplication.getInstance().getBdLocationHelper().getName();