Merge branch 'master' into toKotlin

# Conflicts:
#	app/src/main/java/com/dahe/examine/base/App.java

app/build.gradle

@@ -101,6 +101,10 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {

app/src/main/java/com/dahe/examine/base/App.java

@@ -26,6 +26,7 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        System.out.println("我是master2");
         mApplication = this;
         System.out.println("woshikotlin2");
         CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);

app/src/main/java/com/dahe/examine/ui/HomeActivity.kt

@@ -64,6 +64,12 @@ class HomeActivity : BaseActivity(), ViewPager.OnPageChangeListener, OnTabSelect
 //        }
 
         home_tabLayout.setOnTabSelectListener(this)
+//        home_NoScrollViewPager.apply {
+//            adapter = MyHomePagerAdapter(supportFragmentManager,
+//                mTitles,
+//                mFragments)
+//            addOnPageChangeListener(this@HomeActivity)
+//        }
         home_NoScrollViewPager.setAdapter(MyHomePagerAdapter(this.supportFragmentManager,
             mTitles,
             mFragments))

app/src/main/java/com/dahe/examine/ui/account/LoginActivity.kt

@@ -23,6 +23,7 @@ import com.dahe.mylibrary.net.CommonResponseBean
 import com.dahe.mylibrary.net.JsonUtils
 import com.dahe.mylibrary.utils.ActivityUtils
 import com.dahe.mylibrary.utils.Base64Utils
+import com.dahe.mylibrary.utils.MobileInfoUtils
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.schedulers.Schedulers
@@ -75,6 +76,8 @@ class LoginActivity : BaseActivity(), EasyPermissions.PermissionCallbacks, View.
     override fun onClick(view: View) {
         when (view.id) {
             R.id.btn_log -> {
+//                MobileInfoUtils().jumpStartInterface(this)
+
                 if (!EasyPermissions.hasPermissions(this, *perms)) {
                     EasyPermissions.requestPermissions(
                         this@LoginActivity,
@@ -87,14 +90,23 @@ class LoginActivity : BaseActivity(), EasyPermissions.PermissionCallbacks, View.
                 }
 
             }
-//            R.id.tv_forget -> ActivityUtils.startActivity(mContext, ForgetPwdActivity::class.java)
-            R.id.tv_yhxy -> AppActivityUtils.openWebViewActivity(this,
-                "用户服务协议",
-                "http://tms.down.user.test.dahehuodongbao.com/user-agreement.html");
-            R.id.tv_yszc -> AppActivityUtils.openWebViewActivity(this, "隐私政策",
-                "http://tms.down.user.test.dahehuodongbao.com/user-privacy.html")
+            R.id.tv_yhxy -> {
+                //            R.id.tv_forget -> ActivityUtils.startActivity(mContext, ForgetPwdActivity::class.java)
+                AppActivityUtils.openWebViewActivity(this,
+                    "用户服务协议",
+                    "http://tms.down.user.test.dahehuodongbao.com/user-agreement.html")
+            };
+            R.id.tv_yszc -> //            R.id.tv_forget -> ActivityUtils.startActivity(mContext, ForgetPwdActivity::class.java)
+            {
+                AppActivityUtils.openWebViewActivity(this, "隐私政策",
+                    "http://tms.down.user.test.dahehuodongbao.com/user-privacy.html")
+            }
 
-            R.id.imgCode -> getCode()
+            R.id.imgCode ->//            R.id.tv_forget -> ActivityUtils.startActivity(mContext, ForgetPwdActivity::class.java)
+                //            R.id.tv_forget -> ActivityUtils.startActivity(mContext, ForgetPwdActivity::class.java)
+            {
+                getCode()
+            }
 
 
         }