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

WeiChat/build.gradle

@@ -119,7 +119,6 @@ dependencies {
     compile files('libs/Msc.jar')
     compile files('libs/zhy_treeview.jar')
     compile 'com.alibaba:fastjson:1.2.24'
-    compile 'com.alibaba:fastjson:1.2.24'
     compile 'de.hdodenhof:circleimageview:2.1.0'
     compile 'joda-time:joda-time:2.9.4'
     compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -329,7 +329,9 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         rl_info.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
-                startActivity(new Intent(ct,InfoCodeActivity.class));
+                if (!CommonUtil.isReleaseVersion()){
+                    startActivity(new Intent(ct,InfoCodeActivity.class));
+                }
                 return true;
             }
         });

WeiChat/src/main/java/pl/droidsonroids/gif/GifAnimationMetaData.java

@@ -25,6 +25,7 @@ import java.util.Locale;
  * Lightweight version of {@link pl.droidsonroids.gif.GifDrawable} used to retrieve metadata of GIF only,
  * without having to allocate the memory for its pixels.
  */
+@SuppressWarnings("ResourceType")
 public class GifAnimationMetaData implements Serializable, Parcelable {
     private static final long serialVersionUID = 5692363926580237325L;
 

WeiChat/src/main/java/pl/droidsonroids/gif/GifDrawable.java

@@ -51,6 +51,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @author koral--
  */
+@SuppressWarnings("ResourceType")
 public class GifDrawable extends Drawable implements Animatable, MediaPlayerControl {
     final ScheduledThreadPoolExecutor mExecutor;
 

WeiChat/src/main/res/values-en/strings.xml

@@ -1059,7 +1059,7 @@
     <string name="step_Thursday">THU</string>
     <string name="step_Friday">FRI</string>
     <string name="step_Saturday">SAT</string>
-    <string name="set_language">Switch Language</string>
+    <string name="set_language">Language</string>
     <string name="search">Search</string>
     <string name="msg_offline">Message (offline)</string>
     <string name="msg_connect">Message (in connection)</string>
@@ -1148,8 +1148,8 @@
     </string-array>
     <string name="is_must_input">is required</string>
     <string name="work_off_time">off time</string>
-    <string name="work_sign">work punch</string>
-    <string name="off_sign">get off work punch </string>
+    <string name="work_sign">Clock in</string>
+    <string name="off_sign">Clock off </string>
     <string name="CRM_grabBusinessFaild">Operation failed </string>
     <string name="CRM_sorryYouHaveOverTheBiggestBusinessQuantity">Exceed maximum quantity</string>
     <string name="CRM_addDate_sorryThisBusinessHaveAdd">Sorry, this business opportunity has been added to the agenda</string>
@@ -1162,8 +1162,8 @@
     <string name="CRM_current_page_change_ecet">The current page data has been changed, please update first and then submit</string>
     <string name="CRM_unable_ecet">Unable to access the server,try again later</string>
     <string name="over_latetime">Serious late</string>
-    <string name="work_signin">punch card</string>
-    <string name="unwork_signin">Get off work punch</string>
+    <string name="work_signin">Clock in</string>
+    <string name="unwork_signin">Clock off</string>
     <string name="add_work_times">+Add time</string>
     <string name="all_work_time">Total working hours</string>
     <string name="two_hour_before">2 hours before work</string>

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

materialdialogs/src/main/java/com/afollestad/materialdialogs/internal/MDButton.java

@@ -4,7 +4,7 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v7.internal.text.AllCapsTransformationMethod;
+
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.widget.TextView;
@@ -90,9 +90,9 @@ public class MDButton extends TextView {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
             setAllCaps(allCaps);
         } else {
-            if (allCaps)
-                setTransformationMethod(new AllCapsTransformationMethod(getContext()));
-            else
+//            if (allCaps)
+//                setTransformationMethod(new AllCapsTransformationMethod(getContext()));
+//            else
                 setTransformationMethod(null);
         }
     }