Sfoglia il codice sorgente

订阅号修改限制条件

Bitliker 9 anni fa
parent
commit
015f01eaf3
46 ha cambiato i file con 175 aggiunte e 32 eliminazioni
  1. 7 7
      WeiChat/build.gradle
  2. BIN
      WeiChat/libs/BaiduLBS_Android.jar
  3. 1 1
      WeiChat/src/main/AndroidManifest.xml
  4. 1 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java
  5. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/db/OtherSqliteHelper.java
  6. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SubscriptionDao.java
  7. 159 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/LocationMapActivity.java
  8. 0 16
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectLocationActivity.java
  9. 2 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/VisitActivity.java
  10. 2 4
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java
  11. BIN
      WeiChat/src/main/jniLibs/arm64-v8a/libBaiduMapSDK_base_v4_0_0.so
  12. BIN
      WeiChat/src/main/jniLibs/arm64-v8a/libBaiduMapSDK_cloud_v4_0_0.so
  13. BIN
      WeiChat/src/main/jniLibs/arm64-v8a/liblocSDK6a.so
  14. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_base_v4_0_0.so
  15. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_cloud_v4_0_0.so
  16. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_map_v4_0_0.so
  17. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_radar_v4_0_0.so
  18. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_search_v4_0_0.so
  19. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_util_v4_0_0.so
  20. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_v3_3_0_1.so
  21. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/liblocSDK5.so
  22. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/liblocSDK6a.so
  23. BIN
      WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v4_0_0.so
  24. BIN
      WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_cloud_v4_0_0.so
  25. BIN
      WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v4_0_0.so
  26. BIN
      WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_radar_v4_0_0.so
  27. BIN
      WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_search_v4_0_0.so
  28. BIN
      WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_util_v4_0_0.so
  29. BIN
      WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_v3_3_0_1.so
  30. BIN
      WeiChat/src/main/jniLibs/armeabi/liblocSDK5.so
  31. BIN
      WeiChat/src/main/jniLibs/armeabi/liblocSDK6a.so
  32. BIN
      WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_base_v4_0_0.so
  33. BIN
      WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_cloud_v4_0_0.so
  34. BIN
      WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_map_v4_0_0.so
  35. BIN
      WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_radar_v4_0_0.so
  36. BIN
      WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_search_v4_0_0.so
  37. BIN
      WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_util_v4_0_0.so
  38. BIN
      WeiChat/src/main/jniLibs/x86/liblocSDK6a.so
  39. BIN
      WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_base_v4_0_0.so
  40. BIN
      WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_cloud_v4_0_0.so
  41. BIN
      WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_map_v4_0_0.so
  42. BIN
      WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_radar_v4_0_0.so
  43. BIN
      WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_search_v4_0_0.so
  44. BIN
      WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_util_v4_0_0.so
  45. BIN
      WeiChat/src/main/jniLibs/x86_64/liblocSDK6a.so
  46. 1 1
      WeiChat/src/main/res/layout/activity_select_location2.xml

+ 7 - 7
WeiChat/build.gradle

@@ -3,12 +3,12 @@ apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
     signingConfigs {
-//        config {
-//            keyPassword '13237658359'
-//            storeFile file('C:/Users/Arisono/Desktop/applicationsignname[20150409]')
-//            storePassword '13237658359'
-//            keyAlias 'jie-20150409'
-//        }
+        config {
+            keyPassword '13237658359'
+            storeFile file('D:/config/applicationsignname[20150409]')
+            storePassword '13237658359'
+            keyAlias 'jie-20150409'
+        }
     }
     compileSdkVersion 22
     buildToolsVersion "22.0.1"
@@ -32,7 +32,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
         debug {
-//            signingConfig signingConfigs.config
+            signingConfig signingConfigs.config
         }
     }
 }

BIN
WeiChat/libs/BaiduLBS_Android.jar


+ 1 - 1
WeiChat/src/main/AndroidManifest.xml

@@ -454,7 +454,7 @@
         <activity
             android:name=".ui.erp.activity.oa.VisitActivity"
             android:label="拜访报告" />
-        <activity android:name=".ui.erp.activity.oa.SelectLocationActivity"></activity>
+        <activity android:name=".ui.erp.activity.oa.LocationMapActivity"></activity>
     </application>
 
 </manifest>

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -103,6 +103,7 @@ public class BdLocationHelper {
 							"百度定位信息  City:" + location.getCity() + "  CityCode:" + location.getCityCode() + "  区:" + location.getDistrict());
 				}
 			}
