事件

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Mar 12 15:34:54 CST 2021
-gradle.version=4.10.1
+#Wed Apr 07 15:04:31 CST 2021
+gradle.version=4.4

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/codeStyles/Project.xml

@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
-  </component>
-</project>

.idea/gradle.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -19,12 +17,12 @@
             <option value="$PROJECT_DIR$/resource" />
             <option value="$PROJECT_DIR$/setting" />
             <option value="$PROJECT_DIR$/shop" />
+            <option value="$PROJECT_DIR$/starRTC" />
             <option value="$PROJECT_DIR$/welcome" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
+        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -8,21 +8,11 @@
       <module fileurl="file://$PROJECT_DIR$/hello/hello.iml" filepath="$PROJECT_DIR$/hello/hello.iml" />
       <module fileurl="file://$PROJECT_DIR$/home/home.iml" filepath="$PROJECT_DIR$/home/home.iml" />
       <module fileurl="file://$PROJECT_DIR$/middleware/middleware.iml" filepath="$PROJECT_DIR$/middleware/middleware.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/ncs-frame.iml" filepath="$PROJECT_DIR$/.idea/ncs-frame.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ncs_android_frame.iml" filepath="$PROJECT_DIR$/.idea/modules/ncs_android_frame.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/ncs_android_frame.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/ncs_android_frame.app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/common/ncs_android_frame.common.iml" filepath="$PROJECT_DIR$/.idea/modules/common/ncs_android_frame.common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/extra/ncs_android_frame.extra.iml" filepath="$PROJECT_DIR$/.idea/modules/extra/ncs_android_frame.extra.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/hello/ncs_android_frame.hello.iml" filepath="$PROJECT_DIR$/.idea/modules/hello/ncs_android_frame.hello.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/home/ncs_android_frame.home.iml" filepath="$PROJECT_DIR$/.idea/modules/home/ncs_android_frame.home.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/middleware/ncs_android_frame.middleware.iml" filepath="$PROJECT_DIR$/.idea/modules/middleware/ncs_android_frame.middleware.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/resource/ncs_android_frame.resource.iml" filepath="$PROJECT_DIR$/.idea/modules/resource/ncs_android_frame.resource.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/setting/ncs_android_frame.setting.iml" filepath="$PROJECT_DIR$/.idea/modules/setting/ncs_android_frame.setting.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/shop/ncs_android_frame.shop.iml" filepath="$PROJECT_DIR$/.idea/modules/shop/ncs_android_frame.shop.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/welcome/ncs_android_frame.welcome.iml" filepath="$PROJECT_DIR$/.idea/modules/welcome/ncs_android_frame.welcome.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ncs_android_frame.iml" filepath="$PROJECT_DIR$/ncs_android_frame.iml" />
       <module fileurl="file://$PROJECT_DIR$/resource/resource.iml" filepath="$PROJECT_DIR$/resource/resource.iml" />
       <module fileurl="file://$PROJECT_DIR$/setting/setting.iml" filepath="$PROJECT_DIR$/setting/setting.iml" />
       <module fileurl="file://$PROJECT_DIR$/shop/shop.iml" filepath="$PROJECT_DIR$/shop/shop.iml" />
+      <module fileurl="file://$PROJECT_DIR$/starRTC/starRTC.iml" filepath="$PROJECT_DIR$/starRTC/starRTC.iml" />
       <module fileurl="file://$PROJECT_DIR$/welcome/welcome.iml" filepath="$PROJECT_DIR$/welcome/welcome.iml" />
     </modules>
   </component>

.idea/runConfigurations.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.enation.app.javashop","split":"","minSdkVersion":"17"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.wdkl.app.ncs.watch","split":"","minSdkVersion":"17"}}]

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

home/build.gradle

@@ -1,8 +1,7 @@
-
-if (componentTag){
+if (componentTag) {
     apply plugin: 'com.android.application'
     apply plugin: 'com.enation.javashop.aspectjrt'
-}else{
+} else {
     apply plugin: 'com.android.library'
 }
 
@@ -22,7 +21,7 @@ android {
     buildToolsVersion build_tools_version
 
     defaultConfig {
-        if (componentTag){
+        if (componentTag) {
             applicationId "com.wdkl.ncs.android.component.home"
             multiDexEnabled true
         }
@@ -37,7 +36,6 @@ android {
 
     }
 
-  
 
     lintOptions {
         abortOnError false
@@ -50,9 +48,9 @@ android {
     }
     sourceSets {
         main.java.srcDirs += 'src/main/code'
-        if(componentTag){
+        if (componentTag) {
             main.manifest.srcFile 'src/main/ApkBuildDir/AndroidManifest.xml'
-        }else{
+        } else {
             main.manifest.srcFile 'src/main/AndroidManifest.xml'
             main.java {
                 exclude 'apkbuild/**'
@@ -62,6 +60,7 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     compile fileTree(dir: 'libs', include: ['*.jar'])
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
@@ -84,7 +83,7 @@ dependencies {
      */
     compile project(':middleware')
 
-    if(componentTag){
+    if (componentTag) {
         debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
         releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
         testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
@@ -108,7 +107,7 @@ dependencies {
     /**
      *  constraint-layout布局依赖
      */
-    compile 'com.android.support.constraint:constraint-layout:1.1.0-beta5'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta5'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     compile project(':starRTC')
@@ -117,12 +116,12 @@ dependencies {
 /**
  * kawo组件化框架配置
  */
-if(componentTag){
+if (componentTag) {
     kawo {
         /**
          * Aop注解排除Jar
          */
-        aspectExcludeJarFilter 'com.enation.geamtear.pay','AlipaySdk'
+        aspectExcludeJarFilter 'com.enation.geamtear.pay', 'AlipaySdk'
     }
 }
 repositories {

home/src/main/AndroidManifest.xml

@@ -1,12 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-
     package="com.wdkl.ncs.android.component.home">
 
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
-
         <activity
             android:name=".activity.HomeActivity"
             android:launchMode="singleTask" />
@@ -21,4 +20,4 @@
         </service>
     </application>
 
-</manifest>
+</manifest>

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHomeActivity.kt

@@ -14,6 +14,7 @@ import com.wdkl.ncs.android.lib.utils.push
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchHomeActivityPresenter
+import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.watch_activity_home.*
@@ -36,7 +37,12 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
         AppTool.SystemUI.showNavigationBar(this,false)
         AppTool.SystemUI.ImmersiveWithBottomBarColor(this, Color.BLACK)
 
-
+        Thread ( Runnable {
+            run {
+                TcpClient.getInstance().init("192.168.1.138", 5080, 9)
+//                TcpClient.getInstance().init("47.106.200.55", 5080, 9)
+            }
+        }).start()
 
     }