remove share to trend when in comment list

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.50.44",
             "m-consultant"    : "0.0.60.68",
             "m-fm"            : "0.0.30.09",
-            "m-user"          : "0.0.62.59",
+            "m-user"          : "0.0.62.68",
             "m-home"          : "0.0.23.95",
             "m-im"            : "0.0.21.64",
             "m-dynamic"       : "0.0.7.74",
@@ -26,7 +26,7 @@ ext {
             "ydl-platform"    : "0.0.41.48",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.97",
+            "ydl-webview"     : "0.0.38.99",
             "ydl-media"       : "0.0.21.52",
             "ydl-pay"         : "0.0.18.21",
             "m-audioim"       : "0.0.49.30.23",
@@ -94,7 +94,7 @@ ext {
             "m-confide"       : "0.0.50.44",
             "m-consultant"    : "0.0.60.68",
             "m-fm"            : "0.0.30.09",
-            "m-user"          : "0.0.62.59",
+            "m-user"          : "0.0.62.68",
             "m-home"          : "0.0.23.95",
             "m-im"            : "0.0.21.64",
             "m-dynamic"       : "0.0.7.74",
@@ -113,7 +113,7 @@ ext {
             "ydl-platform"    : "0.0.41.48",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.97",
+            "ydl-webview"     : "0.0.38.99",
             "ydl-media"       : "0.0.21.52",
             "ydl-pay"         : "0.0.18.21",
             "m-audioim"       : "0.0.49.30.23",

m-user/src/main/java/com/yidianling/user/mine/MineFragment.kt

@@ -223,7 +223,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
                             getLocal().setConsult(true)
                         } else {
                             iv_order_tip.visibility = View.GONE
-                            getLocal().setConfide(false)
+                            getLocal().setConsult(false)
                         }
                     }else{
                         getLocal().setConfide(false)

m-user/src/main/java/com/yidianling/user/mine/data/AppLocalImpl.kt

@@ -55,7 +55,7 @@ internal class AppLocalImpl private constructor(): AppLocal {
     }
 
     override fun setConsult(have: Boolean) {
-        getAppSP().edit().putBoolean(CONSULT, false).apply()
+        getAppSP().edit().putBoolean(CONSULT, have).apply()
     }
 
     override fun getConfide(): Boolean {

ydl-webview/src/main/java/com/ydl/view/ShareMeditationDialog.kt

@@ -73,6 +73,8 @@ class ShareMeditationDialog : DialogFragment() {
         val shareTitle = arguments?.getString(KEY_SHARE_TITLE)
         val shareContent = arguments?.getString(KEY_SHARE_CONTENT)
         val shareCover = arguments?.getString(KEY_SHARE_COVER)
+        val miniId = arguments?.getString(KEY_SHARE_MINI_ID)
+        val miniPath = arguments?.getString(KEY_SHARE_MINI_PATH)
 
         llRootLayout = view?.findViewById(R.id.csl_share_layout)
 
@@ -96,13 +98,15 @@ class ShareMeditationDialog : DialogFragment() {
         updateUI(isDarkMode == true)
 
         llWeChat?.setOnClickListener {
-            ShareUtils.shareTo(
-                SHARE_MEDIA.WEIXIN,
+            ShareUtils.shareSmailWeixin(
                 activity as Activity,
                 shareTitle!!,
                 shareUrl!!,
                 shareContent!!,
-                shareCover!!
+                shareCover!!,
+                path = miniPath,
+                id = miniId,
+                shareListener = null
             )
             dismiss()
         }
@@ -191,15 +195,19 @@ class ShareMeditationDialog : DialogFragment() {
         private const val KEY_SHARE_TITLE = "key_share_title"
         private const val KEY_SHARE_CONTENT = "key_share_content"
         private const val KEY_SHARE_COVER = "key_share_cover"
+        private const val KEY_SHARE_MINI_ID = "key_share_mini_id"
+        private const val KEY_SHARE_MINI_PATH = "key_share_mini_path"
 
         fun newInstance(isDarkMode: Boolean,shareUrl:String,shareTitle:String,
-        shareContent:String,shareCover:String): ShareMeditationDialog {
+        shareContent:String,shareCover:String,miniId:String,miniPath:String): ShareMeditationDialog {
             val args = Bundle()
             args.putBoolean(KEY_SHARE_DARK_MODE, isDarkMode)
             args.putString(KEY_SHARE_URL, shareUrl)
             args.putString(KEY_SHARE_TITLE, shareTitle)
             args.putString(KEY_SHARE_CONTENT, shareContent)
             args.putString(KEY_SHARE_COVER, shareCover)
+            args.putString(KEY_SHARE_MINI_ID,miniId )
+            args.putString(KEY_SHARE_MINI_PATH, miniPath)
 
             val fragment = ShareMeditationDialog()
             fragment.arguments = args

ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java

@@ -119,8 +119,11 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
     protected String shareTitle;
     protected String shareDesc;
     private String cover;
+    private String miniId;
+    private String miniPath;
 //    评价2.0新增字段  区分评价列表
     private H5JsBean.H5JsCmd.Params paramsForCommentList;
+    private boolean isShareCommentList;
 
     private boolean isDarkMode = false;
 
@@ -542,10 +545,12 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
                 shareTitle = params.getShare().getTitle();
                 shareDesc = params.getShare().getDesc();
                 cover = params.getShare().getCover();
+                miniId = params.getShare().getMinProgramId();
+                miniPath = params.getShare().getMinProgramPath();
                 isDarkMode = params.getShare().isDarkMode();
                 if(shareMeditationDialog == null){
                     shareMeditationDialog = ShareMeditationDialog.Companion.newInstance(isDarkMode,
-                            shareUrl,shareTitle,shareDesc,cover);
+                            shareUrl,shareTitle,shareDesc,cover,miniId,miniPath);
                 }
                 if (shareMeditationDialog!=null && !shareMeditationDialog.isAdded()){
                     shareMeditationDialog.show(getSupportFragmentManager(),"share_meditation");
@@ -1054,6 +1059,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
         tb_title.setOnRightTextClick((view, isActive) -> {
             ShareData shareData = paramsForCommentList.getShare();
             if (shareData!=null && "commentList".equals(shareData.getType())){
+                isShareCommentList = true;
                 ActionCountUtils.Companion.baiDuCountSign3("experts_comment_list_page", "comment_share_click", "", "", "");
                 share(shareData.getImageBase64(),paramsForCommentList);
             }else {
@@ -1451,7 +1457,11 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
                 //如果未引入动态模块的话，隐藏分享至动态按钮
                 dialog = YDLShareDialog.Companion.style4(this, shareTitle, shareUrl, shareDesc, cover);
             } else {
-                dialog = YDLShareDialog.Companion.style1(this, shareTitle, shareUrl, shareDesc, cover, minPath, minId);
+                if (isShareCommentList){
+                    dialog = YDLShareDialog.Companion.style7(this, shareTitle, shareUrl, shareDesc, cover, minPath, minId);
+                }else {
+                    dialog = YDLShareDialog.Companion.style1(this, shareTitle, shareUrl, shareDesc, cover, minPath, minId);
+                }
             }
         }