+
 			if (!isLocationUpdate) {
 				LocationSp.getInstance(mContext).setLongitude((float) mLongitude);
 				LocationSp.getInstance(mContext).setLatitude((float) mLatitude);

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/db/OtherSqliteHelper.java

@@ -30,4 +30,4 @@ public class OtherSqliteHelper extends SQLiteOpenHelper {
                 "son_title_,status_,EMP_ID_,RN_,SONTITLE_,SUMDATA_,name)";
         sqLiteDatabase.execSQL(sql);
     }
-}
+}

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SubscriptionDao.java

@@ -225,4 +225,4 @@ public class SubscriptionDao {
         }
         return messages;
     }
-}
+}

+ 159 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/LocationMapActivity.java

@@ -0,0 +1,159 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+import android.util.Log;
+
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.search.core.PoiInfo;
+import com.baidu.mapapi.search.core.SearchResult;
+import com.baidu.mapapi.search.geocode.GeoCodeResult;
+import com.baidu.mapapi.search.geocode.GeoCoder;
+import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
+import com.baidu.mapapi.search.geocode.ReverseGeoCodeOption;
+import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult;
+import com.baidu.mapapi.search.poi.OnGetPoiSearchResultListener;
+import com.baidu.mapapi.search.poi.PoiDetailResult;
+import com.baidu.mapapi.search.poi.PoiIndoorInfo;
+import com.baidu.mapapi.search.poi.PoiIndoorResult;
+import com.baidu.mapapi.search.poi.PoiNearbySearchOption;
+import com.baidu.mapapi.search.poi.PoiResult;
+import com.baidu.mapapi.search.poi.PoiSearch;
+import com.xzjmyk.pm.activity.BdLocationHelper;
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+import java.util.List;
+
+//选择地址
+public class LocationMapActivity extends BaseActivity {
+
+    private PoiSearch mPoiSearch;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_select_location2);
+//        mPoiSearch = PoiSearch.newInstance();
+//        PoiNearbySearchOption poi = new PoiNearbySearchOption();
+//        poi.keyword("楼");
+//        poi.radius(500);
+//        BdLocationHelper h = MyApplication.getInstance().getBdLocationHelper();
+//        LatLng lalag = new LatLng(h.getLatitude(), h.getLongitude());
+//        poi.location(lalag);
+//        mPoiSearch.searchNearby(poi);
+//        GeoCoder coder = GeoCoder.newInstance();
+//        coder.setOnGetGeoCodeResultListener(new OnGetGeoCoderResultListener() {
+//            @Override
+//            public void onGetReverseGeoCodeResult(
+//                    ReverseGeoCodeResult result) {
+//// 这个result 里面有个附近poi的列表
+//
+//            }
+//
+//            @Override
+//            public void onGetGeoCodeResult(GeoCodeResult arg0) {
+//            }
+//
+////            mPoiSearch.setOnGetGeoCodeResultListener(poiListener);
+//
+//        });
+//
+//        OnGetPoiSearchResultListener poiListener = new OnGetPoiSearchResultListener() {
+//            public void onGetPoiResult(PoiResult result) {
+//                //获取POI检索结果
+//                List<PoiAddrInfo> lis = result.getAllAddr();
+//                for (int i = 0; i < lis.size(); i++) {
+//                    Log.i("gongpengmings", lis.get(i).address);
+//                }
+//            }
+//
+//            public void onGetPoiDetailResult(PoiDetailResult result) {
+//                //获取Place详情页检索结果
+//                Log.i("gongpengmingss", result.getAddress());
+//            }
+//
+//            @Override
+//            public void onGetPoiIndoorResult(PoiIndoorResult poiIndoorResult) {
+//
+//            }
+//        };
+//        nearbySearch(1);
+//        dosame();
+    }
+
+    private void nearbySearch(int page) {
+        BdLocationHelper h = MyApplication.getInstance().getBdLocationHelper();
+        final LatLng geolat = new LatLng(h.getLatitude(), h.getLongitude());
+        PoiNearbySearchOption nearbySearchOption = new PoiNearbySearchOption();
+        nearbySearchOption.location(geolat);
+        nearbySearchOption.keyword("银行");
+        nearbySearchOption.radius(1000);// 检索半径,单位是米
+        nearbySearchOption.pageNum(page);
+        PoiSearch poiSearch = PoiSearch.newInstance();
+        poiSearch.searchNearby(nearbySearchOption);// 发起附近检索请求
+        poiSearch.setOnGetPoiSearchResultListener(new OnGetPoiSearchResultListener() {
+            @Override
+            public void onGetPoiResult(PoiResult poiResult) {
+//                List<PoiAddrInfo> lis = poiResult.getAllAddr();
+//                for (int i = 0; i < lis.size(); i++) {
+//                    Log.i("gongpengminga", lis.get(i).address);
+//                }
+                if (poiResult.error != SearchResult.ERRORNO.NO_ERROR) {
+                    Log.i("gongpengminga", "抱歉,未找到结果");
+
+                } else {
+                    Log.i("gongpengminga", "成功,查看详情页面");
+                    Log.i("gongpengminga",poiResult.getAllAddr()==null?"为空的": "不为空");
+                }
+
+            }
+
+            @Override
+            public void onGetPoiDetailResult(PoiDetailResult poiDetailResult) {
+                Log.i("gongpengmingb", poiDetailResult.getAddress());
+
+            }
+
+            @Override
+            public void onGetPoiIndoorResult(PoiIndoorResult poiIndoorResult) {
+                List<PoiIndoorInfo> list = poiIndoorResult.getmArrayPoiInfo();
+                for (int i = 0; i < list.size(); i++) {
+                    Log.i("gongpengmingc", list.get(i).address);
+                }
+            }
+        });
+    }
+
+    private void dosame() {
+        BdLocationHelper h = MyApplication.getInstance().getBdLocationHelper();
+        final LatLng geolat = new LatLng(h.getLatitude(), h.getLongitude());
+        ReverseGeoCodeOption option = new ReverseGeoCodeOption();
+        option.location(geolat);
+        GeoCoder coder = GeoCoder.newInstance();
+        coder.reverseGeoCode(option);
+        coder.setOnGetGeoCodeResultListener(new OnGetGeoCoderResultListener() {
+            @Override
+            public void onGetReverseGeoCodeResult(
+                    ReverseGeoCodeResult result) {
+// 这个result 里面有个附近poi的列表
+                List<PoiInfo> lis = result.getPoiList();
+                for (int i = 0; i < lis.size(); i++) {
+                    Log.i("gongpengmings", lis.get(i).address);
+                }
+            }
+
+            @Override
+            public void onGetGeoCodeResult(GeoCodeResult arg0) {
+                Log.i("gongpengmingss", arg0.getAddress());
+            }
+        });
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mPoiSearch != null)
+            mPoiSearch.destroy();
+    }
+}

