Browse Source

1.修改提示语

874934733@qq.com 1 year ago
parent
commit
5a4cac8f7a

+ 0 - 28
.idea/codeStyles/Project.xml

@@ -1,36 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="ENABLE_SECOND_REFORMAT" value="true" />
-    <DBN-PSQL>
-      <case-options enabled="true">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false" />
-    </DBN-PSQL>
-    <DBN-SQL>
-      <case-options enabled="true">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false">
-        <option name="STATEMENT_SPACING" value="one_line" />
-        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
-        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
-      </formatting-settings>
-    </DBN-SQL>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>

+ 1 - 0
.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>

+ 1 - 0
.idea/gradle.xml

@@ -32,6 +32,7 @@
             <option value="$PROJECT_DIR$/workbenches" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

+ 5 - 2
.idea/hcp-pad.iml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module external.linked.project.id="hcp-pad" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

+ 7 - 0
.idea/misc.xml

@@ -1,4 +1,8 @@
 <project version="4">
+  <component name="ASMIdeaPluginConfiguration">
+    <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
+    <groovy codeStyle="LEGACY" />
+  </component>
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
@@ -826,6 +830,9 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="SuppressKotlinCodeStyleNotification">
+    <option name="disableForAll" value="true" />
+  </component>
   <component name="SuppressionsComponent">
     <option name="suppComments" value="[]" />
   </component>

+ 6 - 6
baselib/build.gradle

@@ -32,9 +32,9 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
-            buildConfigField "String", "TENCENT_IM_APPID", "\"1600012587\""
-            buildConfigField "String", "TENCENT_LICENCEURL", "\"https://license.vod2.myqcloud.com/license/v2/1300835310_1/v_cube.license\""
-            buildConfigField "String", "TENCENT_LICENCEKEY", "\"0258811f9d756fea82c9a2d2cbd439bd\""
+            buildConfigField "String", "TENCENT_IM_APPID", "\"\""
+            buildConfigField "String", "TENCENT_LICENCEURL", "\"\""
+            buildConfigField "String", "TENCENT_LICENCEKEY", "\"\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"d400f20398\""
             buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-app-api-dev\""
@@ -43,9 +43,9 @@ android {
 
         release {
             minifyEnabled false
-            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 "String", "TENCENT_IM_APPID", "\"\""
+            buildConfigField "String", "TENCENT_LICENCEURL", "\"\""
+            buildConfigField "String", "TENCENT_LICENCEKEY", "\"\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"ad3db4d529\""
             buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-app-api-uat\""

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

@@ -145,17 +145,17 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(), OnRefre
         try {
             val config = LogProducerConfig(
                 this,
-                "https://cn-beijing.log.aliyuncs.com",
-                "hcp-pad",
-                "hcp-pad",
-                "LTAI5tBxgTDAzgGHU7tKHNkM",
-                "PAq3ay6rPVhk4Va56XHStc352pQiGg",
+                "",
+                "",
+                "",
+                "",
+                "",
                 ""
             )
             // 设置主题
-            config.setTopic("hcp_pad")
+            config.setTopic("")
             // 设置tag信息,此tag会附加在每条日志上
-            config.addTag("hcp", "hcp_pad")
+            config.addTag("", "")
             // 每个缓存的日志包的大小上限,取值为1~5242880,单位为字节。默认为1024 * 1024
             config.setPacketLogBytes(1024 * 1024)
             // 每个缓存的日志包中包含日志数量的最大值,取值为1~4096,默认为1024

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

@@ -29,7 +29,7 @@ object AccountConfig {
     /**
      * 腾讯直播
      */
-    const val TENCENT_APPID = 1400329073
+    const val TENCENT_APPID = 0
     const val TENCENT_LICENCEURL = BuildConfig.TENCENT_LICENCEURL
     const val TENCENT_LICENCEKEY = BuildConfig.TENCENT_LICENCEKEY
 

+ 2 - 2
config.gradle

@@ -13,8 +13,8 @@ ext {
             applicationId    : "com.yingyangfly",
             minSdkVersion    : 19,
             targetSdkVersion : 30,
-            versionCode      : 7,
-            versionName      : "1.0.7",
+            versionCode      : 15,
+            versionName      : "1.0.15",
     ]
     //androidx配置
     androidx = [