字段搜索修改为全部可搜索

app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -39,6 +39,7 @@ import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.uas.applocation.UasLocationHelper;
+import com.uas.applocation.test.TestLocationOpinion;
 import com.uas.applocation.utils.AreaUtils;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.socialize.Config;
@@ -97,8 +98,6 @@ public class MyApplication extends BaseApplication {
     private NetWorkObservable mNetWorkObservable;
 
 
-
-
     @Override
     public void initConfig() throws Exception {
         //后台服务初始化application
@@ -172,10 +171,17 @@ public class MyApplication extends BaseApplication {
         UasLocationHelper.getInstance().release();
     }
 
-    private void initLocation(){
+    private void initLocation() {
+        if (BaseConfig.isDebug()) {
+            //开启模拟定位服务
+            TestLocationOpinion mTestLocationOpinion = new TestLocationOpinion(this);
+            mTestLocationOpinion.initLocation();
+            mTestLocationOpinion.asynTaskUpdateCallBack();
+        }
         AreaUtils.initArea(this);
         UasLocationHelper.getInstance().initConfig(this);
     }
+
     public void initShareAPI() {
 //        PlatformConfig.setWeixin("wx2539cc96bf158e00", "b057aa3e807ba7c505a2f03cc541bbf6");
         PlatformConfig.setWeixin(Constants.WXPAY_APPID, Constants.WEIXIN_SECRET);

app_modular/applocation/src/main/java/com/uas/applocation/base/NativeLocationManager.java

@@ -103,6 +103,7 @@ public class NativeLocationManager implements BaseLocationManager {
         mUASLocation.setGpsLongitude(address.getLongitude());
         mUASLocation.setLatitude(latlng.latitude);
         mUASLocation.setLongitude(latlng.longitude);
+        Log.i(TAG,"国外定位:"+mUASLocation.toString());
         if (mOnLocationListener != null) {
             mOnLocationListener.onReceiveLocation(mUASLocation);
         }

app_modular/applocation/src/main/java/com/uas/applocation/test/TestLocationOpinion.java

@@ -0,0 +1,88 @@
+package com.uas.applocation.test;
+
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.util.Log;
+
+public class TestLocationOpinion {
+
+    private LocationManager mLocationManager;
+    private Context mContext;
+    private Location mlocation;
+
+    private boolean mbUpdate;
+
+    public TestLocationOpinion(Context mContext) {
+        this.mContext = mContext;
+        this.mlocation = new Location(LocationManager.GPS_PROVIDER);
+    }
+
+    //启动模拟位置服务
+    public boolean initLocation() {
+        mLocationManager = (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
+        if (!mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+            return false;
+        }
+        try {
+            //如果未开启模拟位置服务，则添加模拟位置服务
+            mLocationManager.addTestProvider(LocationManager.GPS_PROVIDER, false, false, false, false, true, true, true, 0, 5);
+            mLocationManager.setTestProviderEnabled(LocationManager.GPS_PROVIDER, true);
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
+    //停止模拟位置服务
+    public void stopMockLocation() {
+        mbUpdate = false;
+        if (mLocationManager != null) {
+            try {
+                mLocationManager.clearTestProviderEnabled(LocationManager.GPS_PROVIDER);
+                mLocationManager.removeTestProvider(LocationManager.GPS_PROVIDER);
+            } catch (Exception e) {
+                Log.e("GPS", e.toString());
+            }
+        }
+    }
+
+    private Bundle bundle = new Bundle();
+    double testData = 0.0;
+
+    public void asynTaskUpdateCallBack() {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                while (mbUpdate) {
+                    //测试的location数据
+                    mlocation.setLongitude(testData++);
+                    mlocation.setLatitude(testData++);
+                    mlocation.setAltitude(testData++);
+                    mlocation.setTime(System.currentTimeMillis());
+                    mlocation.setBearing((float) 1.2);
+                    mlocation.setSpeed((float) 1.2);
+                    mlocation.setAccuracy((float) 1.2);
+                    //额外的自定义数据，使用bundle来传递
+                    bundle.putString("test1", "666");
+                    bundle.putString("test2", "66666");
+                    mlocation.setExtras(bundle);
+                    try {
+                        if (Build.VERSION.SDK_INT >= 17) {
+                            mlocation.setElapsedRealtimeNanos(SystemClock.elapsedRealtimeNanos());
+                        }
+                        mLocationManager.setTestProviderStatus(LocationManager.GPS_PROVIDER, 100, bundle, System.currentTimeMillis());
+                        mLocationManager.setTestProviderLocation(LocationManager.GPS_PROVIDER, mlocation);
+                        Thread.sleep(1000);
+                    } catch (Exception e) {
+                        return;
+                    }
+                }
+
+            }
+        }).start();
+    }
+}

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

@@ -824,7 +824,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     }
 
     private void toDataFormList() {
-        startActivity(new Intent(mContext, FormListSelectActivity.class)
+        startActivity(new Intent(this, FormListSelectActivity.class)
                 .putExtra("caller", caller)
                 .putExtra("statusKey", statusKey)//传状态key
                 .putExtra("title", getToolBarTitle().toString()));