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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -1179,4 +1179,6 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         updateMsgUnReadTv();
     }
 
+
+   
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -22,7 +22,7 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 
-import com.baidu.idl.face.platform.ui.FaceVeriftyLiveActivity;
+import com.baidu.idl.face.platform.ui.FaceVeriftyActivity;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -116,11 +116,19 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.quick_sign) {
-            setSignViewData(false);
+           setSignViewData(false);
+            
         }
         return super.onOptionsItemSelected(item);
     }
 
+    public void switchLanguageAction() {
+        Intent it = new Intent("com.modular.main.MainActivity");
+        it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        startActivity(it);
+        getActivity().overridePendingTransition(0, 0);
+    }
+
     @Override
     protected int inflateLayoutId() {
         return R.layout.fragment_message;
@@ -343,7 +351,7 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
                         requestPermissions(permissions, PermissionUtil.DEFAULT_REQUEST);
                     } else {
                         if (presenter.isCanPaly()) {
-                            startActivityForResult(new Intent(ct, FaceVeriftyLiveActivity.class), 0x223);
+                            startActivityForResult(new Intent(ct, FaceVeriftyActivity.class), 0x223);
                         }
                     }
                 } else {
@@ -362,7 +370,7 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
                 ToastUtil.showToast(ct, com.uas.appworks.R.string.not_camera_permission);
             } else {
                 if (presenter.isCanPaly()) {
-                    startActivityForResult(new Intent(ct, FaceVeriftyLiveActivity.class), 0x223);
+                    startActivityForResult(new Intent(ct, FaceVeriftyActivity.class), 0x223);
                 }
             }
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MucChatActivity.java

@@ -34,6 +34,7 @@ import com.common.ui.CameraUtil;
 import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.base.SupportToolBarActivity;
+import com.core.base.view.AndroidBug5497Workaround;
 import com.core.broadcast.MsgBroadcast;
 import com.core.model.Friend;
 import com.core.model.User;
