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

WeiChat/build.gradle

@@ -58,9 +58,9 @@ android {
         }
     }
     productFlavors {  // Gradle 多渠道打包
+        baidu {}
         wandoujia {}
         _360 {}
-        baidu {}
         xiaomi {}
         tencent {}
         taobao {}

WeiChat/src/main/AndroidManifest.xml

@@ -127,7 +127,8 @@
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="${UMENG_CHANNEL_VALUE}" />
-        <!-- 启动页面 -->
+
+         <!--启动页面 -->
         <activity android:name=".ui.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/AutoErpService.java

@@ -65,8 +65,9 @@ public class AutoErpService extends Service {
     private NotificationManage notificationManage;//通知管理器
 
     private final long INTERVAL = 2 * 60 * 1000;//每两分钟回来一次，防止时间太久出现回不来情况 通过 iter来判断是否进入判断
+    private final long PLAN_INTERVAL = 10 * 60 * 1000;//每十分钟回来一次，iter来判断是否进入判断
     private final int WORK_ITER = 3;//计算循环的时间
-    private final int DNOTICE_ITER = 10; //TODO 测试用1 ，之后改为10
+    private final int DNOTICE_ITER = 2;
     private final int MISSION_ITER = 10;//外勤时间  2分钟的倍数
 
     private AutoErpSigninUitl signinUitl;
@@ -334,7 +335,7 @@ public class AutoErpService extends Service {
                         }
                         dnoticeIter++;
                         dnotice = false;
-                        Thread.sleep(INTERVAL);
+                        Thread.sleep(PLAN_INTERVAL);
                     } catch (InterruptedException e) {
                         if (e != null)
                             log("startDNoticeTask InterruptedException=" + e.getMessage());

app_modular/AppWorks/src/test/java/com/uas/appworks/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package com.uas.appworks;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

applogin/build.gradle

@@ -0,0 +1,35 @@
+apply plugin: 'com.android.application'
+
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
+
+
+    defaultConfig {
+        applicationId "com.uas.applogin"
+        minSdkVersion 16
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    testCompile 'junit:junit:4.12'
+}

applogin/src/androidTest/java/com/uas/applogin/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package com.uas.applogin;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.uas.applogin", appContext.getPackageName());
+    }
+}

applogin/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.uas.applogin">
+    <application android:allowBackup="true" android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true" android:theme="@style/AppTheme" />
+</manifest>

applogin/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">applogin</string>
+</resources>

applogin/src/test/java/com/uas/applogin/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package com.uas.applogin;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}