+ 0 - 16
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectLocationActivity.java

@@ -1,16 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
-
-import android.os.Bundle;
-
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-
-//选择地址
-public class SelectLocationActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_select_location2);
-    }
-}

+ 2 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/VisitActivity.java

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -21,7 +22,7 @@ public class VisitActivity extends BaseActivity {
         findViewById(R.id.location_tv).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                
+               startActivityForResult(new Intent(VisitActivity.this, LocationMapActivity.class),1);
             }
         });
     }

+ 2 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -5,7 +5,6 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -148,7 +147,7 @@ public class SubscriptionActivity extends BaseActivity {
     private void init() {
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
-        emCode = CommonUtil.getSharedPreferences(mContext, "erp_username");
+        emCode = CommonUtil.getSharedPreferences(mContext, "erp_username") + CommonUtil.getSharedPreferences(mContext, "erp_master");
         //第一次进来获取数据库
         //获取当天时间
         Calendar calendar = Calendar.getInstance();
@@ -463,5 +462,4 @@ public class SubscriptionActivity extends BaseActivity {
             TextView sub_title_tv, isre_tv, big_sub_title_tv, big_isre_tv;
         }
     }
-}
-
+}

BIN
WeiChat/src/main/jniLibs/arm64-v8a/libBaiduMapSDK_base_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/arm64-v8a/libBaiduMapSDK_cloud_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/arm64-v8a/liblocSDK6a.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_base_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_cloud_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_map_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_radar_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_search_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_util_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/libBaiduMapSDK_v3_3_0_1.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/liblocSDK5.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/liblocSDK6a.so


BIN
WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_base_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_cloud_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_map_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_radar_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_search_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_util_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/armeabi/libBaiduMapSDK_v3_3_0_1.so


BIN
WeiChat/src/main/jniLibs/armeabi/liblocSDK5.so


BIN
WeiChat/src/main/jniLibs/armeabi/liblocSDK6a.so


BIN
WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_base_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_cloud_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_map_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_radar_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_search_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86/libBaiduMapSDK_util_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86/liblocSDK6a.so


BIN
WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_base_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_cloud_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_map_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_radar_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_search_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86_64/libBaiduMapSDK_util_v4_0_0.so


BIN
WeiChat/src/main/jniLibs/x86_64/liblocSDK6a.so


+ 1 - 1
WeiChat/src/main/res/layout/activity_select_location2.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectLocationActivity">
+    tools:context=".ui.erp.activity.oa.LocationMapActivity">
 
     <com.baidu.mapapi.map.MapView
         android:id="@+id/bmapView"