Merge remote-tracking branch 'origin/main'

@@ -96,7 +96,7 @@ export function viewBlogItemInsightIntentShare(context: common.UIAbilityContext,
     },
     },
     intentEntityInfo: {
     intentEntityInfo: {
       entityName: 'Blog',
       entityName: 'Blog',
-      entityId: String(item?.newsId) || '',
+      entityId: `objectId=${item?.newsId}&objectType=${item?.newsType}` || '',
       displayName: item?.newsTitle || '',
       displayName: item?.newsTitle || '',
       entityGroupId: String(item?.reLInfo?.channelId), //channelId
       entityGroupId: String(item?.reLInfo?.channelId), //channelId
       logoURL: item.fullColumnImgUrls.length > 0 ? item.fullColumnImgUrls[0]?.url : item.firstFrameImageUri || 'https://cdnjdphoto.aikan.pdnews.cn/WapApi/800/launcher_icon.png',
       logoURL: item.fullColumnImgUrls.length > 0 ? item.fullColumnImgUrls[0]?.url : item.firstFrameImageUri || 'https://cdnjdphoto.aikan.pdnews.cn/WapApi/800/launcher_icon.png',
@@ -145,7 +145,7 @@ export function viewColumInsightIntentShare(context: common.UIAbilityContext, en
       entityId,
       entityId,
       displayName: pageInfoBean?.topicInfo?.title,
       displayName: pageInfoBean?.topicInfo?.title,
       description: pageInfoBean?.shareSummary,
       description: pageInfoBean?.shareSummary,
-      logoURL: pageInfoBean?.shareCoverUrl,
+      logoURL: pageInfoBean?.shareCoverUrl || 'https://cdnjdphoto.aikan.pdnews.cn/WapApi/800/launcher_icon.png',
       activityType: ['RecentViews'],
       activityType: ['RecentViews'],
       columnTitle: pageInfoBean?.topicInfo?.title,
       columnTitle: pageInfoBean?.topicInfo?.title,
       columnSubTitle: pageInfoBean?.shareSummary,
       columnSubTitle: pageInfoBean?.shareSummary,

@@ -172,6 +172,12 @@ struct OneKeyLoginPage {
         .backgroundColor("#ED2800")
         .backgroundColor("#ED2800")
         .onClick(() => {
         .onClick(() => {
 
 
+          if (!this.agreeProtocol) {
+            this.toastText = "请阅读并勾选用户协议、隐私政策和华为账号用户认证协议"
+            this.dialogToast.open()
+            return
+          }
+          TrackingButton.click("oneClickLoginPageLoginButton", TrackConstants.PageName.OneClick_Login, TrackConstants.PageName.OneClick_Login)
           this.requestLogin()
           this.requestLogin()
         })
         })
 
 

@@ -12,6 +12,7 @@ import DailyPaperTopicModel from 'wdComponent/src/main/ets/model/DailyPaperTopic
  */
  */
 export default class InsightIntentExecutorImpl extends InsightIntentExecutor {
 export default class InsightIntentExecutorImpl extends InsightIntentExecutor {
   private static readonly ViewBlog = 'ViewBlog';
   private static readonly ViewBlog = 'ViewBlog';
+  private static readonly ViewColumn = 'ViewColumn';
   private static readonly ViewColumnUpdate = 'ViewColumnUpdate';
   private static readonly ViewColumnUpdate = 'ViewColumnUpdate';
 
 
   /**
   /**
@@ -31,6 +32,8 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor {
         return this.jumpToViewBlog(param, pageLoader);
         return this.jumpToViewBlog(param, pageLoader);
       case InsightIntentExecutorImpl.ViewColumnUpdate:
       case InsightIntentExecutorImpl.ViewColumnUpdate:
         return this.jumpToViewColumnUpdate(param, pageLoader);
         return this.jumpToViewColumnUpdate(param, pageLoader);
+      case InsightIntentExecutorImpl.ViewColumn:
+        return this.jumpToViewColumnUpdate(param, pageLoader);
       default:
       default:
         break;
         break;
     }
     }