浏览代码

因异常,加回权限

ChengJH 3 年之前
父节点
当前提交
4c232713d3
共有 2 个文件被更改,包括 50 次插入43 次删除
  1. 26 24
      WeiChat/src/main/AndroidManifest.xml
  2. 24 19
      app_core/common/src/main/java/com/core/app/MyApplication.java

+ 26 - 24
WeiChat/src/main/AndroidManifest.xml

@@ -11,25 +11,26 @@
     <!-- share umeng -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-<!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
-<!--    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
-<!--    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
 <!--    位置-->
-<!--    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
-<!--    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <!-- 拨打电话 -->
-<!--    <uses-permission android:name="android.permission.CALL_PHONE" />-->
+    <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
         tools:ignore="ProtectedPermissions"/>
-<!--    <uses-feature android:name="android.hardware.camera" />-->
-<!--    <uses-feature android:name="android.hardware.camera.autofocus" />-->
-<!--    <uses-feature android:name="android.hardware.microphone" />-->
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+    <uses-feature android:name="android.hardware.microphone" />
 
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -38,16 +39,16 @@
     <!-- 录音录像的权限 -->
     <uses-permission android:name="android.permission.RECORD_VIDEO" />
 <!--    麦克风-->
-<!--    <uses-permission android:name="android.permission.RECORD_AUDIO" />-->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 <!--    相机-->
-<!--    <uses-permission android:name="android.permission.CAMERA" />-->
+    <uses-permission android:name="android.permission.CAMERA" />
     <!-- 基本的 -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 <!--    读取手机-->
 <!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
-    <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
+<!--     <uses-permission android:name="android.permission.INTERNET" /> -->
 
 
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@ -59,7 +60,6 @@
 
     <!-- Push service 运行需要的权限 -->
     <uses-permission android:name="android.permission.INTERNET" />
-<!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -79,18 +79,19 @@
     </permission>
 
     <!-- 百度自动更新 -->
-<!--    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />-->
-<!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
-<!--    <uses-permission android:name="android.permission.INTERNET" />-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 <!--    <uses-permission android:name="android.permission.INTERNET" />-->
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
 <!--    读写联系人-->
-<!--    <uses-permission android:name="android.permission.READ_CONTACTS" />-->
-<!--    <uses-permission android:name="android.permission.WRITE_CONTACTS" />-->
-<!--    <uses-permission android:name="android.permission.GET_ACCOUNTS" />-->
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
 
     <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@@ -101,15 +102,16 @@
     <!-- 设置索尼的Badge需添加权限 -->
     <uses-permission android:name="com.sonyericsson.home.permission.BROADCAST_BADGE" />
 
-<!--    <uses-feature android:name="android.hardware.camera" />-->
-<!--    <uses-feature android:name="android.hardware.camera" />-->
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera" />
     <!-- 使用照相机权限 -->
-<!--    <uses-feature android:name="android.hardware.camera.autofocus" />-->
+    <uses-feature android:name="android.hardware.camera.autofocus" />
     <!-- 计步器用到 -->
-<!--    <uses-feature android:name="android.hardware.sensor.accelerometer" />-->
+    <uses-feature android:name="android.hardware.sensor.accelerometer" />
     <uses-permission android:name="android.permission.READ_LOGS"
         tools:ignore="ProtectedPermissions" />
-    <!-- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> -->
+     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"
+         tools:ignore="ProtectedPermissions" />
     <!-- 自动聚焦权限 -->
     <!-- 全局样式不要随意改动  @style/AppTheme -->
     <application

+ 24 - 19
app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -37,8 +37,13 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
 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.umeng.analytics.MobclickAgent;
+import com.umeng.socialize.Config;
+import com.umeng.socialize.PlatformConfig;
 
 import org.apache.http.cookie.Cookie;
 
@@ -182,27 +187,27 @@ public class MyApplication extends BaseApplication {
     }
 
     private void initLocation() {
-//        if (BaseConfig.isDebug()) {
-//            //开启模拟定位服务
-//            TestLocationOpinion mTestLocationOpinion = new TestLocationOpinion(this);
-//            mTestLocationOpinion.initLocation();
-//            mTestLocationOpinion.asynTaskUpdateCallBack();
-//        }
-//        UasLocationHelper.getInstance().initConfig(this);
+        if (BaseConfig.isDebug()) {
+            //开启模拟定位服务
+            TestLocationOpinion mTestLocationOpinion = new TestLocationOpinion(this);
+            mTestLocationOpinion.initLocation();
+            mTestLocationOpinion.asynTaskUpdateCallBack();
+        }
+        UasLocationHelper.getInstance().initConfig(this);
+    }
+
+    public void initShareAPI() {
+//        PlatformConfig.setWeixin("wx2539cc96bf158e00", "b057aa3e807ba7c505a2f03cc541bbf6");
+        PlatformConfig.setWeixin(Constants.WXPAY_APPID, Constants.WEIXIN_SECRET);
+        PlatformConfig.setSinaWeibo("493318722", "7def652c3683603b08bab87d34b1f944");
+        PlatformConfig.setQQZone("1104894295", "Nk8zMIz5YSqwRQ1F");
+        Config.IsToastTip = false;
     }
 
-//    public void initShareAPI() {
-////        PlatformConfig.setWeixin("wx2539cc96bf158e00", "b057aa3e807ba7c505a2f03cc541bbf6");
-//        PlatformConfig.setWeixin(Constants.WXPAY_APPID, Constants.WEIXIN_SECRET);
-//        PlatformConfig.setSinaWeibo("493318722", "7def652c3683603b08bab87d34b1f944");
-//        PlatformConfig.setQQZone("1104894295", "Nk8zMIz5YSqwRQ1F");
-//        Config.IsToastTip = false;
-//    }
-
-//    public void initWxPay(Context context) {
-//        IWXAPI wxApi = WXAPIFactory.createWXAPI(context, Constants.WXPAY_APPID, false);
-//        wxApi.registerApp(Constants.WXPAY_APPID);
-//    }
+    public void initWxPay(Context context) {
+        IWXAPI wxApi = WXAPIFactory.createWXAPI(context, Constants.WXPAY_APPID, false);
+        wxApi.registerApp(Constants.WXPAY_APPID);
+    }
 
     private void initErpDB() {
         DatabaseManager.initializeInstance(DBOpenHelper.getInstance(this));