@@ -118,6 +119,7 @@ public class MucChatActivity extends SupportToolBarActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.chat);
+        AndroidBug5497Workaround.assistActivity(this);
         Bundle bundle = null;
         if (savedInstanceState != null) {
             bundle = savedInstanceState;

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

@@ -16,7 +16,7 @@
     <com.core.widget.view.oacalender.CalenderView
         android:id="@+id/calender"
         android:layout_width="match_parent"
-        android:layout_height="230dp" />
+        android:layout_height="240dp" />
 
     <FrameLayout
         android:layout_width="match_parent"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Jul 05 10:10:46 CST 2018
-debugName=502
+#Fri Jul 13 14:41:57 CST 2018
+debugName=517
 versionName=636
-debugCode=502
+debugCode=517
 versionCode=177

app_core/common/src/main/java/com/core/base/BaseActivity.java

@@ -28,6 +28,7 @@ import com.core.app.ActionBackActivity;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.net.volley.FastVolley;
+import com.core.utils.CommonUtil;
 import com.core.utils.NotifyUtils;
 import com.core.utils.ToastUtil;
 import com.core.widget.CustomProgressDialog;
@@ -98,14 +99,13 @@ public abstract class BaseActivity extends ActionBackActivity {
 
         //重启之后恢复到之前的语言
         switchLanguage(PreferenceUtils.getString(this, "language", "rCN"));
-
+      
+        initFontScale(CommonUtil.getSharedPreferencesInt(MyApplication.getInstance(),"font_scale",0));
         // SystemUtil.setSystemBarTint(this);
 
     }
 
 
-
-
     private void initStyle() {
         if (getIntent() == null || getIntent().getIntExtra("style", -1) == -1) return;
         try {
@@ -200,10 +200,7 @@ public abstract class BaseActivity extends ActionBackActivity {
     }
 
 
-    /**
-     * @desc:切换语言
-     * @author：Arison on 2017/5/18
-     */
+
     protected void switchLanguage(String language) {
         Resources resources = getResources();
         Configuration config = resources.getConfiguration();
@@ -222,6 +219,34 @@ public abstract class BaseActivity extends ActionBackActivity {
         PreferenceUtils.putString("language", language);
     }
 
+   public void initFontScale(int i) {
+       Configuration configuration = getResources().getConfiguration();
+        switch (i){
+            case 0:
+                configuration.fontScale = 1;
+                break;
+            case 2:
+                configuration.fontScale = 1.15f;
+                break;
+            case 3:
+                configuration.fontScale = 1.2f;
+                break;
+            case 4:
+                configuration.fontScale =1.25f;
+                break;
+            case 5:
+                configuration.fontScale = 1.3f;
+                break;
+            case 6:
+                configuration.fontScale =1.35f;
+                break;
+        }
+        //0.85 小, 1 标准大小, 1.15 大，1.3 超大 ，1.45 特大 
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        metrics.scaledDensity = configuration.fontScale * metrics.density;
+        getBaseContext().getResources().updateConfiguration(configuration, metrics);
+    }
 
     /*处理权限问题*/
     private SparseArray<Runnable> allowablePermissionRunnables;

app_core/common/src/main/java/com/core/model/OAConfig.java

@@ -24,7 +24,7 @@ public class OAConfig {
     public static int overlatetime = 0; //严重迟到时间
     public static int latetime = 0;    //迟到时间(在该时间内不算迟到)
     public static int nonclass = 90;   //矿工时间
-    public static boolean needValidateFace = true;   //是否需要人脸识别打卡
+    public static boolean needValidateFace = false;   //是否需要人脸识别打卡
     public static String days = "1,2,3,4,5";
     public static String name = "默认班次";
 

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -95,25 +95,15 @@ public class CommonUtil {
 
     private final static String AppShareName = "setting";
     public static int counter = 0;
-
-    /**
-     * @desc:获取erp的根路径
-     * @author：Administrator on 2016/2/18 15:12
-     */
+    
     public static String getAppBaseUrl(Context ct) {
         if (ct == null) {
-            return "";
+            ct=MyApplication.getInstance();
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-//        if (BaseConfig.isDebug()){
-//            baseUrl="http://192.168.253.35:8080/ERP/";
-//        }
-//        baseUrl = "http://192.168.253.41:8080/ERP/";
-
         return baseUrl;
     }
-
-    //获取报表的根路径
+    
     public static String getReportUrl(Context ct) {
         if (ct == null) {
             return "";
@@ -131,7 +121,6 @@ public class CommonUtil {
      * @param context
      * @return
      */
-
     public static String getAccountToken(Context context) {
         if (context == null) {
             return "";

app_core/common/src/main/res/layout/activity_setting.xml

@@ -531,6 +531,40 @@
             </RelativeLayout>
 
 
+            <RelativeLayout
+                android:id="@+id/font_us_rl"
+                style="@style/commonSettingItem">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/font_size"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/commonSettingItemTextSize" />
+
+                <TextView
+                    android:id="@+id/tv_font_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignTop="@+id/tv_oa"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip" />
+
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/language_us_rl"
                 style="@style/commonSettingItem"

app_core/common/src/main/res/layout/fragment_me.xml

@@ -284,10 +284,11 @@
             <TextView
                 android:id="@+id/company_tv"
                 style="@style/IMTbleLine_TextValue"
+                android:textStyle="bold"
                 android:layout_toLeftOf="@+id/company_arrow_img"
                 android:layout_toRightOf="@+id/company_text"
                 android:textColor="#999999"
-                android:textSize="12sp" />
+                android:textSize="14sp" />
 
             <ImageView
                 android:id="@+id/company_arrow_img"
@@ -329,10 +330,11 @@
             <TextView
                 android:id="@+id/master_tv"
                 style="@style/IMTbleLine_TextValue"
+                android:textStyle="bold"
                 android:layout_toLeftOf="@+id/master_arrow_img"
                 android:layout_toRightOf="@+id/master_text"
                 android:textColor="#999999"
-                android:textSize="12sp" />
+                android:textSize="14sp" />
 
             <ImageView
                 android:id="@+id/master_arrow_img"

app_core/common/src/main/res/values-en/strings.xml

@@ -1638,4 +1638,5 @@
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
     <string name="str_common_empty_text">暂无记录</string>
     <string name="str_system_admin">系统管理员</string>
+    <string name="font_size">字体大小</string>
 </resources>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -1688,4 +1688,5 @@
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
     <string name="str_common_empty_text">暂无记录</string>
     <string name="str_system_admin">系统管理员</string>
+    <string name="font_size">字体大小</string>
 </resources>

app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -1750,6 +1750,7 @@
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
     <string name="str_common_empty_text">暂无记录</string>
     <string name="str_system_admin">系统管理员</string>
+    <string name="font_size">字体大小</string>
     <!--end s商家设置-->
 
 </resources>

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

@@ -2035,5 +2035,6 @@
     <string name="host_null_please_login_retry">站点地址获取失败，请重新登录后重试</string>
     <string name="str_common_empty_text">暂无记录</string>
     <string name="str_system_admin">系统管理员</string>
+    <string name="font_size">字体大小</string>
     <!--end s商家设置-->
 </resources>

app_core/network/src/main/java/com/me/network/app/http/impl/RetrofitImpl.java

@@ -1,6 +1,8 @@
 package com.me.network.app.http.impl;
 
 
+import android.text.TextUtils;
+
 import com.google.gson.Gson;
 import com.me.network.app.http.HttpBase;
 import com.me.network.app.http.HttpClient;
@@ -108,15 +110,18 @@ public class RetrofitImpl extends HttpBase {
                     new CacheInterceptor(String.valueOf(mbuilder.getCacheTime()), mbuilder.getCacheType()));
         }
 
-        mOkHttpClient = mOkBuilder.build();
-        retrofit = new Retrofit.Builder().client(mOkHttpClient)
-                .baseUrl(mbuilder.getBaseUrl())
-                .addConverterFactory(StringConverterFactory.create())
-                .addConverterFactory(GsonConverterFactory.create(new Gson()))
-                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-                .build();
-
-        paramService = initApi(ParamService.class);
+        
+        if (!TextUtils.isEmpty(mbuilder.getBaseUrl())) {
+            mOkHttpClient = mOkBuilder.build();
+            retrofit = new Retrofit.Builder().client(mOkHttpClient)
+                    .baseUrl(mbuilder.getBaseUrl())
+                    .addConverterFactory(StringConverterFactory.create())
+                    .addConverterFactory(GsonConverterFactory.create(new Gson()))
+                    .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                    .build();
+
+            paramService = initApi(ParamService.class);
+        }
     }
 
     public <T> T initApi(Class<T> service) {

app_modular/appme/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.uas.appme"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.uas.appme">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -9,7 +9,6 @@
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
-
         android:supportsRtl="true">
         <activity
             android:name=".pedometer.view.NewStepActivity"
@@ -117,9 +116,18 @@
         <activity
             android:name=".settings.activity.FindWagePWActivity"
             android:label="@string/change_qpw" />
-        <!--  <activity android:name=".settings.activity.PayTestActivity"></activity>-->
+        <!-- <activity android:name=".settings.activity.PayTestActivity"></activity> -->
 
         <activity android:name=".settings.activity.SystemAdminActivity" />
+        <activity android:name=".settings.activity.FontSizeActivity"
+            android:launchMode="singleTask">
+
+            <intent-filter>
+                <action android:name="com.uas.appme.settings.activity.FontSizeActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            
+        </activity>
     </application>
 
 </manifest>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FontSizeActivity.java

@@ -0,0 +1,92 @@
+package com.uas.appme.settings.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.common.LogUtil;
+import com.core.app.MyApplication;
+import com.core.base.SupportToolBarActivity;
+import com.core.utils.CommonUtil;
+import com.uas.appme.R;
+import com.uas.appme.widget.SetTextSizeView;
+
+public class FontSizeActivity extends SupportToolBarActivity {
+    private static final String TAG = "FontSizeActivity";
+    SetTextSizeView  seek_font;
+    Boolean isClickSeek=false;//是否点击了调节字体大小
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_font_size);
+        LogUtil.d(TAG,"onCreate()");
+        isClickSeek=getIntent().getBooleanExtra("isClickSeek",false);
+        seek_font=findViewById(R.id.seek_font);
+        seek_font.setDefaultPosition(CommonUtil.getSharedPreferencesInt(MyApplication.getInstance(),"font_scale",0));
+        seek_font.setOnPointResultListener(new SetTextSizeView.OnPointResultListener() {
+            @Override
+            public void onPointResult(int position) {
+                isClickSeek=true;
+                CommonUtil.setSharedPreferences(FontSizeActivity.this, "font_scale", position);
+                switch (position) {
+                    case 0:
+                        initFontScale(position);
+                        switchSettingAction();
+                        break;
+                    case 1:
+                        initFontScale(position);
+                        switchSettingAction();
+                        break;
+                    case 2:
+                        initFontScale(position);
+                        switchSettingAction();
+                        break;
+                    case 3:
+                        initFontScale(position);
+                        switchSettingAction();
+                        break;
+                    case 4:
+                        initFontScale(position);
+                        switchSettingAction();
+                        break;
+                    case 5:
+                        initFontScale(position);
+                        switchSettingAction();
+                        break;
+                    case 6:
+                        initFontScale(position);
+                        switchSettingAction();
+                        break;
+
+                }
+            }
+        });
+    }
+
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        LogUtil.d(TAG,"onNewIntent()");
+    }
+
+    public void switchSettingAction() {
+        Intent it = new Intent("com.uas.appme.settings.activity.FontSizeActivity");
+        it.putExtra("isClickSeek",isClickSeek);
+        it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        it.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+        startActivity(it);
+        overridePendingTransition(0, 0);
+    }
+    
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        LogUtil.d(TAG,"isClickSeek:"+isClickSeek);
+        if (isClickSeek){
+            Intent it = new Intent("com.modular.main.MainActivity");
+            it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            startActivity(it);
+            overridePendingTransition(0, 0);
+        }
+    }
+}

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SelectLanguageActivity.java

@@ -34,6 +34,15 @@ public class SelectLanguageActivity extends SupportToolBarActivity {
     private ArrayList<Business> mData = new ArrayList<Business>();
     private String currentLanguage;
 
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_select_language);
+        ViewUtils.inject(this);
+        initView();
+        initData();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main_btn_submit, menu);
@@ -57,15 +66,6 @@ public class SelectLanguageActivity extends SupportToolBarActivity {
         return true;
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_select_language);
-        ViewUtils.inject(this);
-        initView();
-        initData();
-    }
-
     private void initView() {
         mlist = (PullToRefreshListView) findViewById(R.id.list_business);
         mlist.setMode(PullToRefreshBase.Mode.DISABLED);
@@ -203,8 +203,6 @@ public class SelectLanguageActivity extends SupportToolBarActivity {
         it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         startActivity(it);
         overridePendingTransition(0, 0);
-        //       System.exit(10);
-//        android.os.Process.killProcess(android.os.Process.myPid());
     }
 
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -27,8 +27,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.afollestad.materialdialogs.GravityEnum;
-import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.baidu.android.pushservice.PushManager;
 import com.baidu.autoupdatesdk.AppUpdateInfo;
@@ -114,6 +112,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
     private PopupWindow setWindow = null;//
     private RelativeLayout businessmen_setting_rl;
     private TextView bsettingRed;
+    private RelativeLayout font_us_rl;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -125,6 +124,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
 
 
     private void initView() {
+        font_us_rl=findViewById(R.id.font_us_rl);
         uas_website_tv = (TextView) findViewById(R.id.uas_website_tv);
         tv_menu_setting = (TextView) findViewById(R.id.tv_menu_setting);
         cb_task_reply = (SwitchView) findViewById(R.id.cb_task_reply);
@@ -251,6 +251,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
                 }
             }
         });
+        
         new_step_rl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -282,6 +283,14 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
 //        UserRoleUtils.checkUserRole(this,getRootView());
 
         doShowBSettingJudge();  //判断商家是不是管理员
+
+
+        font_us_rl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startActivity(new Intent(SettingActivity.this,FontSizeActivity.class));
+            }
+        });
     }
 
     private void doShowBSettingJudge() {
@@ -352,38 +361,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         startActivity(new Intent("com.modular.main.MainActivity"));
         super.onBackPressed();
     }
