版本5.8.7

MPAndroidChart/build.gradle

@@ -1,24 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 24
-    buildToolsVersion "25.0.0"
-
-    defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 24
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.2.1'
-}

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="109"
-    android:versionName="5.8.7">
+    android:versionCode="110"
+    android:versionName="5.8.8">
 
     <uses-sdk
         android:minSdkVersion="11"

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -54,7 +54,10 @@ import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.helper.FriendHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.db.dao.ContactsDao;
+import com.xzjmyk.pm.activity.ui.erp.model.contacts.ContactsModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddB2BActivity;
@@ -753,6 +756,13 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         // 更新界面
                         do_next_tv.setText(R.string.send_msg);
                         do_next_tv.setOnClickListener(new SendMsgListener());
+                        
+                        ContactsModel model=new ContactsModel();
+                        model.setImid(mUser.getUserId());
+                        model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
+                        model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master"));
+                        model.setType(1);
+                        ContactsDao.getInstance().update(model);
                         // 由陌生或者关注变为好友了,那么右上角更多操作可以显示了
                         initFriendMoreAction();
                         // 更新名片盒

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java

@@ -96,10 +96,6 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
         Animation animation= AnimationUtils.loadAnimation(this, R.anim.anim_translate_bookingprogress);
         
         
-      
-       
-        
-        
         if (getIntent()!=null){
             model=getIntent().getExtras().getParcelable("model");
             boolean isShared=getIntent().getExtras().getBoolean("isShared");
@@ -125,6 +121,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
                 ivResultInfo.startAnimation(animation);
                 if( MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAb_recordid())){
                     ((Button)findViewById(R.id.bt_change)).setText("变更");
+                    ((Button)findViewById(R.id.bt_change)).setTextColor(getResources().getColor(R.color.white));
                     ((Button)findViewById(R.id.bt_cancle)).setText("取消");
                 }else{
                     ((Button)findViewById(R.id.bt_change)).setText("确认");

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

@@ -117,9 +117,13 @@ public class ContactsUtils {
                 contactsId = cursor.getString(0);
                 phoneNum = cursor.getString(1);
                 name = cursor.getString(2);
-
+                
                 Contacts model = new Contacts();
-                model.setPhone(phoneNum);
+                if (!StringUtils.isEmpty(phoneNum)) {
+                    model.setPhone(phoneNum.replace(" ", "").replace("-", ""));
+                }else{
+                    model.setPhone("0");
+                }
                 model.setName(name);
                 model.setId(Integer.valueOf(contactsId));
                 contacts.add(model);

WeiChat/src/main/res/drawable/bg_bule_btn1.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+       
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/titleBlue" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

WeiChat/src/main/res/layout/activity_booking_detail.xml

@@ -201,7 +201,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/select_weixin_list_item"
+            android:background="@drawable/bg_bule_btn1"
             android:text="@string/booking_change" />
 
         <View style="@style/app_line_v_1dp"></View>

WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
-release_version = false
-#release_version=true
+#release_version = false
+release_version=true

WeiChat/src/main/res/values/colors.xml

@@ -256,7 +256,7 @@
     <color name="darkgreen">#006400</color> <!-- 暗绿色 -->
     <color name="blue">#0000FF</color> <!-- 蓝色 -->
     <!--标题栏颜色-->
-    <color name="titleBlue">#3C97D7</color> <!-- 青蓝色 -->
+    <color name="titleBlue">#BF2F95DD</color> <!-- 青蓝色 -->
     <color name="titleCustomer">#DF8339</color>
     <color name="titleVisit">#6FB660</color>
     <color name="titleTask">#D0A233</color>

lib-zxing/build.gradle → app_core/imageload/build.gradle

@@ -1,12 +1,14 @@
 apply plugin: 'com.android.library'
 
+
 android {
-    compileSdkVersion 24
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
+
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
 
@@ -22,19 +24,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    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 files('libs/zxing.jar')
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    testCompile 'junit:junit:4.12'
-}
 
-ext {
-    PUBLISH_GROUP_ID = 'cn.yipianfengye.android'
-    PUBLISH_ARTIFACT_ID = 'zxing-library'
-    PUBLISH_VERSION = '1.9'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    testCompile 'junit:junit:4.12'
 }
-
-//apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'

libfloatingactionbutton/proguard-rules.pro → app_core/imageload/proguard-rules.pro

@@ -15,3 +15,11 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app_core/imageload/src/androidTest/java/base/android/com/imageload/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package base.android.com.imageload;
+
+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("base.android.com.imageload.test", appContext.getPackageName());
+    }
+}

app_core/imageload/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="base.android.com.imageload" />

app_core/imageload/src/main/res/values/strings.xml

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

app_core/imageload/src/test/java/base/android/com/imageload/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package base.android.com.imageload;
+
+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);
+    }
+}

libbdupdatesdk/build.gradle → app_core/network/build.gradle

@@ -1,14 +1,19 @@
 apply plugin: 'com.android.library'
 
+
 android {
-    compileSdkVersion 24
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
+
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
     }
     buildTypes {
         release {
@@ -20,6 +25,10 @@ android {
 
 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'
-    compile 'com.android.support:appcompat-v7:24.2.1'
 }

libbdupdatesdk/proguard-rules.pro → app_core/network/proguard-rules.pro

@@ -15,3 +15,11 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app_core/network/src/androidTest/java/base/android/com/network/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package base.android.com.network;
+
+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("base.android.com.network.test", appContext.getPackageName());
+    }
+}

app_core/network/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="base.android.com.network" />

app_core/network/src/main/res/values/strings.xml

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

app_core/network/src/test/java/base/android/com/network/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package base.android.com.network;
+
+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);
+    }
+}