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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java

@@ -264,7 +264,9 @@ public class DataDownloadActivity extends BaseActivity {
         intent.setFlags(IntentCompat.FLAG_ACTIVITY_CLEAR_TASK);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(intent);
+     
         finish();
+        overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
     }
 
     /**

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

@@ -308,14 +308,13 @@ public class Constants {
     public final static String new_signout = "signout";
     public final static String new_oa = "oa_menu";
     public final static String new_business = "business";
-    
     public final static String NEW_SETING = "seting_2";
- 
     public final static String NEW_UURUN = "NEW_UURUN";
     public final static String NEW_ME_TAG = "ME_TAG";
-
     public final static String SET_SIGN_AUTO="set_sign_auto";
     public final static String SET_SIGN_IN="set_sign_in";
+    public final static String SET_SIGN_LANGUAGE="set_sign_language";
+    
 
     public final static String NEW_FUNCTION_NOTICE = "NEWFUNCTIONNOTICE";
 

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

@@ -58,6 +58,8 @@ import com.xzjmyk.pm.activity.util.GetFileSizeUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 import com.xzjmyk.pm.newpedo.view.NewStepActivity;
 import com.xzjmyk.pm.newpedo.view.StepSplashActivity;
 
@@ -73,6 +75,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     private TextView mCacheTv;
     @ViewInject(R.id.uas_website_tv)
     private TextView uas_website_tv;
+    
+    
     @ViewInject(R.id.tv_menu_setting)
     private TextView tv_menu_setting;
 
@@ -91,6 +95,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     private TextView tv_signauto_new;
     @ViewInject(R.id.tv_sign_new)
     private TextView tv_sign_new;
+    @ViewInject(R.id.tv_language_new)
+    private TextView  tv_language_new;
  
     @ViewInject(R.id.language_us_rl)
     private RelativeLayout  language_us_rl;
@@ -230,15 +236,17 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         
        tv_menu_setting.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.NEW_UURUN, false) ? View.GONE : View.VISIBLE);
        tv_signauto_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_AUTO, false) ? View.GONE : View.VISIBLE);
-       tv_sign_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_IN, false) ? View.GONE : View.VISIBLE); 
+       tv_sign_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_IN, false) ? View.GONE : View.VISIBLE);
+        tv_language_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(this, Constants.SET_SIGN_LANGUAGE, false) ? View.GONE : View.VISIBLE);
+        
         
         speech_recognition_rl.setOnClickListener(this);
         sign_in_rl.setOnClickListener(this);
         sign_out_rl.setOnClickListener(this);
         language_us_rl.setOnClickListener(this);
         
-        if (CommonUtil.isReleaseVersion()){
-            language_us_rl.setVisibility(View.VISIBLE);
+        if (ApiUtils.getApiModel() instanceof ApiPlatform){
+            language_us_rl.setVisibility(View.GONE);
         }else{
             language_us_rl.setVisibility(View.VISIBLE);
         }
@@ -305,6 +313,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         switch (v.getId()) {
             case R.id.language_us_rl:
                 startActivity(new Intent(this, SelectLanguageActivity.class));
+                CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_LANGUAGE, true);
+                tv_language_new.setVisibility(View.GONE);
                 break;
             case R.id.sign_in_rl:
                 showPopupWindow();

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

@@ -338,6 +338,17 @@
                     android:text="@string/set_language"
                     android:textColor="@color/black"
                     android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/tv_language_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_alignTop="@+id/tv_oa"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip" />
 
                 <ImageView
                     android:layout_width="@dimen/next_width"