功能开发:1、关于我们接口切换v2；2、登录页面的fragment切换逻辑修复；3、导航栏左上角返回键的监听处理错误的写法。

app/src/main/AndroidManifest.xml

@@ -251,7 +251,6 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustPan|stateHidden">
             <intent-filter android:autoVerify="true">
-
                 <!-- 协议部分，随便设置 -->
                 <data
                     android:host="small.kfzs.com"
@@ -396,9 +395,6 @@
             android:hardwareAccelerated="false"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme" /> <!-- <provider -->
-        <!-- android:name="com.kfzs.duanduan.data.graph.provider.KFZSProvider" -->
-        <!-- android:authorities="com.kfzs.duanduan.data.graph.provider.${DUANDUAN_GRAPH}" -->
-        <!-- android:exported="true" /> -->
         <receiver android:name="com.sheep.gamegroup.receiver.AppAddOrDelReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_ADDED" />
@@ -409,15 +405,6 @@
             </intent-filter>
         </receiver>
 
-        <!--        <activity-->
-        <!--            android:name="com.tencent.sample.wxapi.WXEntryActivity"-->
-        <!--            android:label="@string/app_name"-->
-        <!--            android:theme="@android:style/Theme.Translucent.NoTitleBar"-->
-        <!--            android:exported="true"-->
-        <!--            android:taskAffinity="${applicationId}"-->
-        <!--            android:launchMode="singleTask">-->
-        <!--        </activity>-->
-
         <activity
             android:name="com.tencent.tauth.AuthActivity"
             android:launchMode="singleTask"

app/src/main/java/com/sheep/gamegroup/gaiban/mainpage/findgame/FindGameFragment.java

