代码冲突

Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

WeiChat/build.gradle

@@ -1,14 +1,20 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'me.tatarka.retrolambda'
+//定义时间
+def releaseTime() {
+    return new Date().format("yyyyMMddHHmmss")
+}
+//设置发布的显示的版本号
+def getVersionName(){
+    return rootProject.ext.android.versionName
+}
 
 android {
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
     signingConfigs {
         config {
             storeFile file('C:/sigin/applicationsignname[20150409]')
@@ -17,7 +23,6 @@ android {
             keyPassword '13237658359'
         }
     }
-
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
 
@@ -29,7 +34,6 @@ android {
         versionName rootProject.ext.android.versionName
         multiDexEnabled true
         signingConfig signingConfigs.config
-        
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
         ndk {
             abiFilters "armeabi", "armeabi-v7a", "x86", "mips","x86_64","mips64"
@@ -38,11 +42,10 @@ android {
 
     useLibrary 'org.apache.http.legacy'
     lintOptions {
+        checkReleaseBuilds false
         abortOnError false
     }
-
-
-
+    
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
@@ -58,8 +61,9 @@ android {
             signingConfig signingConfigs.config
         }
     }
- 
-    productFlavors {   // 友盟多渠道打包
+
+    // 友盟多渠道打包
+    productFlavors {   
 //        wandoujia {}
 //        _360 {}
         baidu {}
@@ -72,20 +76,28 @@ android {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
     //给apk添加对应的版本号：这里暂时注释但保留
-//    applicationVariants.all { variant ->
-//        variant.outputs.each { output ->
-//            def outputFile = output.outputFile
-//            if (outputFile != null && outputFile.name.endsWith('.apk')) {
-//                def fileName = outputFile.name.replace(".apk", "-${defaultConfig.versionName}.apk")
-//                output.outputFile = new File(outputFile.parent, fileName)
-//            }
-//        }
-//    }
+    //配置自定义打包名称
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            def outputFile = output.outputFile
+            def fileName
+            if (outputFile != null && outputFile.name.endsWith('.apk')) {
+                if (variant.buildType.name.equals('release')) {
+                    variant.mergedFlavor.versionName = getVersionName()+"."+releaseTime()
+                    fileName = "UU互联_${variant.mergedFlavor.versionName}_release.apk"
+                } else if (variant.buildType.name.equals('debug')) {
+                    variant.mergedFlavor.versionName = getVersionName()+"."+releaseTime()
+                    fileName = "UU互联_${variant.mergedFlavor.versionName}_debug.apk"
+                }
+                output.outputFile = new File(outputFile.parent, fileName)
+            }
+        }
+    }
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    //依赖库
+    
     testCompile deps.junit
     compile deps.appcompatV7
     compile deps.cardviewV7

app_modular/appbooking/src/main/res/layout/header_bservices_grid.xml

@@ -2,19 +2,20 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/item_line"
     android:orientation="vertical">
     <!--android:layout_marginTop="80dp"-->
     <com.core.widget.view.MyGridView
         android:id="@+id/mGridView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/white"
-        android:horizontalSpacing="1dp"
+        android:horizontalSpacing="0.5dp"
+        android:background="@color/item_line"
         android:numColumns="3"
         android:paddingTop="5dp"
         android:scrollbars="none"
-        android:verticalSpacing="1dp"></com.core.widget.view.MyGridView>
+        android:verticalSpacing="0.5dp">
+    </com.core.widget.view.MyGridView>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -40,6 +41,7 @@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_centerVertical="true"
+                 android:drawablePadding="5dp"
                  android:layout_alignParentRight="true"
                  android:layout_marginRight="5dp"
                  android:drawableRight="@drawable/icon_distances"

app_modular/appbooking/src/main/res/layout/item_bservice_header.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/select_weixin_list_item"
+    android:descendantFocusability="blocksDescendants"
     android:gravity="center"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:ignore="NewApi">
 
     <TextView
         android:id="@+id/tv_title"

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

@@ -755,6 +755,12 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             } else {
                 menu.findItem(R.id.oa_signin_set).setVisible(false);
             }
+        }else {
+            if (PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false)) {
+                menu.findItem(R.id.oa_signin_set).setVisible(true);
+            } else {
+                menu.findItem(R.id.oa_signin_set).setVisible(false);
+            }
         }
         return super.onPrepareOptionsMenu(menu);
     }