zhulian 2 лет назад
Родитель
Сommit
c50ad0e754

+ 12 - 10
baselib/build.gradle

@@ -32,23 +32,25 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
-            buildConfigField "String", "TENCENT_IM_APPID", "\"\""
-            buildConfigField "String", "TENCENT_LICENCEURL", "\"\""
-            buildConfigField "String", "TENCENT_LICENCEKEY", "\"\""
+            buildConfigField "String", "TENCENT_IM_APPID", "\"1400823270\""
+            buildConfigField "String", "TENCENT_LICENCEURL", "\"https://license.vod2.myqcloud.com/license/v2/1300835310_1/v_cube.license\""
+            buildConfigField "String", "TENCENT_LICENCEKEY", "\"0258811f9d756fea82c9a2d2cbd439bd\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
-            buildConfigField "String", "BUGLY_APPID", "\"d400f20398\""
-            buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-app-api-dev\""
+//            buildConfigField "String", "BUGLY_APPID", "\"d400f20398\""
+//            buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-app-api-dev\""
+            buildConfigField "String", "API_URL", "\"http://yaoronghcp.yingyang211.com/hcp-app-api\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 
         release {
             minifyEnabled false
-            buildConfigField "String", "TENCENT_IM_APPID", "\"\""
-            buildConfigField "String", "TENCENT_LICENCEURL", "\"\""
-            buildConfigField "String", "TENCENT_LICENCEKEY", "\"\""
+            buildConfigField "String", "TENCENT_IM_APPID", "\"1400823270\""
+            buildConfigField "String", "TENCENT_LICENCEURL", "\"https://license.vod2.myqcloud.com/license/v2/1300835310_1/v_cube.license\""
+            buildConfigField "String", "TENCENT_LICENCEKEY", "\"0258811f9d756fea82c9a2d2cbd439bd\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
-            buildConfigField "String", "BUGLY_APPID", "\"ad3db4d529\""
-            buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-app-api-uat\""
+//            buildConfigField "String", "BUGLY_APPID", "\"ad3db4d529\""
+//            buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-app-api-uat\""
+            buildConfigField "String", "API_URL", "\"http://yaoronghcp.yingyang211.com/hcp-app-api\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

+ 6 - 6
baselib/src/main/java/com/yingyangfly/baselib/BaseApplication.kt

@@ -10,7 +10,7 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout
 import com.scwang.smartrefresh.layout.constant.SpinnerStyle
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.scwang.smartrefresh.layout.header.ClassicsHeader
-import com.tencent.bugly.crashreport.CrashReport
+//import com.tencent.bugly.crashreport.CrashReport
 import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.utils.LogUtil
 import com.yingyangfly.baselib.webview.base.WebViewInitTask
@@ -103,11 +103,11 @@ open class BaseApplication : Application() {
      */
     private fun formalInitThirdParty() {
         // Bugly
-        CrashReport.initCrashReport(
-            appContext,
-            AccountConfig.BUGLY_APPID,
-            AccountConfig.DEBUG
-        )
+//        CrashReport.initCrashReport(
+//            appContext,
+//            AccountConfig.BUGLY_APPID,
+//            AccountConfig.DEBUG
+//        )
     }
 
     /**

+ 4 - 4
baselib/src/main/java/com/yingyangfly/baselib/base/BaseActivity.kt

@@ -130,7 +130,7 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(), OnRefre
             voicePlayerDao = db?.getVoicePlayerDao()
             departmentDao = db?.getDepartmentDao()
         }
-        initProducer()
+//        initProducer()
         initMVVM()
         initViews()
         initListener()
@@ -454,9 +454,9 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(), OnRefre
     }
 
     fun sendLog(log: com.aliyun.sls.android.producer.Log) {
-        if (client != null) {
-            client!!.addLog(log)
-        }
+//        if (client != null) {
+//            client!!.addLog(log)
+//        }
     }
 
     private fun oneLog(): com.aliyun.sls.android.producer.Log {

+ 1 - 1
baselib/src/main/java/com/yingyangfly/baselib/config/AccountConfig.kt

@@ -19,7 +19,7 @@ object AccountConfig {
     /**
      * 腾讯bugly
      */
-    const val BUGLY_APPID = BuildConfig.BUGLY_APPID
+ //   const val BUGLY_APPID = BuildConfig.BUGLY_APPID
 
     /**
      * 腾讯IM

+ 2 - 2
baselib/src/main/java/com/yingyangfly/baselib/net/BaseObserver.kt

@@ -1,7 +1,7 @@
 package com.yingyangfly.baselib.net
 
 import android.util.Log
-import com.tencent.bugly.crashreport.CrashReport
+//import com.tencent.bugly.crashreport.CrashReport
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.baselib.utils.User
@@ -33,7 +33,7 @@ abstract class BaseObserver<T> : Observer<XBaseEntity<T>> {
                 onSuccess(t)
             } catch (e: Exception) {
 //              异常上报
-                CrashReport.postCatchedException(e)
+//                CrashReport.postCatchedException(e)
             }
         } else if (TOKENLOSEEFFICACY == tBaseEntity.code) {
             User.saveMobile("")

+ 4 - 4
baselib/src/main/java/com/yingyangfly/baselib/utils/User.kt

@@ -2,7 +2,7 @@ package com.yingyangfly.baselib.utils
 
 import android.content.Context
 import android.text.TextUtils
-import com.tencent.bugly.crashreport.CrashReport
+//import com.tencent.bugly.crashreport.CrashReport
 import com.yingyangfly.baselib.BaseApplication
 import java.text.SimpleDateFormat
 import java.util.*
@@ -56,7 +56,7 @@ object User {
      */
     fun saveToken(token: String) {
         Preferences.put(CommonParam.TOKEN, token)
-        CrashReport.setUserId(token)
+//        CrashReport.setUserId(token)
     }
 
     fun getToken(): String {
@@ -182,7 +182,7 @@ object User {
 
     fun saveOrgCode(orgCode: String) {
         Preferences.put(CommonParam.ORGCODE, orgCode)
-        CrashReport.setUserId(orgCode)
+//        CrashReport.setUserId(orgCode)
     }
 
     fun getOrgCode(): String {
@@ -198,7 +198,7 @@ object User {
      */
     fun saveFirstLogin(firstLogin: String) {
         Preferences.put(CommonParam.FIRSTLOGIN, firstLogin)
-        CrashReport.setUserId(firstLogin)
+//        CrashReport.setUserId(firstLogin)
     }
 
     fun getFirstLogin(): String {

+ 1 - 1
livebroadcast/src/main/java/com/yingyang/livebroadcast/activity/video/VideoPlayerActivity.kt

@@ -36,7 +36,7 @@ class VideoPlayerActivity : BaseActivity<ActivityVideoPlayerBinding>(), View.OnT
         val videoUrl = intent.getStringExtra("url") ?: ""
         title = intent.getStringExtra("title") ?: ""
         url = if (videoUrl.startsWith("")) {
-            videoUrl.replace("http://60.205.201.7/", "https://www.yingyangfly.com/")
+            videoUrl.replace("", "")
         } else {
             videoUrl
         }

+ 6 - 6
login/src/main/java/com/yingyang/login/service/InitService.kt

@@ -9,7 +9,7 @@ import android.os.Build
 import android.os.IBinder
 import android.text.TextUtils
 import android.util.Log
-import com.tencent.bugly.crashreport.CrashReport
+//import com.tencent.bugly.crashreport.CrashReport
 import com.tencent.imsdk.v2.V2TIMCallback
 import com.tencent.imsdk.v2.V2TIMManager
 import com.yingyangfly.baselib.ext.logd
@@ -75,11 +75,11 @@ class InitService : Service() {
                 "IM登陆失败$p1\t错误码:$p0".loge()
                 User.saveToken("")
                 Log.e("wpp", "IM登陆失败$p1\t错误码:$p0")
-                CrashReport.postCatchedException(
-                    Throwable(
-                        User.getName() + "IM登陆失败,报错信息:" + p1 + " ,用户信息:" + User.getUserId() + "  \n" + User.getName() + " ,错误码:" + p0
-                    )
-                )
+//                CrashReport.postCatchedException(
+//                    Throwable(
+//                        User.getName() + "IM登陆失败,报错信息:" + p1 + " ,用户信息:" + User.getUserId() + "  \n" + User.getName() + " ,错误码:" + p0
+//                    )
+//                )
             }
         })
 

+ 2 - 2
push/src/main/java/com/yingyang/push/activity/MessgeListActivity.kt

@@ -87,8 +87,8 @@ class MessgeListActivity : BaseMVVMActivity<ActivityMessgeListBinding, PushViewM
                             messageDialog.show(supportFragmentManager, "messageDialog")
                         } else {
                             val url =
-                                if (bean.ext.startsWith("https://www.yingyangfly.com/hcp-h5/") || bean.ext.startsWith(
-                                        "https://www.yingyangfly.com/h5-training-daily"
+                                if (bean.ext.startsWith("") || bean.ext.startsWith(
+                                        ""
                                     )
                                 ) {
                                     bean.ext