backup

config.gradle

@@ -42,13 +42,13 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.47.1",
+            "m-confide"       : "0.0.47.2",
             "m-consultant"    : "0.0.56.1",
             "m-fm"            : "0.0.28",
             "m-user"          : "0.0.56",
-            "m-home"          : "0.0.19.1",
+            "m-home"          : "0.0.20",
             "m-im"            : "0.0.11",
-            "m-dynamic"       : "0.0.5.1",
+            "m-dynamic"       : "0.0.5.8",
 
             "m-muse"          : "0.0.26",
             "m-tests"         : "0.0.21",
@@ -63,19 +63,19 @@ ext {
             "m-muse-api"      : "0.0.1",
             "m-tests-api"     : "0.0.1",
             "m-user-api"      : "0.0.9",
-            "m-home-api"      : "0.0.3",
+            "m-home-api"      : "0.0.4.1",
             "m-im-api"        : "0.0.8",
-            "m-dynamic-api"   : "0.0.1",
+            "m-dynamic-api"   : "0.0.3.6",
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.37.1",
+            "ydl-platform"    : "0.0.37.4",
             //第二步 若干
 
             "ydl-webview"     : "0.0.37.1",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.46",
+            "m-audioim"       : "0.0.46.1",
             "ydl-flutter-base": "0.0.10",
 
             //以下 几乎不会动
@@ -109,19 +109,19 @@ ext {
             "m-muse-api"      : "0.0.1",
             "m-tests-api"     : "0.0.1",
             "m-user-api"      : "0.0.9",
-            "m-home-api"      : "0.0.3",
+            "m-home-api"      : "0.0.4.1",
             "m-im-api"        : "0.0.8",
-            "m-dynamic-api"   : "0.0.1",
+            "m-dynamic-api"   : "0.0.3.6",
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.37",
+            "ydl-platform"    : "0.0.37.4",
             //第二步 若干
 
             "ydl-webview"     : "0.0.37.1",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
-            "m-audioim"       : "0.0.46",
+            "m-audioim"       : "0.0.46.1",
             "ydl-flutter-base": "0.0.10",
 
             //以下 几乎不会动

m-audioim/src/main/res/drawable/audioim_home_button_autoaxb_background.xml

@@ -3,7 +3,7 @@
 
     <corners android:radius="20dp" />
     <gradient android:startColor="#1DA1F2"
-        android:endColor="@color/dynamic_main_theme_light"
+        android:endColor="@color/confide_main_theme_light"
         android:angle="180"/>
 
 </shape>
\ No newline at end of file

m-dynamic/src/main/java/com/yidianling/dynamic/common/browsePictures/BrowsePicturesActivity.java

@@ -25,13 +25,13 @@ import com.ydl.ydl_image.module.GlideApp;
 import com.ydl.ydlcommon.base.BaseActivity;
 import com.ydl.ydlcommon.data.http.RxUtils;
 import com.yidianling.common.tools.ToastUtil;
-import com.yidianling.dynamic.DynamicConstants;
+import com.yidianling.dynamic.bean.DynamicConstants;
 import com.yidianling.dynamic.R;
 import com.yidianling.dynamic.common.net.DynamicApiUtils;
 import com.yidianling.dynamic.common.tool.DownLoadImageService;
 import com.yidianling.dynamic.common.tool.ImageDownLoadCallBack;
 import com.yidianling.dynamic.model.Command;
-import com.yidianling.dynamic.model.RecommendTrendImage;
+import com.ydl.ydlcommon.ui.ParcelableImage;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -48,7 +48,7 @@ import uk.co.senab.photoview.PhotoViewAttacher;
 public class BrowsePicturesActivity extends BaseActivity implements ViewPager.OnPageChangeListener {
 
     int iposition;
-    private ArrayList<RecommendTrendImage> trendImages = new ArrayList<>();
+    private ArrayList<ParcelableImage> trendImages = new ArrayList<>();
 
     private ViewPager browse_pictures_vp;
     private ImageView back_iv;
@@ -79,7 +79,7 @@ public class BrowsePicturesActivity extends BaseActivity implements ViewPager.On
         browse_type = intent.getStringExtra("browse_type");
         Bundle allTrendImages_bd = intent.getBundleExtra("allTrendImages_bd");
 
-        List<RecommendTrendImage> temptrendImages = allTrendImages_bd.getParcelableArrayList("allTrendImages");
+        List<ParcelableImage> temptrendImages = allTrendImages_bd.getParcelableArrayList("allTrendImages");
         if (temptrendImages != null) {
             trendImages.addAll(temptrendImages);
         }
@@ -264,9 +264,9 @@ public class BrowsePicturesActivity extends BaseActivity implements ViewPager.On
     public class MyAdapter extends PagerAdapter {
         private Context mContext;
         private List<PhotoView> mDatas;
-        private List<RecommendTrendImage> mImages;
+        private List<ParcelableImage> mImages;
 
-        public MyAdapter(Context mContext, List<PhotoView> mDatas, List<RecommendTrendImage> mImages) {
+        public MyAdapter(Context mContext, List<PhotoView> mDatas, List<ParcelableImage> mImages) {
             this.mContext = mContext;
             this.mDatas = mDatas;
             this.mImages = mImages;

m-dynamic/src/main/java/com/yidianling/dynamic/common/browsePictures/BrowsePicturesActivity2.java

@@ -20,7 +20,7 @@ import android.widget.TextView;
 import com.ydl.ydl_image.module.GlideApp;
 import com.ydl.ydlcommon.base.BaseActivity;
 import com.yidianling.common.tools.ToastUtil;
-import com.yidianling.dynamic.DynamicConstants;
+import com.yidianling.dynamic.bean.DynamicConstants;
 import com.yidianling.dynamic.R;
 import com.yidianling.dynamic.common.tool.DownLoadImageService;
 import com.yidianling.dynamic.common.tool.ImageDownLoadCallBack;

m-home/build.gradle

@@ -67,6 +67,7 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 
     implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'