-
-    private void showExitDialog() {
-        new MaterialDialog.Builder(this)
-                .title(R.string.app_name)
-                .titleGravity(GravityEnum.CENTER)
-
-                .content(R.string.exit_tips)
-                .positiveText(R.string.common_sure)
-                .positiveColorRes(R.color.white)
-                .btnSelector(R.drawable.btn_dialog_selector)
-                .btnStackedGravity(GravityEnum.CENTER)
-                .itemsGravity(GravityEnum.CENTER)
-                .buttonsGravity(GravityEnum.CENTER)
-                .negativeText(R.string.common_cancel)
-                .negativeColorRes(R.color.white)
-                .show();
-
-//        new AlertDialog.Builder(mContext)
-//                .setTitle(R.string.app_name)
-//                .setMessage(R.string.exit_tips)
-//                .setNegativeButton(R.string.common_cancel, null)
-//                .setPositiveButton(R.string.common_sure, new DialogInterface.OnClickListener() {
-//                    @Override
-//                    public void onClick(DialogInterface dialog, int which) {
-//                        UserSp.getInstance(mContext).clearUserInfo();
-//                        ViewUtil.clearAccount(mContext);
-//                        LoginHelper.broadcastLogout(mContext);
-//                        SettingActivity.this.finish();
-//
-//                    }
-//                }).create().show();
-    }
+    
 
 
     @Override