@@ -6,6 +6,7 @@ import androidx.fragment.app.FragmentTransaction;
 
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
@@ -24,8 +25,8 @@ public class FindGameFragment extends BaseFragment {
         contentFragment = (BaseFragment) getChildFragmentManager().findFragmentByTag("fragment_content");
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
         if (contentFragment == null) {
-//            contentFragment = ViewUtil.newWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_APP_HOME)).hideProgress());
-            contentFragment = ViewUtil.newWebFragment(new WebParams("http://10.8.200.228:8082/#/game-center").hideProgress());
+            contentFragment = ViewUtil.newWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_GAME_CENTER)).hideProgress());
+//            contentFragment = ViewUtil.newWebFragment(new WebParams("http://10.8.200.228:8082/#/game-center").hideProgress());
             transaction.add(R.id.frame_container, contentFragment, "fragment_content").show(contentFragment);
         } else {
             transaction.show(contentFragment);

app/src/main/java/com/sheep/gamegroup/gaiban/mainpage/fuli/FuliFragment.java

@@ -6,6 +6,7 @@ import androidx.fragment.app.FragmentTransaction;
 
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
@@ -24,8 +25,8 @@ public class FuliFragment extends BaseFragment {
         contentFragment = (BaseFragment) getChildFragmentManager().findFragmentByTag("fragment_content");
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
         if (contentFragment == null) {
-//            contentFragment = ViewUtil.newWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_APP_HOME)).hideProgress());
-            contentFragment = ViewUtil.newWebFragment(new WebParams("http://10.8.200.228:8082/#/welfare-center").hideProgress());
+            contentFragment = ViewUtil.newWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME)).hideProgress());
+//            contentFragment = ViewUtil.newWebFragment(new WebParams("http://10.8.200.228:8082/#/welfare-center").hideProgress());
             transaction.add(R.id.frame_container, contentFragment, "fragment_content").show(contentFragment);
         } else {
             transaction.show(contentFragment);

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -764,7 +764,7 @@ public interface ApiService {
     /**
      * 关于我们
      */
-    @GET("v1/app/about_us/new_about_us")
+    @GET("v2/app/about_us/new_about_us")
     Observable<BaseMessage> getNewAboutUs();
 
     /**
@@ -1864,7 +1864,7 @@ public interface ApiService {
      * id * integer (path) 游戏组ID
      * 返回 GameGroup
      */
-    @GET("http://10.8.200.244:8080/v1/app/game_group/{id}")
+    @GET("v1/app/game_group/{id}")
     Observable<BaseMessage> getGameGroupById(@Path("id") int id);
 
     /**
@@ -1950,7 +1950,7 @@ public interface ApiService {
     @GET("v1/app/user/check_authorization")
     Observable<BaseMessage> checkAuth(@Query("Authorization") String token, @Query("game_id") String game_id, @Query("wlan") String wlan, @Query("auto_login") int autoLogin, @Query("face_url") String face_url);
 
-    @GET("http://10.8.200.244:8080/v2/app/search")
+    @GET("v2/app/search")
     Observable<BaseMessage> search(@Query("keyword") String keyword, @Query("game_count") int gameCount, @Query("task_count") int taskCount, @Query("gift_count") int giftCount, @Query("article_count") int articleCount, @Query("goods_count") int goodsCount, @Query("role_count") int roleCount);
 
     @GET("v1/app/search/keywords")

app/src/main/java/com/sheep/gamegroup/module/home/fragment/HomeWrapperFragment.java

@@ -6,6 +6,7 @@ import androidx.fragment.app.FragmentTransaction;
 
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
@@ -24,8 +25,8 @@ public class HomeWrapperFragment extends BaseFragment {
         contentFragment = (BaseFragment) getChildFragmentManager().findFragmentByTag("fragment_content");
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
         if (contentFragment == null) {
-//            contentFragment = ViewUtil.newWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_APP_HOME)).hideProgress());
-            contentFragment = ViewUtil.newWebFragment(new WebParams("http://10.8.200.228:8082/#/home").hideProgress());
+            contentFragment = ViewUtil.newWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_APP_HOME)).hideProgress());
+//            contentFragment = ViewUtil.newWebFragment(new WebParams("http://10.8.200.228:8082/#/home").hideProgress());
             transaction.add(R.id.frame_container, contentFragment, "fragment_content").show(contentFragment);
         } else {
             transaction.show(contentFragment);

app/src/main/java/com/sheep/gamegroup/module/login/LoginAct.java

@@ -156,7 +156,7 @@ public class LoginAct extends BaseUMActivity implements LoginController {
     @Override
     public void whenToLogin(int platform) {
         SignInFgt signInFragment = SignInFgt.newInstance(this, platform);
-        showFragment("登录", signInFragment);
+        showFragment("登录", signInFragment, false);
     }
 
     @Override
@@ -227,7 +227,7 @@ public class LoginAct extends BaseUMActivity implements LoginController {
 
     private void goEditUserInfo(LoginEntity entity) {
         EditUserInfoFgt editUserInfoFgt = EditUserInfoFgt.newInstance(entity, this);
-        showFragment("填写基本资料", editUserInfoFgt);
+        showFragment("填写基本资料", editUserInfoFgt, false);
     }
 
     @Override
@@ -239,10 +239,8 @@ public class LoginAct extends BaseUMActivity implements LoginController {
     }
 
     private void goMain(LoginEntity entity) {
-
         CertificationUtil.newInstance().addCurUserToSdkLoginUser(entity.getToken(), entity.getUser());
         if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
-//            showProgress();
             Jump2View.getInstance().checkOrGoHomePage(this);
         } else {
             CertificationUtil.newInstance().authCertificationCode(this, entity.getToken(), null);
@@ -252,22 +250,22 @@ public class LoginAct extends BaseUMActivity implements LoginController {
     @Override
     public void whenToRegister() {
         SignUpFgt signUpFragment = SignUpFgt.newInstance(this);
-        showFragment("注册", signUpFragment);
+        showFragment("注册", signUpFragment, false);
     }
 
     @Override
     public void whenGoFindAccount() {
         FindAccountFgt findAccountFgt = FindAccountFgt.newInstance(this);
-        showFragment("登录遇到问题", findAccountFgt);
+        showFragment("登录遇到问题", findAccountFgt, true);
     }
 
     @Override
     public void whenGoValidCaptcha(String phoneNum) {
         ValidCaptchaFgt validCaptchaFgt = ValidCaptchaFgt.newInstance(phoneNum, this);
-        showFragment("输入验证码", validCaptchaFgt);
+        showFragment("输入验证码", validCaptchaFgt, true);
     }
 
-    private void showFragment(String tag, Fragment fragment) {
+    private void showFragment(String tag, Fragment fragment, boolean canPop) {
         if (getSupportActionBar() != null) {
             if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
                 getSupportActionBar().show();
@@ -284,8 +282,8 @@ public class LoginAct extends BaseUMActivity implements LoginController {
         transaction.replace(R.id.fragment_container, fragment, tag);
         transaction.show(fragment);
         transaction.addToBackStack(null);
-        transaction.commitAllowingStateLoss();
         titleStack.push(tag);
+        transaction.commitAllowingStateLoss();
     }
 
     private Fragment getLastFragment() {

app/src/main/java/com/sheep/gamegroup/module/login/fragments/FindAccountFgt.java

@@ -1,27 +1,22 @@
 package com.sheep.gamegroup.module.login.fragments;
 
 
-import androidx.fragment.app.Fragment;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.view.KeyEvent;
 import android.view.View;
-import android.widget.EditText;
-import android.widget.ImageView;
+
+import androidx.fragment.app.Fragment;
 
 import com.sheep.gamegroup.module.login.controller.LoginController;
-import com.sheep.gamegroup.util.KeyEventUtil;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.filter.InputFilterUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+import com.sheep.jiuyan.samllsheep.databinding.FragmentFindAccountBinding;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
-import butterknife.BindView;
-import butterknife.OnClick;
-
 /**
  * A simple {@link Fragment} subclass.
  */
@@ -29,12 +24,6 @@ public class FindAccountFgt extends BaseFragment {
 
     private LoginController mController;
 
-    @BindView(R.id.phone_number_box)
-    EditText phoneNumberBox;
-    @BindView(R.id.text_delete_btn)
-    ImageView textDeleteBtn;
-    @BindView(R.id.iv_back)
-    ImageView ibBack;
     public FindAccountFgt() {
         // Required empty public constructor
     }
@@ -50,10 +39,18 @@ public class FindAccountFgt extends BaseFragment {
         return R.layout.fragment_find_account;
     }
 
+    FragmentFindAccountBinding binding;
+
     @Override
     public void onViewCreated() {
-        InputFilterUtil.filterPhone86(phoneNumberBox);
-        phoneNumberBox.addTextChangedListener(new TextWatcher() {
+        binding = FragmentFindAccountBinding.bind(getView());
+        InputFilterUtil.filterPhone86(binding.phoneNumberBox);
+        binding.ivBack.setOnClickListener(v -> {
+           getActivity().onBackPressed();
+        });
+        binding.sendCaptchaBtn.setOnClickListener(this::doSendCaptcha);
+        binding.textDeleteBtn.setOnClickListener(this::doDeleteText);
+        binding.phoneNumberBox.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
@@ -61,7 +58,7 @@ public class FindAccountFgt extends BaseFragment {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                ViewUtil.setVisibility(textDeleteBtn, !TextUtils.isEmpty(s));
+                ViewUtil.setVisibility(binding.textDeleteBtn, !TextUtils.isEmpty(s));
             }
 
             @Override
@@ -71,14 +68,8 @@ public class FindAccountFgt extends BaseFragment {
         });
     }
 
-    @OnClick(R.id.iv_back)
-    public void doBack(View v){
-        KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK);
-    }
-
-    @OnClick(R.id.send_captcha_btn)
     public void doSendCaptcha(View v) {
-        String phoneNum = phoneNumberBox.getText().toString().trim();
+        String phoneNum = binding.phoneNumberBox.getText().toString().trim();
         if (TextUtils.isEmpty(phoneNum)) {
             G.shortToast("请输入手机号");
             return;
@@ -87,12 +78,11 @@ public class FindAccountFgt extends BaseFragment {
             G.shortToast("手机号有误");
             return;
         }
-        mController.whenGoValidCaptcha(phoneNumberBox.getText().toString());
+        mController.whenGoValidCaptcha(binding.phoneNumberBox.getText().toString());
     }
 
-    @OnClick(R.id.text_delete_btn)
     public void doDeleteText(View v) {
-        phoneNumberBox.setText("");
+        binding.phoneNumberBox.setText("");
     }
 
 }

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -123,6 +123,7 @@ public class SignInFgt extends AbsLoginFgt {
 
     @Override
     public void onViewCreated() {
+        findViewById(R.id.ivBack).setOnClickListener(v -> getActivity().finish());
         if (loginType == LoginController.PLATFORM_PHONE) {
             cbRememberPwd.setVisibility(View.GONE);
             forAccountPwdContainer.setVisibility(View.GONE);

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignUpFgt.java

@@ -12,7 +12,6 @@ import android.text.method.LinkMovementMethod;
 import android.text.method.PasswordTransformationMethod;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.URLSpan;
-import android.view.KeyEvent;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
@@ -29,8 +28,6 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.login.controller.LoginController;
 import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.KeyEventUtil;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -104,6 +101,7 @@ public class SignUpFgt extends AbsLoginFgt {
 
     @Override
     public void onViewCreated() {
+        findViewById(R.id.ivBack).setOnClickListener(v -> getActivity().finish());
         if (registerType == LoginController.PLATFORM_ACCOUNT) {
             TitleBarUtils.getInstance().setTitle(getActivity(), "账号");
             forAccountContainer.setVisibility(View.VISIBLE);
@@ -130,8 +128,8 @@ public class SignUpFgt extends AbsLoginFgt {
         telAgreementTv.setHighlightColor(Color.parseColor("#00000000"));
         telAgreementTv.setText(builder);
         tvBackLogin.setOnClickListener(v -> {
-            KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK);
-            //mController.whenToLogin(PLATFORM_PHONE);
+            getActivity().onBackPressed();
+//            mController.whenToLogin(PLATFORM_PHONE);
         });
     }
 

app/src/main/java/com/sheep/gamegroup/util/SysAppUtil.java

@@ -292,30 +292,30 @@ public class SysAppUtil {
     }
 
     public static void checkNet(AbsObserver<Integer> action1) {
-        NetUtil.CAN_CONNECT_SERVICE = true;
-        //发现中获取该接口有个bug，如果一开始有数据，等到服务器数据发生变化时，就会始终使用老的数据，除非有缓存时长限制，但是这样又导致数据不是最新的，所以在SysAppUtil中的checkNet方法直接更新该列表。
-        SheepApp.getInstance().getNetComponent().getApiService().getFindTagList()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void showNoNetView() {
-                        NetUtil.CAN_CONNECT_SERVICE = false;
-                        action1.onNext(-1);
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        NetUtil.CAN_CONNECT_SERVICE = true;
-                        action1.onNext(0);
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        NetUtil.CAN_CONNECT_SERVICE = false;
-                        action1.onNext(-1);
-                    }
-                });
+//        NetUtil.CAN_CONNECT_SERVICE = true;
+//        //发现中获取该接口有个bug，如果一开始有数据，等到服务器数据发生变化时，就会始终使用老的数据，除非有缓存时长限制，但是这样又导致数据不是最新的，所以在SysAppUtil中的checkNet方法直接更新该列表。
+//        SheepApp.getInstance().getNetComponent().getApiService().getFindTagList()
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+//                    @Override
+//                    public void showNoNetView() {
+//                        NetUtil.CAN_CONNECT_SERVICE = false;
+//                        action1.onNext(-1);
+//                    }
+//
+//                    @Override
+//                    public void onNext(BaseMessage baseMessage) {
+//                        NetUtil.CAN_CONNECT_SERVICE = true;
+//                        action1.onNext(0);
+//                    }
+//
+//                    @Override
+//                    public void onError(BaseMessage baseMessage) {
+//                        NetUtil.CAN_CONNECT_SERVICE = false;
+//                        action1.onNext(-1);
+//                    }
+//                });
     }
 
     public static List<AppInfo> getAppInfos(){

app/src/main/java/com/sheep/gamegroup/view/activity/ActInputAndPickerImg.java

@@ -113,7 +113,7 @@ public class ActInputAndPickerImg extends AbsChooseImageActivity {
 
     //点击空白区域
     public void onClickNullView(View view) {
-        KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK);
+        onBackPressed();
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/view/activity/helper/AdHelper.java

@@ -1,8 +1,9 @@
 package com.sheep.gamegroup.view.activity.helper;
 
-import android.app.Activity;
+import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
+
 import android.content.Context;
-import android.text.TextUtils;
+
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.greendao.download.SheepAd;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -11,16 +12,15 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.FileUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.view.activity.SplashAct;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
-import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
 
 public class AdHelper {
 
@@ -31,13 +31,13 @@ public class AdHelper {
 
     // 返回true 为apk下载
     public static boolean goAdLink(Context context, SheepAd advertising) {
-        if (TextUtils.isEmpty(SpUtils.getToken(SheepApp.getInstance()))) {
-            Jump2View.getInstance().goLoginView(context, null);
-            if (context instanceof SplashAct) {
-                ((Activity) context).finish();
-            }
-            return false;
-        }
+//        if (TextUtils.isEmpty(SpUtils.getToken(SheepApp.getInstance()))) {
+//            Jump2View.getInstance().goLoginView(context, null);
+//            if (context instanceof SplashAct) {
+//                ((Activity) context).finish();
+//            }
+//            return false;
+//        }
         if (advertising.getJump_type() == 1) {
             if (advertising.getJump_form() == 1) {
                 Jump2View.getInstance().goWeb(context, advertising.getJump_url(), advertising.getName());

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtVideoComment.java

@@ -176,7 +176,7 @@ public class FgtVideoComment extends BaseListFragment4<UserComment> {
     //点击评论界面中的x
     @OnClick({R.id.video_comment_x})
     public void onClickX(View view) {
-        KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK);
+        onBackPressed();
     }
 
     //点击评论界面中的评论按钮

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -98,8 +98,9 @@ public class Config {
     //随便打首页
     public static final String PATH_SBD_HOME = STATION_SUI_BIAN_DA + "/";
     //福利
-    public static final String PATH_APP_HOME = STATION_APP + "/home";
-    public static final String PATH_WELFARE_HOME = STATION_APP + "/welfare-center";
+    public static final String PATH_APP_HOME = "/#/home";
+    public static final String PATH_GAME_CENTER =  "/#/game-center";
+    public static final String PATH_WELFARE_HOME = "/#/welfare-center";
     public static final String PATH_GAME_HOME = STATION_APP + "/game-center";
     public static final String PATH_MESSAGE_HOME = STATION_APP + "/message-center";
     public static final String PATH_ARTICLE_LIST = STATION_APP + "/article-list";
@@ -132,7 +133,7 @@ public class Config {
     public static final String KEY_SMALL_STATION_URL = "small_station_url";
     //small_station地址
     public static String SMALL_STATION_URL_SHEEP = "http://smallstation.9yan.io";
-    public static String SMALL_STATION_URL_TEST = "http://10.8.230.28:8080";
+    public static String SMALL_STATION_URL_TEST = "http://10.8.230.20:8082";
     //    public static String SMALL_STATION_URL_TEST = "http://10.8.240.180:8080";
     //在数据库中表 config 中 配置 small_station_url后，可以进行设置 ,否则使用默认的值
     public static String SMALL_STATION_URL;

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java

@@ -115,7 +115,10 @@ public class TitleBarUtils {
      */
     public TitleBarUtils setTitleFinish(final Activity activity) {
         activity.getWindow().getDecorView().findViewById(R.id.img_baseactivity_title)
-                .setOnClickListener(view -> KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK));
+                .setOnClickListener(view -> {
+                    activity.onBackPressed();
+//                    onBackPressed();
+                });
         return mTitleBarUtils;
     }
 

app/src/main/res/layout/fragment_find_account.xml

@@ -1,159 +1,170 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:orientation="vertical"
-              android:paddingTop="24dp"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingTop="24dp"
 
->
+    >
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:gravity="center"
-            android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:gravity="center"
+        android:orientation="horizontal">
 
-        <ImageView
-                android:id="@+id/iv_back"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="24dp"
-                android:scaleType="center"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                android:src="@drawable/narrow_back_black"/>
 
         <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:textColor="@color/black_333333"
-                android:textSize="16dp"
-                android:text="登录遇到问题"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
-        <View android:background="@color/white_bg_line"
-              android:paddingStart="0dp"
-              android:paddingEnd="0dp"
-              android:layout_width="match_parent"
-              android:layout_height="1dp"
-              app:layout_constraintBottom_toBottomOf="parent"
-              app:layout_constraintStart_toStartOf="parent"
-              app:layout_constraintEnd_toEndOf="parent"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="登录遇到问题"
+            android:textColor="@color/black_333333"
+            android:textSize="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="24dp"
+            android:scaleType="center"
+            android:src="@drawable/narrow_back_black"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/white_bg_line"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="36dp"
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/content_padding_24"
+        android:paddingRight="@dimen/content_padding_24"
+        android:paddingBottom="@dimen/content_padding_24">
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="36dp"
-            android:paddingLeft="@dimen/content_padding_24"
-            android:paddingBottom="@dimen/content_padding_24"
-            android:paddingRight="@dimen/content_padding_24"
-            android:orientation="vertical">
-        <LinearLayout
-                android:gravity="center_vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:gravity="center_vertical">
+
             <View
-                    android:layout_marginRight="4dp"
-                    android:layout_width="4dp"
-                    android:layout_height="14dp"
-                    android:background="@color/btn_color_main_stroke"/>
+                android:layout_width="4dp"
+                android:layout_height="14dp"
+                android:layout_marginRight="4dp"
+                android:background="@color/btn_color_main_stroke" />
+
             <TextView
-                    android:text="方法一:"
-                    android:textSize="14sp"
-                    android:textColor="@color/black_6_3"
-                    android:textStyle="bold"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="方法一:"
+                android:textColor="@color/black_6_3"
+                android:textSize="14sp"
+                android:textStyle="bold" />
         </LinearLayout>
 
         <TextView
-                android:layout_marginTop="12dp"
-                android:textSize="12sp"
-                android:layout_marginLeft="8dp"
-                android:text="已绑定小绵羊账户的用户，可以通过手机号+验证码来修改密码"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="12dp"
+            android:text="已绑定小绵羊账户的用户，可以通过手机号+验证码来修改密码"
+            android:textSize="12sp" />
 
         <RelativeLayout
-                android:layout_marginTop="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="8dp">
+
             <EditText
-                    android:layout_marginTop="8dp"
-                    android:id="@+id/phone_number_box"
-                    android:hint="请输入手机号"
-                    android:inputType="phone"
-                    style="@style/login_edit_style"/>
+                android:id="@+id/phone_number_box"
+                style="@style/login_edit_style"
+                android:layout_marginTop="8dp"
+                android:hint="请输入手机号"
+                android:inputType="phone" />
 
             <ImageView
-                    android:id="@+id/text_delete_btn"
-                    android:src="@mipmap/text_delete"
-                    android:visibility="gone"
-                    android:layout_toLeftOf="@+id/send_captcha_btn"
-                    android:layout_marginTop="24dp"
-                    android:layout_marginRight="12dp"
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"/>
+                android:id="@+id/text_delete_btn"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginRight="12dp"
+                android:layout_toLeftOf="@+id/send_captcha_btn"
+                android:src="@mipmap/text_delete"
+                android:visibility="gone" />
 
             <View
-                    style="@style/login_separetor_line_style"
-                    android:layout_below="@+id/phone_number_box"/>
+                style="@style/login_separetor_line_style"
+                android:layout_below="@+id/phone_number_box" />
+
             <Button
-                    android:id="@+id/send_captcha_btn"
-                    android:text="获取验证码"
-                    android:textSize="12sp"
-                    android:textColor="@color/white"
-                    android:textStyle="normal"
-                    android:layout_marginTop="22dp"
-                    android:layout_alignParentRight="true"
-                    android:background="@drawable/round_main_r28"
-                    android:layout_width="wrap_content"
-                    android:layout_height="20dp"/>
+                android:id="@+id/send_captcha_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="22dp"
+                android:background="@drawable/round_main_r28"
+                android:text="获取验证码"
+                android:textColor="@color/white"
+                android:textSize="12sp"
+                android:textStyle="normal" />
 
         </RelativeLayout>
 
         <LinearLayout
-                android:layout_marginTop="16dp"
-                android:gravity="center_vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center_vertical">
+
             <View
-                    android:layout_marginRight="4dp"
-                    android:layout_width="4dp"
-                    android:layout_height="14dp"
-                    android:background="@color/btn_color_main_stroke"/>
+                android:layout_width="4dp"
+                android:layout_height="14dp"
+                android:layout_marginRight="4dp"
+                android:background="@color/btn_color_main_stroke" />
+
             <TextView
-                    android:text="方法二:"
-                    android:textSize="14sp"
-                    android:textColor="@color/black_6_3"
-                    android:textStyle="bold"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="方法二:"
+                android:textColor="@color/black_6_3"
+                android:textSize="14sp"
+                android:textStyle="bold" />
         </LinearLayout>
+
         <TextView
-                android:text="通过联系客服申述，召回无绑定手机号的小绵羊账号及密码"
-                android:layout_marginTop="12dp"
-                android:textSize="12sp"
-                android:layout_marginLeft="8dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="12dp"
+            android:text="通过联系客服申述，召回无绑定手机号的小绵羊账号及密码"
+            android:textSize="12sp" />
 
         <TextView
-                android:textColor="@color/btn_color_main_stroke"
-                android:layout_marginTop="24dp"
-                android:textSize="12sp"
-                android:layout_marginLeft="8dp"
-                android:text="客服QQ: 2441310002"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="24dp"
+            android:text="客服QQ: 2441310002"
+            android:textColor="@color/btn_color_main_stroke"
+            android:textSize="12sp" />
 
     </LinearLayout>
 

app/src/main/res/layout/fragment_sign_in.xml

@@ -5,6 +5,15 @@
         android:layout_height="match_parent"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@drawable/bg_login">
+    <ImageView
+        android:id="@+id/ivBack"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:src="@drawable/arrow_back_ios_new_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_login_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_login_title" />
 
     <TextView
             android:id="@+id/tv_login_title"

app/src/main/res/layout/fragment_sign_up.xml

@@ -5,6 +5,16 @@
     android:background="@drawable/bg_login"
     android:orientation="vertical">
 
+    <ImageView
+        android:id="@+id/ivBack"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:src="@drawable/arrow_back_ios_new_24"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_login_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_login_title" />
+
     <TextView
         android:id="@+id/tv_login_title"
         android:layout_width="wrap_content"

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

@@ -14,6 +14,10 @@ import android.widget.Toast;
 
 import java.util.ArrayList;
 
+/**
+ * 人脸识别，目前没使用这个BaseActivity
+ */
+@Deprecated
 public class BaseActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {

media/app/src/main/java/com/kfzs/cfyl/media/fragment/FgtDiscoveryTopic.java

@@ -1,13 +1,13 @@
 package com.kfzs.cfyl.media.fragment;
 
 import android.app.Activity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.kfzs.cfyl.media.BaseFragment;
@@ -15,7 +15,6 @@ import com.kfzs.cfyl.media.BaseListFgtActivity;
 import com.kfzs.cfyl.media.R;
 import com.kfzs.cfyl.media.api.IdChooser;
 import com.kfzs.cfyl.media.util.G;
-import com.kfzs.cfyl.media.util.KeyEventUtil;
 import com.kfzs.cfyl.media.util.ListUtil;
 import com.kfzs.cfyl.media.util.ViewUtil;
 
@@ -35,6 +34,7 @@ public class FgtDiscoveryTopic extends BaseFragment {
 
     private RecyclerView recyclerView;
     private TextView edit_video_topic_tv;
+
     @Override
     public void onViewCreated() {
         recyclerView = findViewById(R.id.media_recyclerView);
@@ -55,44 +55,48 @@ public class FgtDiscoveryTopic extends BaseFragment {
                 onClickNext(view);
             }
         });
-        if(list != null){
-            if(recyclerView == null){
+        if (list != null) {
+            if (recyclerView == null) {
                 G.showToast(getContext(), "初始化失败");
                 return;
             }
             initView();
         }
     }
+
     //点击返回
     public void onClickBackImg(View view) {
         Activity activity = getActivity();
-        if(activity instanceof BaseListFgtActivity){
-            if(((BaseListFgtActivity) activity).switchLastFgt()){
+        if (activity instanceof BaseListFgtActivity) {
+            if (((BaseListFgtActivity) activity).switchLastFgt()) {
                 return;
             }
         }
-        KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK);
+        activity.onBackPressed();
     }
+
     //点击下一步
     public void onClickNext(View view) {
         Activity activity = getActivity();
-        if(activity instanceof BaseListFgtActivity){
+        if (activity instanceof BaseListFgtActivity) {
             ((BaseListFgtActivity) activity).switchNextFgt();
         }
     }
+
     public void loadData(ArrayList<String> arrayList) {
         list = arrayList;
-        if(recyclerView != null)
+        if (recyclerView != null)
             initView();
     }
-    private void initView(){
+
+    private void initView() {
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         BaseQuickAdapter<String, BaseViewHolder> baseQuickAdapter = getAdapter();
         baseQuickAdapter.bindToRecyclerView(recyclerView);
         baseQuickAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                if(getActivity() instanceof IdChooser){
+                if (getActivity() instanceof IdChooser) {
                     String item = ListUtil.getItem(list, position);
                     if (item != null) {
                         ViewUtil.setText(edit_video_topic_tv, "#%s#", item);
@@ -102,7 +106,9 @@ public class FgtDiscoveryTopic extends BaseFragment {
             }
         });
     }
-    private List<String > list;
+
+    private List<String> list;
+
     protected BaseQuickAdapter<String, BaseViewHolder> getAdapter() {
         return new BaseQuickAdapter<String, BaseViewHolder>(R.layout.media_item_discovery_topic, list) {
             @Override

media/app/src/main/java/com/kfzs/cfyl/media/fragment/FgtEditVideoTypeList.java

@@ -1,13 +1,13 @@
 package com.kfzs.cfyl.media.fragment;
 
 import android.app.Activity;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.kfzs.cfyl.media.BaseListFgtActivity;
@@ -16,7 +16,6 @@ import com.kfzs.cfyl.media.R;
 import com.kfzs.cfyl.media.api.FgtCreater;
 import com.kfzs.cfyl.media.bean.EditVideoType;
 import com.kfzs.cfyl.media.util.G;
-import com.kfzs.cfyl.media.util.KeyEventUtil;
 import com.kfzs.cfyl.media.util.ListUtil;
 
 import java.util.ArrayList;
@@ -106,7 +105,7 @@ public class FgtEditVideoTypeList extends BaseListFgtFgt {
                 return;
             }
         }
-        KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK);
+        activity.onBackPressed();
     }
 
     //点击下一步

media/app/src/main/java/com/kfzs/cfyl/media/fragment/FgtVideoFrameList.java

@@ -3,7 +3,6 @@ package com.kfzs.cfyl.media.fragment;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
-import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -14,7 +13,6 @@ import com.kfzs.cfyl.media.BaseListFgtActivity;
 import com.kfzs.cfyl.media.R;
 import com.kfzs.cfyl.media.customview.VideoFramesView;
 import com.kfzs.cfyl.media.util.G;
-import com.kfzs.cfyl.media.util.KeyEventUtil;
 import com.kfzs.cfyl.media.util.VideoUtil;
 import com.kfzs.cfyl.share_library.util.LogUtil;
 import com.sheep.gamegroup.model.entity.Video;
@@ -32,6 +30,7 @@ public class FgtVideoFrameList extends BaseFragment {
     private VideoFramesView videoFramesView;
     private TextView edit_video_time_tv;
     private TextView edit_video_sure_tv;
+
     @Override
     public int getLayoutId() {
         return R.layout.media_fgt_cut_video;
@@ -61,13 +60,15 @@ public class FgtVideoFrameList extends BaseFragment {
     }
 
     private void tryInitVideoData() {
-        if(data != null && videoFramesView != null && getActivity() != null){
+        if (data != null && videoFramesView != null && getActivity() != null) {
             initVideoData();
         }
     }
+
     public static final long MAX_VIDEO_DURATION = 15_000L;//视频最大时长，超过需要剪切
     private Video data;
-    public void loadData(Video video){
+
+    public void loadData(Video video) {
         data = video;
     }
 
@@ -76,7 +77,8 @@ public class FgtVideoFrameList extends BaseFragment {
         //视频帧
         videoFramesView.initVideo(data).setMaxDuration(MAX_VIDEO_DURATION).showVideoList(getActivity());
     }
-    public void tryCheckDuration(){
+
+    public void tryCheckDuration() {
 //        checkDuration(videoFramesView.getLineDuration());
         videoFramesView.setOnTimeChangeListener(new Action1<Float>() {
             @Override
@@ -97,7 +99,9 @@ public class FgtVideoFrameList extends BaseFragment {
             }
         });
     }
+
     private static final String TAG = FgtVideoFrameList.class.getSimpleName();
+
     //检查有没有设置剪切视频的时长
     private void checkDuration(long duration) {
         LogUtil.println(TAG, data.getDuration(), duration);
@@ -110,7 +114,7 @@ public class FgtVideoFrameList extends BaseFragment {
 
     private void tryCut() {//其次完成编辑
         Activity activity = getActivity();
-        if(activity instanceof BaseActivity) {
+        if (activity instanceof BaseActivity) {
             final BaseActivity baseActivity = (BaseActivity) activity;
             baseActivity.showProgress().getTextView().setText("剪切视频中");
             VideoUtil.tryCutVideoByMedia(data.getFilePath(), videoFramesView.getStartPoint() * 1000, videoFramesView.getLineDuration() * 1000, new Action1<Object>() {
@@ -145,6 +149,7 @@ public class FgtVideoFrameList extends BaseFragment {
         baseActivity.setResult(Activity.RESULT_OK, intent);
         baseActivity.finish();
     }
+
     @Override
     public void onDestroy() {
         if (videoFramesView != null)
@@ -158,13 +163,14 @@ public class FgtVideoFrameList extends BaseFragment {
     //点击返回
     public void onClickBackImg(View view) {
         Activity activity = getActivity();
-        if(activity instanceof BaseListFgtActivity){
-            if(((BaseListFgtActivity) activity).switchLastFgt()){
+        if (activity instanceof BaseListFgtActivity) {
+            if (((BaseListFgtActivity) activity).switchLastFgt()) {
                 return;
             }
         }
-        KeyEventUtil.sendKeyDownUp(KeyEvent.KEYCODE_BACK);
+        activity.onBackPressed();
     }
+
     //点击下一步
     public void onClickNext(View view) {
         tryCut();