From a9ce331dccd25eee1d0b9193f7853c6e4a07b792 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期二, 14 四月 2020 15:43:57 +0800 Subject: [PATCH] 2020-04-14 1.去掉登录之前ping域名检测，解决客户反馈登录失败的问题 2.替换新的控件库，去掉高德地图。 3.修复创建不了住宅问题。 4.修复增加登陆获取住宅列表时当前住宅判空处理。 5.去掉温度按钮自定义字体。 --- Crabtree/ON/Properties/AndroidManifest.xml | 55 +++++++++++++------------------------------------------ 1 files changed, 13 insertions(+), 42 deletions(-) diff --git a/Crabtree/ON/Properties/AndroidManifest.xml b/Crabtree/ON/Properties/AndroidManifest.xml index 57074d3..af3e3b5 100644 --- a/Crabtree/ON/Properties/AndroidManifest.xml +++ b/Crabtree/ON/Properties/AndroidManifest.xml @@ -1,9 +1,11 @@ 锘�<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtree" android:versionCode="202004031" android:versionName="2.504031"> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtree" android:versionCode="202004093" android:versionName="2.504093"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="28" /> + <!-- 鍦ㄥ畨鍗揚鐗堟湰涔嬪悗锛屽繀椤昏鎺堜簣FOREGROUND_SERVICE鏉冮檺锛屾墠鑳藉浣跨敤鍓嶅彴鏈嶅姟 --> + <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- Required 涓�浜涚郴缁熻姹傜殑鏉冮檺锛屾澶勬槸鏋佸厜鎺ㄩ�侀渶姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�--> - <permission android:name="com.hdl.on.permission.JPUSH_MESSAGE" android:protectionLevel="signature" /> - <uses-permission android:name="com.hdl.on.permission.JPUSH_MESSAGE" /> + <!-- <permission android:name="com.hdl.crabtree.permission.JPUSH_MESSAGE" android:protectionLevel="signature" /> + <uses-permission android:name="com.hdl.crabtree.permission.JPUSH_MESSAGE" /> --> <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" /> @@ -74,7 +76,7 @@ <uses-feature android:name="android.hardware.wifi" android:required="false" /> <uses-feature android:name="android.hardware.bluetooth" android:required="false" /> <application android:allowBackup="true" android:networkSecurityConfig="@xml/network_security_config" android:icon="@drawable/Icon" android:largeHeap="true" android:label="Crabtree-ON"> - <activity android:name="com.videogo.UiKitActivity" android:configChanges="orientation|keyboardHidden" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> + <!-- <activity android:name="com.videogo.UiKitActivity" android:configChanges="orientation|keyboardHidden" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> <activity android:name="com.videogo.LoginSelectActivity" android:configChanges="orientation|keyboardHidden" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> <activity android:name="com.videogo.main.EzvizWebViewActivity" android:configChanges="orientation|keyboardHidden" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> <activity android:name="com.videogo.remoteplayback.list.PlayBackListActivity" android:configChanges="orientation|keyboardHidden|screenSize" android:screenOrientation="nosensor" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" /> @@ -104,47 +106,16 @@ <action android:name="com.videogo.action.OAUTH_SUCCESS_ACTION" /> <action android:name="android.net.conn.CONNECTIVITY_CHANGE" /> </intent-filter> - </receiver> - <activity android:name="cn.jpush.android.ui.PushActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.NoTitleBar" android:exported="false"> + </receiver> --> + <!-- <activity android:name="cn.jpush.android.ui.PushActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.NoTitleBar" android:exported="false"> <intent-filter> <action android:name="cn.jpush.android.ui.PushActivity" /> <category android:name="android.intent.category.DEFAULT" /> - <category android:name="com.hdl.on" /> + <category android:name="com.hdl.crabtree" /> </intent-filter> - </activity> - <service android:name="cn.jpush.android.service.PushService" android:process=":mult"> - <intent-filter> - <action android:name="cn.jpush.android.intent.REGISTER" /> - <action android:name="cn.jpush.android.intent.REPORT" /> - <action android:name="cn.jpush.android.intent.PushService" /> - <action android:name="cn.jpush.android.intent.PUSH_TIME" /> - </intent-filter> - </service> - <service android:name="cn.jpush.android.service.DaemonService" android:enabled="true" android:exported="true"> - <intent-filter> - <action android:name="cn.jpush.android.intent.DaemonService" /> - <category android:name="com.hdl.on" /> - </intent-filter> - </service> - <receiver android:name="cn.jpush.android.service.PushReceiver" android:enabled="true"> - <intent-filter android:priority="1000"> - <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" /> - <category android:name="com.hdl.on" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.USER_PRESENT" /> - <action android:name="android.net.conn.CONNECTIVITY_CHANGE" /> - </intent-filter> - <!-- Optional --> - <intent-filter> - <action android:name="android.intent.action.PACKAGE_ADDED" /> - <action android:name="android.intent.action.PACKAGE_REMOVED" /> - <data android:scheme="package" /> - </intent-filter> - </receiver> - <activity android:name="cn.jpush.android.ui.PopWinActivity" android:exported="false" /> - <receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false" /> - <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" /> - <meta-data android:name="JPUSH_APPKEY" android:value="bcb35a1721fb9edfe9756329" /> + </activity> --> + <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.crabtree.fileProvider" android:grantUriPermissions="true" android:exported="false"> + <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" /> + </provider> </application> </manifest> \ No newline at end of file -- Gitblit v1.8.0