app_modular/appme/src/main/java/com/uas/appme/widget/SetTextSizeView.java

@@ -0,0 +1,269 @@
+package com.uas.appme.widget;
+
+/**
+ * Created by Arison on 2018/7/12.
+ */
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.uas.appme.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class SetTextSizeView extends View {
+    private int defaultLineColor = Color.rgb(33, 33, 33);
+    private int defaultLineWidth;
+    private int defaultMax = 5;
+    private int defaultCircleColor = Color.WHITE;
+    private int defaultCircleRadius;
+    private int defaultPosition = 1;
+
+    // 一共有多少格
+    private int max = 5;
+    // 线条颜色
+    private int lineColor;
+    // 线条粗细
+    private int lineWidth;
+    // 突出部分的线条高度
+    private int lineHeight;
+    // 圆半径
+    private int circleRadius;
+    private int circleColor;
+    // 一段的宽度，根据总宽度和总格数计算得来
+    private int itemWidth;
+    // 控件的宽高
+    private int height;
+    private int width;
+    // 当前所在位置
+    private int currentProgress = defaultPosition;
+    // 画笔
+    private Paint mLinePaint;
+    private Paint mCirclePaint;
+    // 滑动过程中x坐标
+    private float currentX = 0;
+    // 有效数据点
+    private List<Point> points = new ArrayList<>();
+
+    private float circleX;
+    private float circleY;
+
+    public SetTextSizeView(Context context) {
+        this(context, null);
+    }
+
+    public SetTextSizeView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        // initDefault
+        defaultLineWidth = dp2px(context, 0.5f);
+        defaultCircleRadius = dp2px(context, 35);
+
+        lineColor = Color.rgb(33, 33, 33);
+        lineWidth = dp2px(context, 0.5f);
+        circleColor = Color.WHITE;
+
+        // initCustomAttrs
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.SetTextSizeView);
+        final int N = typedArray.getIndexCount();
+        for (int i = 0; i < N; i++) {
+            initCustomAttr(typedArray.getIndex(i), typedArray);
+        }
+        typedArray.recycle();
+
+        // 初始化画笔
+        mLinePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mLinePaint.setColor(lineColor);
+        mLinePaint.setStyle(Paint.Style.FILL_AND_STROKE);
+        mLinePaint.setStrokeWidth(lineWidth);
+
+        mCirclePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mCirclePaint.setColor(circleColor);
+        mCirclePaint.setStyle(Paint.Style.FILL);
+        // 设置阴影效果
+        setLayerType(LAYER_TYPE_SOFTWARE, null);
+        mCirclePaint.setShadowLayer(15, 0, 0, Color.rgb(33, 33, 33));
+    }
+
+    private void initCustomAttr(int attr, TypedArray typedArray) {
+        if (attr == R.styleable.SetTextSizeView_lineColor) {
+            lineColor = typedArray.getColor(attr, defaultLineColor);
+        } else if (attr == R.styleable.SetTextSizeView_circleColor) {
+            circleColor = typedArray.getColor(attr, defaultCircleColor);
+        } else if (attr == R.styleable.SetTextSizeView_SetTextlineWidth) {
+            lineWidth = typedArray.getDimensionPixelSize(attr, defaultLineWidth);
+        } else if (attr == R.styleable.SetTextSizeView_circleRadius) {
+            circleRadius = typedArray.getDimensionPixelSize(attr, defaultCircleRadius);
+        } else if (attr == R.styleable.SetTextSizeView_totalCount) {
+            max = typedArray.getInteger(attr, defaultMax);
+        }
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        height = h;
+        width = w;
+        circleY = height / 2;
+        lineHeight = height / 6;
+        // 横线宽度是总宽度-2个圆的半径
+        itemWidth = (w - 2 * circleRadius) / max;
+        // 把可点击点保存起来
+        for (int i = 0; i <= max; i++) {
+            points.add(new Point(circleRadius + i * itemWidth, height / 2));
+        }
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        // 先画中间的横线
+        canvas.drawLine(points.get(0).x, height / 2, points.get(points.size() - 1).x, height / 2, mLinePaint);
+        // 绘制刻度
+        for (Point point : points) {
+            canvas.drawLine(point.x, height / 2 - lineHeight, point.x, height / 2 + lineHeight, mLinePaint);
+        }
+        // 画圆
+        if (canMove) {
+            // 随手指滑动过程
+            if (currentX < circleRadius) {
+                currentX = circleRadius;
+            }
+            if (currentX > width - circleRadius) {
+                currentX = width - circleRadius;
+            }
+            circleX = currentX;
+        } else {
+            // 最终
+            circleX = points.get(currentProgress).x;
+        }
+        // 实体圆
+        canvas.drawCircle(circleX, circleY, circleRadius, mCirclePaint);
+    }
+
+    float downX = 0;
+    private boolean canMove = false;
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        // 过滤掉不合法的坐标
+//        if (event.getX() < circleRadius || event.getX() > width - circleRadius) {
+//            return false;
+//        }
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                // 判断是否是数据点
+                downX = event.getX();
+                canMove = isDownOnCircle(downX);
+                break;
+            case MotionEvent.ACTION_MOVE:
+                if (canMove) {
+                    currentX = event.getX();
+                    invalidate();
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+                // 手指抬起之后就圆就不能在非有效点
+                currentX = 0;
+                float upX = event.getX();
+                if (canMove) {
+                    // 是滑动过来的，要判断距离哪个有效点最近，就滑动到哪个点
+                    Point targetPoint = getNearestPoint(upX);
+                    if (targetPoint != null) {
+                        invalidate();
+                    }
+                } else {
+                    if (Math.abs(downX - upX) < 30) {
+                        Point point = isValidPoint(upX);
+                        if (point != null) {
+                            invalidate();
+                        }
+                    }
+                }
+                if (onPointResultListener != null) {
+                    onPointResultListener.onPointResult(currentProgress);
+                }
+                downX = 0;
+                canMove = false;
+                break;
+        }
+        return true;
+    }
+
+    /**
+     * 滑动抬起之后，要滑动到最近的一个点那里
+     *
+     * @param x
+     * @return
+     */
+    private Point getNearestPoint(float x) {
+        for (int i = 0; i < points.size(); i++) {
+            Point point = points.get(i);
+            if (Math.abs(point.x - x) < itemWidth / 2) {
+                currentProgress = i;
+                return point;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 判断是否点击到圆上
+     *
+     * @param x
+     * @return
+     */
+    private boolean isDownOnCircle(float x) {
+        return Math.abs(points.get(currentProgress).x - x) < circleRadius;
+    }
+
+    /**
+     * 判断是否是有效的点击点
+     *
+     * @param x
+     */
+    private Point isValidPoint(float x) {
+        for (int i = 0; i < points.size(); i++) {
+            Point point = points.get(i);
+            if (Math.abs(point.x - x) < 30) {
+                currentProgress = i;
+                return point;
+            }
+        }
+        return null;
+    }
+
+    public void setOnPointResultListener(OnPointResultListener onPointResultListener) {
+        this.onPointResultListener = onPointResultListener;
+    }
+
+    private OnPointResultListener onPointResultListener;
+
+    public interface OnPointResultListener {
+        void onPointResult(int position);
+    }
+
+    public static int dp2px(Context context, float dipValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dipValue * scale + 0.5f);
+    }
+
+   
+
+    public void setDefaultPosition(int defaultPosition) {
+        this.currentProgress = defaultPosition;
+        requestLayout();
+    }
+}

app_modular/appme/src/main/res/layout/activity_font_size.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.uas.appme.settings.activity.FontSizeActivity">
+
+
+    <com.uas.appme.widget.SetTextSizeView
+        android:id="@+id/seek_font"
+        android:layout_width="match_parent"
+        app:totalCount="6"
+        android:background="@android:color/white"
+        android:layout_marginTop="30dp"
+        app:lineColor="@android:color/black"
+        app:circleColor="@android:color/white"
+        app:circleRadius="12dp"
+        app:SetTextlineWidth="0.1dp"
+        android:layout_height="35dp" />
+</LinearLayout>

app_modular/appme/src/main/res/values/attrs.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <!--设置字体大小控件-->
+    <declare-styleable name="SetTextSizeView">
+        <attr name="SetTextlineWidth" format="dimension|reference" />
+        <attr name="lineColor" format="color|reference" />
+        <attr name="totalCount" format="integer" />
+        <attr name="circleColor" format="color|reference" />
+        <attr name="circleRadius" format="dimension|reference" />
+    </declare-styleable>
+    
+    
     <declare-styleable name="StickyListHeadersListView">
         <attr name="stickyListHeadersListViewStyle" format="reference"/>
 

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/ApprovaPresenter.java

@@ -1621,8 +1621,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
         approvals.addAll(enclosureList);
         approvals.addAll(pointsList);
         approvals.addAll(nodeList);
-        LogUtil.i("gong", "setData2ListThread=" + approvals.size());
-
         OAHttpHelper.getInstance().post(new Runnable() {
             @Override
             public void run() {

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/SaveMeetActivity.java

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.base.BaseActivity;
+import com.core.base.view.AndroidBug5497Workaround;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonInterface;
@@ -181,6 +182,7 @@ public class SaveMeetActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_save_meet);
+        AndroidBug5497Workaround.assistActivity(this);
         ViewUtils.inject(this);
         bean = getIntent().getParcelableExtra("data");
         initIDs();

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/WorkActivity.java

@@ -21,7 +21,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.baidu.idl.face.platform.ui.FaceVeriftyLiveActivity;
+import com.baidu.idl.face.platform.ui.FaceVeriftyActivity;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.PoiInfo;
 import com.common.data.CalendarUtil;
@@ -277,7 +277,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
                     requestPermission(Manifest.permission.CAMERA, new Runnable() {
                         @Override
                         public void run() {
-                            startActivityForResult(new Intent(ct, FaceVeriftyLiveActivity.class), 0x223);
+                            startActivityForResult(new Intent(ct, FaceVeriftyActivity.class), 0x223);
                         }
                     }, new Runnable() {
                         @Override

app_modular/faceplatform-ui/src/main/java/com/baidu/idl/face/platform/ui/FaceVeriftyActivity.java

@@ -19,7 +19,7 @@ import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultSubscriber;
 
-public class FaceVeriftyActivity extends  FaceDetectActivity{
+public class FaceVeriftyActivity extends FaceDetectActivity {
 
     @Override
     protected String getBaseUrl() {
@@ -98,6 +98,7 @@ public class FaceVeriftyActivity extends  FaceDetectActivity{
     private void showErrorDialog(String result) {
         String message = "";
         if (result.contains("liveness check fail")) {
+            errIndex++;
             message = "不能拿照片骗我哦";
         } else {
             message = result;
@@ -119,6 +120,8 @@ public class FaceVeriftyActivity extends  FaceDetectActivity{
                 });
     }
 
+    private int errIndex = 0;
+
     /**
      * 校验身份
      *
@@ -131,6 +134,11 @@ public class FaceVeriftyActivity extends  FaceDetectActivity{
         FaceConfig.loadToken(new FaceConfig.FaceTokenListener() {
             @Override
             public void callBack(String accessToken) {
+                String liveness_control = "HIGH";
+                if (errIndex >= 2) {
+                    liveness_control = "LOW";
+                }
+
                 LogUtil.i("gong", "accessToken=" + accessToken);
                 httpClient.Api().send(new HttpClient.Builder()
                         .url("rest/2.0/face/v3/search")
@@ -138,7 +146,7 @@ public class FaceVeriftyActivity extends  FaceDetectActivity{
                         .header("Content-Type", "application/json")
                         .add("image", faceBase64)
                         .add("image_type", "BASE64")
-                        .add("liveness_control", "HIGH")//NORMAL
+                        .add("liveness_control", liveness_control)//NORMAL
                         .add("user_id", user_id)
                         .isDebug(true)
                         .add("group_id_list", group_id_list)
@@ -207,7 +215,7 @@ public class FaceVeriftyActivity extends  FaceDetectActivity{
                         .header("Content-Type", "application/json")
                         .add("image", faceBase64)
                         .add("image_type", "BASE64")
-                        .add("quality_control", "HIGH")
+                        .add("quality_control", "NORMAL")
                         .add("liveness_control", "NORMAL")
                         .add("user_id", user_id)
                         .add("user_info", user_info)

app_modular/faceplatform-ui/src/main/java/com/baidu/idl/face/platform/ui/model/FaceVerify.java

@@ -1,7 +1,7 @@
 package com.baidu.idl.face.platform.ui.model;
 
 public class FaceVerify {
-    private final int SCORE_PASS = 85;
+    private final int SCORE_PASS = 80;
 
     private String mpbBase64;
     private String userId;