Skip to content

android / dayu

Go to a project
Commit 470d1508 by mReturn
Options

v2.4.0

parent 26b2c06b
Inline Side-by-side
Showing with 34 additions and 33 deletions
app/src/main/AndroidManifest.xml
...@@ -36,12 +36,6 @@ ...@@ -36,12 +36,6 @@
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<!-- 用于申请获取蓝牙信息进行室内定位 --> <!-- 用于申请获取蓝牙信息进行室内定位 -->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<!--华为小红点-->
<uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" />
<application <application
android:name=".MyApplication" android:name=".MyApplication"
android:allowBackup="true" android:allowBackup="true"
...@@ -49,8 +43,8 @@ ...@@ -49,8 +43,8 @@
android:label="@string/tv_dayu" android:label="@string/tv_dayu"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
tools:replace="android:label,icon,theme" tools:ignore="GoogleAppIndexingWarning"
tools:ignore="GoogleAppIndexingWarning"> tools:replace="android:label,icon,theme">
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="android.support.v4.content.FileProvider"
android:authorities="com.dayu.bigfish.fileProvider" android:authorities="com.dayu.bigfish.fileProvider"
...@@ -87,8 +81,8 @@ ...@@ -87,8 +81,8 @@
android:value="599a41697f2c743210000990" /> android:value="599a41697f2c743210000990" />
<meta-data <meta-data
android:name="UMENG_CHANNEL" android:name="UMENG_CHANNEL"
android:value="dev" /> android:value="Channel ID" />
<!--android:value="Channel ID" />--> <!--android:value="dev" />-->
<!-- 高德地图 --> <!-- 高德地图 -->
<meta-data <meta-data
...@@ -146,4 +140,10 @@ ...@@ -146,4 +140,10 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
</application> </application>
<!--华为小红点-->
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" />
</manifest> </manifest>
\ No newline at end of file
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -44,30 +44,30 @@ public class Constants { ...@@ -44,30 +44,30 @@ public class Constants {
/** /**
* uat环境配置. * uat环境配置.
*/ */
public static final String ENVIROMENT = "uat"; // public static final String ENVIROMENT = "uat";
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; // public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String BASE_URL = "http://47.95.223.6:3112"; // public static final String BASE_URL = "http://47.95.223.6:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; // public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop"; // public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail"; // public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail"; // public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult"; // public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop"; // public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
public static final boolean IS_DEBUG = true; // public static final boolean IS_DEBUG = true;
/** /**
* 正式环境. * 正式环境.
*/ */
// public static final String ENVIROMENT = "release"; public static final String ENVIROMENT = "release";
// public static final int LOG_LEVEL = LogUtils.LEVEL_OFF; public static final int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static final String BASE_URL = "https://mobile.kf.ai"; public static final String BASE_URL = "https://mobile.kf.ai";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"; public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "https://sop.kf.ai/#/sop"; public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult"; public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop"; public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
// public static final boolean IS_DEBUG = false; public static final boolean IS_DEBUG = false;
/** /**
* 统一配置. * 统一配置.
......
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
...@@ -185,7 +185,7 @@ public class CommonUtils { ...@@ -185,7 +185,7 @@ public class CommonUtils {
umMin.setPath(Constants.PROGRAM_PATH.replace("uid",uid+"").replace("gid",gid+"")); umMin.setPath(Constants.PROGRAM_PATH.replace("uid",uid+"").replace("gid",gid+""));
// 小程序原始id,在微信平台查询 // 小程序原始id,在微信平台查询
umMin.setUserName("gh_0e5cd0cdbf46"); umMin.setUserName("gh_0e5cd0cdbf46");
Config.setMiniPreView(); //设置预览版 // Config.setMiniPreView(); //设置预览版
// Config.setMiniTest(); //设置测试版 // Config.setMiniTest(); //设置测试版
new ShareAction(activity) new ShareAction(activity)
.withMedia(umMin) .withMedia(umMin)
......
build.gradle
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3" ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 16 ext.min_sdk_version = 16
ext.target_sdk_version = 26 ext.target_sdk_version = 26
ext.version_code = 232 ext.version_code = 240
ext.verson_name = "2.3.2" ext.verson_name = "2.4.0"
ext.gradle_version = '3.1.4' ext.gradle_version = '3.1.4'
ext.isReleaseMinify = true ext.isReleaseMinify = true
ext.isDebugMinify = false ext.isDebugMinify = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment