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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -17,8 +17,8 @@ import com.android.volley.Request;
 import com.android.volley.RetryPolicy;
 import com.umeng.analytics.MobclickAgent;
 import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.util.Constants;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -89,7 +89,7 @@ public abstract class BaseActivity extends ActionBackActivity {
         progressDialog = CustomProgressDialog.createDialog(this);
 
         //重启之后恢复到之前的语言
-        switchLanguage(PreferenceUtils.getString(this,"language",getString(R.string.language_rCN)));
+        switchLanguage(PreferenceUtils.getString(this, "language", "rCN"));
         
         // SystemUtil.setSystemBarTint(this);
 
@@ -201,18 +201,17 @@ public abstract class BaseActivity extends ActionBackActivity {
         Resources resources = getResources();
         Configuration config = resources.getConfiguration();
         DisplayMetrics dm = resources.getDisplayMetrics();
-
-        if (language.equals(getString(R.string.language_en))) {
+        if (language.equals("en")) {
             config.locale = Locale.ENGLISH;
-        } else if(language.equals(getString(R.string.language_rCN))) {
+        } else if(language.equals("rCN")) {
             config.locale = Locale.SIMPLIFIED_CHINESE;
-        }else if(language.equals(getString(R.string.language_rTW))){
+        }else if(language.equals("rTW")){
             config.locale = Locale.TRADITIONAL_CHINESE;
-        }else if(language.equals(getString(R.string.language_sys))){
+        }else if(language.equals("sys")){
             config.locale = Locale.getDefault();
         }
+        LogUtil.d("MainActivity"+"当前语言版本模式："+language);
         resources.updateConfiguration(config, dm);
-        PreferenceUtils.putString("language", language);
-
+        PreferenceUtils.putString("language",language);
     }
 }

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

@@ -464,7 +464,9 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         }
         if (isStartApp) {
             Intent intent = new Intent(WebViewCommActivity.this, MainActivity.class);
+           
             startActivity(intent);
+            overridePendingTransition(0,0);
         } else {
             super.onBackPressed();
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/setting/SelectLanguageActivity.java

@@ -13,8 +13,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.Filter;
-import android.widget.Filterable;
 import android.widget.TextView;
 
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -29,6 +27,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 
 import java.util.ArrayList;
@@ -50,6 +49,7 @@ public class SelectLanguageActivity extends BaseActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main_btn_submit, menu);
+        menu.findItem(R.id.btn_save).setTitle("保存");
         return true;
     }
 
@@ -58,18 +58,18 @@ public class SelectLanguageActivity extends BaseActivity {
         switch (item.getItemId()) {
             case R.id.btn_save:
                 LogUtil.d("MainActivity", "start:" + DateFormatUtil.getDateTimeStr());
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (!TextUtils.isEmpty(currentLanguage)) {
+              new Handler().postDelayed(new Runnable() {
+                  @Override
+                  public void run() {
+                      if (!TextUtils.isEmpty(currentLanguage)) {
                             switchLanguage(currentLanguage);
                             switchLanguageAction();
                         } else {
-                            switchLanguage(getString(R.string.language_rCN));
+                            switchLanguage("rCN");
                             switchLanguageAction();
                         }
-                    }
-                }).start();
+                  }
+              },10);
                 break;
             case android.R.id.home:
                 onBackPressed();
@@ -98,7 +98,7 @@ public class SelectLanguageActivity extends BaseActivity {
                 //ToastMessage();
                 final boolean flag = !mAdapter.getMdata().get(position - 1).isChecked;
                 Log.i(TAG, "onClick:" + position + " check:" + !flag);
-                currentLanguage = holder.tv_business_name.getText().toString();
+                currentLanguage = holder.tv_business_name.getHint().toString();
 
                 for (Business model : mAdapter.getMdata()) {
                     model.setIsChecked(false);
@@ -120,24 +120,38 @@ public class SelectLanguageActivity extends BaseActivity {
     }
 
     private void initData() {
+       String currentLanguage=   PreferenceUtils.getString(this, "language", "rCN");
         Business b = new Business();
         b.setName(getString(R.string.language_sys));
+        b.setCode("sys");
+        if (currentLanguage.equals("sys"))
+            b.setIsChecked(true);
         mData.add(b);
+       
         b = new Business();
+        b.setCode("rCN");
         b.setName(getString(R.string.language_rCN));
+        if (currentLanguage.equals("rCN"))
+            b.setIsChecked(true);
         mData.add(b);
         b = new Business();
+        b.setCode("rTW");
         b.setName(getString(R.string.language_rTW));
+        if (currentLanguage.equals("rTW"))
+            b.setIsChecked(true);
         mData.add(b);
         b = new Business();
         b.setName(getString(R.string.language_en));
+        b.setCode("en");
+        if (currentLanguage.equals("en"))
+            b.setIsChecked(true);
         mData.add(b);
         mAdapter = new BussinessDetailAdapter(this, mData);
         mlist.setAdapter(mAdapter);
     }
 
 
-    public class BussinessDetailAdapter extends BaseAdapter implements Filterable {
+    public class BussinessDetailAdapter extends BaseAdapter {
         private Context ct;
         private ArrayList<Business> mdata = new ArrayList<>();
         private LayoutInflater inflater;
@@ -181,23 +195,7 @@ public class SelectLanguageActivity extends BaseActivity {
             } else {
                 holder = (ViewHolder) convertView.getTag();
             }
-
-//           holder.cb_left.setOnCheckedChangeListener(new SmoothCheckBox.OnCheckedChangeListener() {
-//                @Override
-//                public void onCheckedChanged(SmoothCheckBox checkBox, boolean isChecked) {
-//                    cu_code= mdata.get(position).getCode();
-//                    cu_name=mdata.get(position).getName();
-//                    final  boolean flag = !mdata.get(position).isChecked;
-//                    Log.i(TAG, "onClick:" + position + " check:" + !flag);
-//                    for (Business model : mdata) {
-//                        model.setIsChecked(false);
-//                    }
-//
-//                    mdata.get(position-1).setIsChecked(flag);
-//                    mAdapter.notifyDataSetChanged();
-//                }
-//
-//            });
+            
             holder.cb_left.setFocusable(false);
             holder.cb_left.setEnabled(false);
             holder.cb_left.setClickable(false);
@@ -206,63 +204,16 @@ public class SelectLanguageActivity extends BaseActivity {
 
             if (!StringUtils.isEmpty(searchkeys)) {
                 holder.tv_business_name.setText(mdata.get(position).getName());
-
-                //  holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
+                holder.tv_business_name.setHint(mdata.get(position).getCode());
                 holder.tv_business_leader.setVisibility(View.GONE);
-//                CommonUtil.textSpanForStyle(holder.tv_business_name, mdata.get(position).getName(),
-//                        searchkeys, ct.getResources().getColor(R.color.yellow));
-//                CommonUtil.textSpanForStyle(holder.tv_business_leader, "负责人:"+mdata.get(position).getLeader(),
-//                        searchkeys, ct.getResources().getColor(R.color.yellow));
             } else {
                 holder.tv_business_leader.setVisibility(View.GONE);
                 holder.tv_business_name.setText(mdata.get(position).getName());
-                //holder.tv_business_leader.setText("负责人:"+mdata.get(position).getLeader());
+                holder.tv_business_name.setHint(mdata.get(position).getCode());
             }
             return convertView;
         }
-
-        @Override
-        public Filter getFilter() {
-            return new Filter() {
-                @Override
-                protected FilterResults performFiltering(CharSequence constraint) {
-                    //过滤数据
-                    FilterResults searchResults = new FilterResults();
-
-                    if (constraint == null || constraint.length() == 0) {
-
-                        searchResults.values = mData;
-                        searchResults.count = mData.size();
-                    } else {
-                        mdata = mData;
-                        ArrayList<Business> newArry = new ArrayList<Business>();
-                        for (int i = 0; i < mdata.size(); i++) {
-                            Business model = mdata.get(i);
-                            if (model.getName().contains(constraint) || model.getLeader().contains(constraint)) {
-                                newArry.add(model);
-                            }
-                        }
-
-                        searchResults.values = newArry;
-                        searchResults.count = newArry.size();
-                    }
-                    return searchResults;
-                }
-
-                @Override
-                protected void publishResults(CharSequence constraint, FilterResults results) {
-                    //装配数据
-                    mdata = (ArrayList<Business>) results.values;
-                    searchkeys = constraint.toString();
-                    if (mAdapter.getCount() == 0) {
-
-                    }
-                    notifyDataSetChanged();
-                }
-            };
-        }
-
-
+        
         class ViewHolder {
             SmoothCheckBox cb_left;
             TextView tv_business_name;
@@ -275,11 +226,9 @@ public class SelectLanguageActivity extends BaseActivity {
         Intent it = new Intent(SelectLanguageActivity.this,MainActivity.class);
         it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         startActivity(it);
-        finish();
         overridePendingTransition(0, 0);
-        LogUtil.d("MainActivity", "end:" + DateFormatUtil.getDateTimeStr());
-        System.exit(10);
-        android.os.Process.killProcess(android.os.Process.myPid());
+//        System.exit(10);
+//        android.os.Process.killProcess(android.os.Process.myPid());
     }
 
 }

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/transparent" android:state_selected="true"/>
-    <item android:drawable="@color/transparent" android:state_focused="true"/>
-    <item android:drawable="@color/actionbar_selector_color"  android:state_pressed="true"/>
+    <item android:drawable="@color/actionbar_selector_color"  android:state_pressed="true"  />
+    
     <item android:drawable="@color/transparent"/>
 </selector>